diff --git a/composer.json b/composer.json
index dd761a99d..64d9dca22 100644
--- a/composer.json
+++ b/composer.json
@@ -56,7 +56,7 @@
         "knplabs/knp-time-bundle": "^1.12",
         "symfony/intl": "4.*",
         "symfony/swiftmailer-bundle": "^3.5",
-        "league/csv": "^9.6",
+        "league/csv": "^9.7.1",
         "phpoffice/phpspreadsheet": "^1.16",
         "symfony/browser-kit": "^5.2",
         "symfony/css-selector": "^5.2",
diff --git a/package.json.txt b/package.json.txt
new file mode 100644
index 000000000..58f21ac5d
--- /dev/null
+++ b/package.json.txt
@@ -0,0 +1,3 @@
+add npm/yarn dependency in package.json :
+
+"select2-bootstrap-theme": "0.1.0-beta.10",
diff --git a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityNotifications.php b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityNotifications.php
index 7835a0db4..9ef67a7ac 100644
--- a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityNotifications.php
+++ b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityNotifications.php
@@ -22,6 +22,7 @@ class LoadActivityNotifications extends AbstractFixture implements DependentFixt
             'entityRef' => 'activity_gerard depardieu',
             'sender' => 'center a_social',
             'addressees' => [
+                'center a_social',
                 'center a_administrative',
                 'center a_direction',
                 'multi_center'
diff --git a/src/Bundle/ChillActivityBundle/Notification/ActivityNotificationRenderer.php b/src/Bundle/ChillActivityBundle/Notification/ActivityNotificationRenderer.php
new file mode 100644
index 000000000..1836f599b
--- /dev/null
+++ b/src/Bundle/ChillActivityBundle/Notification/ActivityNotificationRenderer.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Chill\ActivityBundle\Notification;
+
+use Chill\MainBundle\Entity\Notification;
+use Chill\ActivityBundle\Entity\Activity;
+
+final class ActivityNotificationRenderer
+{
+    public function supports(Notification $notification, array $options = []): bool
+    {
+        return $notification->getRelatedEntityClass() == Activity::class;
+    }
+
+    public function getTemplate()
+    {
+        return '@ChillActivity/Activity/showInNotification.html.twig';
+    }
+
+    public function getTemplateData(Notification $notification)
+    {
+        return ['notification' => $notification];
+    }
+}
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/scss/chillactivity.scss b/src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss
similarity index 89%
rename from src/Bundle/ChillActivityBundle/Resources/public/scss/chillactivity.scss
rename to src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss
index ed54ce27a..1d271abfe 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/scss/chillactivity.scss
+++ b/src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss
@@ -1,12 +1,14 @@
-@import '~ChillMainSass/custom/config/colors';
-@import '~ChillMainSass/custom/mixins/entity';
+// Access to Bootstrap variables and mixins
+@import '~ChillMainAssets/module/bootstrap/shared';
 
-.chill-entity.chill-entity__activity-reason {
-    @include entity($chill-pink, white);
-}
+//@import '~ChillMainSass/custom/mixins/entity';
+
+//.chill-entity.chill-entity__activity-reason {
+//    @include entity($chill-pink, white);
+//}
 
 .activity {
-    color: $chill-green;
+    //color: $chill-green;
 }
 
 // exceptions for flex-bloc in concerned-groups
@@ -71,7 +73,7 @@ div.flex-table.list-records {
             &:nth-child(2) {
                flex-grow: 0; flex-shrink: 1; flex-basis: 70%;
             }
-            
+
             &:only-child {
                flex-grow: 0; flex-shrink: 0; flex-basis: 100%;
                & > div.concerned-groups {
@@ -80,11 +82,11 @@ div.flex-table.list-records {
                   flex-direction: column; // TODO pas fini
                   div.group {
                      flex-grow: 1; flex-shrink: 0; flex-basis: 30%;
-                     h4 {} 
+                     h4 {}
                      ul.list-content {
-                        li { 
+                        li {
                            display: inline;
-                        } 
+                        }
                      }
                   }
                }
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/chill/index.js b/src/Bundle/ChillActivityBundle/Resources/public/chill/index.js
new file mode 100644
index 000000000..3028d6f5c
--- /dev/null
+++ b/src/Bundle/ChillActivityBundle/Resources/public/chill/index.js
@@ -0,0 +1 @@
+require('./chillactivity.scss');
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/index.js b/src/Bundle/ChillActivityBundle/Resources/public/index.js
deleted file mode 100644
index e219e368b..000000000
--- a/src/Bundle/ChillActivityBundle/Resources/public/index.js
+++ /dev/null
@@ -1 +0,0 @@
-require('./scss/chillactivity.scss');
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups/PersonBadge.vue b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups/PersonBadge.vue
index e27feb886..bef11159c 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups/PersonBadge.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups/PersonBadge.vue
@@ -1,6 +1,6 @@
 <template>
    <li>
-      <span class="badge badge-primary" :title="person.text">
+      <span class="badge bg-primary" :title="person.text">
          <span class="chill_denomination">
             {{ textCutted }}
          </span>
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc.vue b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc.vue
index 154209cbf..14a3b9526 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc.vue
@@ -1,11 +1,11 @@
 <template>
    <teleport to="#social-issues-acc">
       
-      <div class="container">
-         <div class="grid-4 clear">
-            <label>{{ $t('activity.social_issues') }}</label>
+      <div class="mb-3 row">
+         <div class="col-4">
+            <label class="col-form-label">{{ $t('activity.social_issues') }}</label>
          </div>
-         <div class="grid-8">
+         <div class="col-8">
             
             <check-social-issue
                v-for="issue in socialIssuesList"
@@ -41,11 +41,11 @@
          </div>
       </div>
 
-      <div class="container">
-         <div class="grid-4 clear">
-            <label>{{ $t('activity.social_actions') }}</label>
+      <div class="mb-3 row">
+         <div class="col-4">
+            <label class="col-form-label">{{ $t('activity.social_actions') }}</label>
          </div>
-         <div class="grid-8">
+         <div class="col-8">
             
             <div v-if="actionIsLoading === true">
                <i class="chill-green fa fa-circle-o-notch fa-spin fa-lg"></i>
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialAction.vue b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialAction.vue
index 4da3a7ffc..e3727ad43 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialAction.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialAction.vue
@@ -1,18 +1,20 @@
 <template>
    <span class="inline-choice">
-      
-      <input 
-         type="checkbox" 
-         v-model="selected"
-         name="action"
-         v-bind:id="action.id" 
-         v-bind:value="action"
-         />
-      <label class="inline" v-bind:for="action.id">
-         {{ action.text }}
-      </label>
-      
-   </span><br>
+      <div class="form-check">
+   
+         <input class="form-check-input"
+            type="checkbox" 
+            v-model="selected"
+            name="action"
+            v-bind:id="action.id" 
+            v-bind:value="action"
+            />
+         <label class="form-check-label" v-bind:for="action.id">
+            {{ action.text }}
+         </label>
+         
+      </div>
+   </span>
 </template>
 
 <script>
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialIssue.vue b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialIssue.vue
index 0f223eced..d88a7c97f 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialIssue.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialIssue.vue
@@ -1,18 +1,20 @@
 <template>
    <span class="inline-choice">
+      <div class="form-check">
       
-      <input 
-         type="checkbox" 
-         v-model="selected"
-         name="issue"
-         v-bind:id="issue.id" 
-         v-bind:value="issue"
-         />
-      <label class="inline" v-bind:for="issue.id">
-         {{ issue.text }}
-      </label>
-      
-   </span><br>
+         <input class="form-check-input"
+            type="checkbox" 
+            v-model="selected"
+            name="issue"
+            v-bind:id="issue.id" 
+            v-bind:value="issue"
+            />
+         <label class="form-check-label" v-bind:for="issue.id">
+            {{ issue.text }}
+         </label>
+         
+      </div>
+   </span>
 </template>
 
 <script>
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig
index 0e0f8695a..92b1b3ff4 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig
@@ -59,8 +59,8 @@
                     {% for item in bloc.items %}
                     <li>
                         <a href="{{ _self.href(bloc.path, bloc.key, item.id) }}">
-                            <span class="badge badge-primary">
-                                {{ item|chill_entity_render_box({'only_denomination': true}) }}
+                            <span class="badge bg-primary">
+                                {{ item|chill_entity_render_box({'render': 'raw'}) }}
                             </span>
                         </a>
                     </li>
@@ -83,7 +83,7 @@
                 {% for item in bloc.items %}
                 <li>
                     <a href="{{ _self.href(bloc.path, bloc.key, item.id) }}">
-                        <span class="badge badge-primary">
+                        <span class="badge bg-primary">
                             {{ item|chill_entity_render_box({'only_denomination': true}) }}
                         </span>
                     </a>
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/confirm_deletePerson.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/confirm_deletePerson.html.twig
index 2d8e2affc..9f8172bb4 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/confirm_deletePerson.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/confirm_deletePerson.html.twig
@@ -1,4 +1,4 @@
-{% extends "@ChillPerson/layout.html.twig"  %}
+{% extends "@ChillPerson/Person/layout.html.twig"  %}
 
 {% set activeRouteKey = 'chill_activity_activity_list' %}
 {% set person = activity.person %}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig
index 5e010bc87..35f681064 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig
@@ -1,8 +1,5 @@
-<h1>{{ "Update activity"|trans ~ ' :' }}
-    <span style="font-size: 70%; text-transform: lowercase; margin-left: 1em;">
-        {{ entity.type.name|localize_translatable_string }}
-    </span>
-</h1>
+<h1>{{ "Update activity"|trans }}</h1>
+<h2 class="chill-green mb-4">{{ entity.type.name|localize_translatable_string }}</h2>
 
 {{ form_start(edit_form) }}
 {{ form_errors(edit_form) }}
@@ -94,12 +91,12 @@
 
     <ul class="record_actions sticky-form-buttons">
         <li class="cancel">
-            <a href="{{ path('chill_activity_activity_show', { 'id': entity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id  } ) }}" class="sc-button bt-cancel">
+            <a href="{{ path('chill_activity_activity_show', { 'id': entity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id  } ) }}" class="btn btn-cancel">
                 {{ 'Cancel'|trans }}
             </a>
         </li>
         <li>
-            <button class="sc-button bt-update" type="submit">{{ 'Save'|trans }}</button>
+            <button class="btn btn-update" type="submit">{{ 'Save'|trans }}</button>
         </li>
     </ul>
 {{ form_end(edit_form) }}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/editAccompanyingCourse.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/editAccompanyingCourse.html.twig
index 017f2fd40..f6ffa2b66 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/editAccompanyingCourse.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/editAccompanyingCourse.html.twig
@@ -5,13 +5,17 @@
 {% block title  'Update activity'|trans %}
 
 {% block content %}
-    <div id="activity"></div> {# <=== vue component #}
-    {% include 'ChillActivityBundle:Activity:edit.html.twig' %}
+<div class="activity-edit">
+            
+            <div id="activity"></div> {# <=== vue component #}
+            {% include 'ChillActivityBundle:Activity:edit.html.twig' %}
+            
+</div>
 {% endblock %}
 
 {% block js %}
     {{ parent() }}
-    {{ encore_entry_link_tags('async_upload') }}
+    {{ encore_entry_link_tags('mod_async_upload') }}
     <script type="text/javascript">
         window.addEventListener('DOMContentLoaded', function (e) {
             chill.displayAlertWhenLeavingModifiedForm('form[name="{{ edit_form.vars.form.vars.name }}"]', 
@@ -24,6 +28,6 @@
 
 {% block css %}
     {{ parent() }}
-    {{ encore_entry_link_tags('async_upload') }}
+    {{ encore_entry_link_tags('mod_async_upload') }}
     {{ encore_entry_link_tags('vue_activity') }}
 {% endblock %}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/editPerson.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/editPerson.html.twig
index 1022bdd5b..3d61303b5 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/editPerson.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/editPerson.html.twig
@@ -14,19 +14,23 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
-{% extends "@ChillPerson/layout.html.twig"  %}
+{% extends "@ChillPerson/Person/layout.html.twig"  %}
 
 {% set activeRouteKey = 'chill_activity_activity_list' %}
 
 {% block title  'Update activity'|trans %}
 
 {% block personcontent %}
-    <div id="activity"></div> {# <=== vue component #}
-    {% include 'ChillActivityBundle:Activity:edit.html.twig' %}
+<div class="activity-edit">
+            
+            <div id="activity"></div> {# <=== vue component #}
+            {% include 'ChillActivityBundle:Activity:edit.html.twig' %}
+            
+</div>
 {% endblock %}
 
 {% block js %}
-    {{ encore_entry_link_tags('async_upload') }}
+    {{ encore_entry_link_tags('mod_async_upload') }}
     <script type="text/javascript">
         window.addEventListener('DOMContentLoaded', function (e) {
             chill.displayAlertWhenLeavingModifiedForm('form[name="{{ edit_form.vars.form.vars.name }}"]', 
@@ -38,6 +42,6 @@
 {% endblock %}
 
 {% block css %}
-    {{ encore_entry_link_tags('async_upload') }}
+    {{ encore_entry_link_tags('mod_async_upload') }}
     {{ encore_entry_link_tags('vue_activity') }}
 {% endblock %}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig
index a4d75917e..f7c0d12b2 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig
@@ -13,62 +13,49 @@
 {% if activities|length == 0 %}
     <p class="chill-no-data-statement">
         {{ "There isn't any activities."|trans }}
-        <a href="{{ path('chill_activity_activity_new', {'person_id': person_id, 'accompanying_period_id': accompanying_course_id}) }}" class="sc-button bt-create button-small"></a>
+        <a href="{{ path('chill_activity_activity_new', {'person_id': person_id, 'accompanying_period_id': accompanying_course_id}) }}" class="btn btn-create button-small"></a>
     </p>
 {% else %}
 
 <div class="flex-table list-records context-{{ context }}">
-    <!--
-    <thead>
-        <tr>
-            <th class="chill-red">{{'Date' | trans }}</th>
-            <th class="chill-green">{{'Duration Time' | trans }}</th>
-            <th class="chill-orange">{{'Reasons' | trans}}</th>
-            <th>{{'Type' | trans}}</th>
-            <th>&nbsp;</th>
-        </tr>
-    </thead>
--->
+
     {% for activity in activities %}
         {% set t = activity.type %}
         <div class="item-bloc">
             <div class="item-row main">
                 <div class="item-col">
-                                        
+
                     {% if activity.date %}
                         <h3>{{ activity.date|format_date('long') }}</h3>
                     {% endif %}
-                   
+
                     <div class="duration">
-                      {% if t.durationTimeVisible > 0 %}
-                        <p>
-                            <i class="fa fa-fw fa-hourglass-end"></i>
-                            {{ activity.durationTime|date('H:i') }}
-                        </p>
-                      {% endif %}
-                        
+                        {% if t.durationTimeVisible > 0 %}
+                            <p>
+                                <i class="fa fa-fw fa-hourglass-end"></i>
+                                {{ activity.durationTime|date('H:i') }}
+                            </p>
+                        {% endif %}
                         {% if activity.travelTime and t.travelTimeVisible %}
-                        <p>
-                            <i class="fa fa-fw fa-car"></i>
-                            {{ activity.travelTime|date('H:i') }}
-                        </p>
+                            <p>
+                                <i class="fa fa-fw fa-car"></i>
+                                {{ activity.travelTime|date('H:i') }}
+                            </p>
                         {% endif %}
                     </div>
 
                     {% if context == 'person' and activity.accompanyingPeriod is not empty %}
-                      <div class="accompanyingPeriodLink" style="margin-top: 1rem">
-                        <a 
-                           href="{{ chill_path_add_return_path(
-                            "chill_person_accompanying_course_index",
-                            { 'accompanying_period_id': activity.accompanyingPeriod.id }
-                            ) }}"
-                           >
-                          <i class="fa fa-random"></i>
-                          {{ activity.accompanyingPeriod.id }}
+                    <div class="accompanyingPeriodLink" style="margin-top: 1rem">
+                        <a href="{{ chill_path_add_return_path(
+                                "chill_person_accompanying_course_index",
+                                { 'accompanying_period_id': activity.accompanyingPeriod.id }
+                            ) }}">
+                            <i class="fa fa-random"></i>
+                            {{ activity.accompanyingPeriod.id }}
                         </a>
-                      </div>
+                    </div>
                     {% endif %}
-                    
+
                 </div>
                 <div class="item-col">
                     <ul class="list-content">
@@ -77,19 +64,19 @@
                             <b>{{ 'by'|trans }}{{ activity.user.usernameCanonical }}</b>
                         </li>
                         {% endif %}
-                        
+
                         <li>
                             <b>{{ activity.type.name | localize_translatable_string }}</b>
-                            
+
                             {% if activity.attendee is not null and t.attendeeVisible %}
                                 {% if activity.attendee %}
-                                    {{ '→ ' ~ 'present'|trans|capitalize }} 
-                                {% else %} 
+                                    {{ '→ ' ~ 'present'|trans|capitalize }}
+                                {% else %}
                                     {{ '→ ' ~ 'not present'|trans|capitalize }}
                                 {% endif %}
                             {% endif %}
                         </li>
-                        
+
                         <li>
                             <b>{{ 'location'|trans ~ ': ' }}</b>
                             Domicile de l'usager
@@ -97,7 +84,7 @@
                                 {% if activity.location %}{{ activity.location }}{% endif %}
                             #}
                         </li>
-                        
+
                         {%- if t.reasonsVisible -%}
                         <li>
                             {%- if activity.reasons is empty -%}
@@ -121,37 +108,37 @@
                                 {%- endif -%}
                             </li>
                         {% endif %}
-                        
+
                         {%- if t.socialActionsVisible -%}
                             <li class="social-actions">
                                 {%- if activity.socialActions is empty -%}
                                     <span class="chill-no-data-statement">{{ 'No social actions associated'|trans }}</span>
                                 {%- else -%}
                                     {% for r in activity.socialActions %}
-                                        <span class="badge badge-primary">{{ r.title|localize_translatable_string }}</span>
+                                        <span class="badge bg-primary">{{ r.title|localize_translatable_string }}</span>
                                     {% endfor %}
                                 {%- endif -%}
                             </li>
                         {% endif %}
 
-                        
+
                     </ul>
                     <ul class="record_actions">
                         <li>
-                            <a href="{{ path('chill_activity_activity_show', { 'id': activity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}" class="sc-button bt-show "></a>
+                            <a href="{{ path('chill_activity_activity_show', { 'id': activity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}" class="btn btn-show "></a>
                         </li>
                         {# TOOD
                         {% if is_granted('CHILL_ACTIVITY_UPDATE', activity) %}
                         #}
                         <li>
-                            <a href="{{ path('chill_activity_activity_edit', { 'id': activity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}" class="sc-button bt-update "></a>
+                            <a href="{{ path('chill_activity_activity_edit', { 'id': activity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}" class="btn btn-update "></a>
                         </li>
                         {# TOOD
                         {% endif %}
                         {% if is_granted('CHILL_ACTIVITY_DELETE', activity) %}
                         #}
                         <li>
-                            <a href="{{ path('chill_activity_activity_delete', { 'id': activity.id, 'person_id' : person_id, 'accompanying_period_id': accompanying_course_id } ) }}" class="sc-button bt-delete "></a>
+                            <a href="{{ path('chill_activity_activity_delete', { 'id': activity.id, 'person_id' : person_id, 'accompanying_period_id': accompanying_course_id } ) }}" class="btn btn-delete "></a>
                         </li>
                         {#
                         {% endif %}
@@ -159,19 +146,19 @@
                     </ul>
                 </div>
             </div>
-            
-            {%  
+
+            {%
                 if activity.comment.comment is not empty
                 or activity.persons|length > 0
                 or activity.thirdParties|length > 0
-                or activity.users|length > 0 
+                or activity.users|length > 0
             %}
             <div class="item-row details">
                 <div class="item-col">
 
                     {% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {'context': context, 'with_display': 'row', 'entity': activity } %}
                 </div>
-                
+
                 {% if activity.comment.comment is not empty %}
                 <div class="item-col comment">
                     {{ activity.comment|chill_entity_render_box( { 'limit_lines': 3, 'metadata': false } ) }}
@@ -179,7 +166,7 @@
                 {% endif %}
             </div>
             {% endif %}
-            
+
         </div>
     {% endfor %}
 </div>
@@ -189,7 +176,7 @@
 {# TODO set this condition in configuration #}
   <ul class="record_actions">
       <li>
-          <a href="{{ path('chill_activity_activity_new', {'person_id': person_id, 'accompanying_period_id': accompanying_course_id}) }}" class="sc-button bt-create">
+          <a href="{{ path('chill_activity_activity_new', {'person_id': person_id, 'accompanying_period_id': accompanying_course_id}) }}" class="btn btn-create">
               {{ 'Add a new activity' | trans }}
           </a>
       </li>
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig
index 6856459c6..649821dc7 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
-{% extends "@ChillPerson/layout.html.twig"  %}
+{% extends "@ChillPerson/Person/layout.html.twig"  %}
 
 {% set activeRouteKey = 'chill_activity_activity_list' %}
 
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig
index d7ba17594..1c2fb5123 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig
@@ -1,8 +1,5 @@
-<h1>{{ "Activity creation"|trans ~ ' :' }}
-    <span style="font-size: 70%; text-transform: lowercase; margin-left: 1em;">
-        {{ entity.type.name|localize_translatable_string }}
-    </span>
-</h1>
+<h1>{{ "Activity creation"|trans ~ ' :' }}</h1>
+<h2 class="chill-green mb-4">{{ entity.type.name|localize_translatable_string }}</h2>
 
 {{ form_start(form) }}
 {{ form_errors(form) }}
@@ -86,7 +83,7 @@
 <ul class="record_actions sticky-form-buttons">
   <li class="cancel">
     <a 
-      class="sc-button bt-cancel"
+      class="btn btn-cancel"
       {%- if context == 'person' -%} 
       href="{{ chill_return_path_or('chill_activity_activity_list', { 'person_id': person.id } )}}"
       {%- else -%}
@@ -97,7 +94,7 @@
     </a>
   </li>
   <li>
-    <button class="sc-button bt-create" type="submit">
+    <button class="btn btn-create" type="submit">
       {{ 'Create'|trans }}
     </button>
   </li>
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/newAccompanyingCourse.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/newAccompanyingCourse.html.twig
index 2cccb2510..101ad5502 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/newAccompanyingCourse.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/newAccompanyingCourse.html.twig
@@ -5,25 +5,29 @@
 {% block title 'Activity creation' |trans %}
 
 {% block content %}
+<div class="activity-new">
+
     <div id="activity"></div> {# <=== vue component #}
     {% include 'ChillActivityBundle:Activity:new.html.twig' with {'context': 'accompanyingCourse'} %}
+
+</div>
 {% endblock %}
 
 {% block js %}
     {{ parent() }}
-    {{ encore_entry_script_tags('async_upload') }}
+    {{ encore_entry_script_tags('mod_async_upload') }}
     <script type="text/javascript">
         window.addEventListener('DOMContentLoaded', function (e) {
-            chill.displayAlertWhenLeavingUnsubmittedForm('form[name="{{ form.vars.form.vars.name }}"]', 
+            chill.displayAlertWhenLeavingUnsubmittedForm('form[name="{{ form.vars.form.vars.name }}"]',
             '{{ "You are going to leave a page with unsubmitted data. Are you sure you want to leave ?"|trans }}');
         });
-        window.activity = {{ activity_json|json_encode|raw }}; 
+        window.activity = {{ activity_json|json_encode|raw }};
     </script>
     {{ encore_entry_script_tags('vue_activity') }}
 {% endblock %}
 
 {% block css %}
     {{ parent() }}
-    <link rel="stylesheet" href="{{ asset('build/async_upload.css') }}"/>
+    {{ encore_entry_link_tags('mod_async_upload') }}
     {{ encore_entry_link_tags('vue_activity') }}
 {% endblock %}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/newPerson.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/newPerson.html.twig
index 6b1613a90..fb2309a9d 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/newPerson.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/newPerson.html.twig
@@ -1,16 +1,20 @@
-{% extends "@ChillPerson/layout.html.twig"  %}
+{% extends "@ChillPerson/Person/layout.html.twig"  %}
 
 {% set activeRouteKey = 'chill_activity_activity_new' %}
 
 {% block title 'Activity creation' |trans %}
 
 {% block personcontent %}
-    <div id="activity"></div> {# <=== vue component #}
-    {% include 'ChillActivityBundle:Activity:new.html.twig' with {'context': 'person'} %}
+<div class="activity-new">
+            
+            <div id="activity"></div> {# <=== vue component #}
+            {% include 'ChillActivityBundle:Activity:new.html.twig' with {'context': 'person'} %}
+            
+</div>
 {% endblock %}
 
 {% block js %}
-    {{ encore_entry_link_tags('async_upload') }}
+    {{ encore_entry_link_tags('mod_async_upload') }}
     <script type="text/javascript">
         window.addEventListener('DOMContentLoaded', function (e) {
             chill.displayAlertWhenLeavingUnsubmittedForm('form[name="{{ form.vars.form.vars.name }}"]', 
@@ -22,6 +26,6 @@
 {% endblock %}
 
 {% block css %}
-    {{ encore_entry_link_tags('async_upload') }}
+    {{ encore_entry_link_tags('mod_async_upload') }}
     {{ encore_entry_link_tags('vue_activity') }}
 {% endblock %}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/selectTypePerson.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/selectTypePerson.html.twig
index cb31749fd..da9b561d0 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/selectTypePerson.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/selectTypePerson.html.twig
@@ -1,4 +1,4 @@
-{% extends "@ChillPerson/layout.html.twig"  %}
+{% extends "@ChillPerson/Person/layout.html.twig"  %}
 
 {% set activeRouteKey = 'chill_activity_activity_new' %}
 
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
index 92d2069c0..f46e80cd2 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
@@ -4,7 +4,7 @@
 <h1>
   {{ "Activity"|trans }}
   {%- if t.emergencyVisible and entity.emergency -%}
-  <span class="badge badge-secondary">
+  <span class="badge bg-secondary">
     {{- 'Emergency'|trans -}}
   </span>
 {%- endif -%}
@@ -109,25 +109,28 @@
     {% set accompanying_course_id = accompanyingCourse.id %}
 {% endif %}
 
-<ul class="record_actions">
+<ul class="record_actions sticky-form-buttons">
     <li class="cancel">
-        <a class="sc-button bt-cancel" href="{{ path('chill_activity_activity_list', { 'person_id': person_id, 'accompanying_period_id': accompanying_course_id } ) }}">
+        <a class="btn btn-cancel" href="{{ path('chill_activity_activity_list', { 'person_id': person_id, 'accompanying_period_id': accompanying_course_id } ) }}">
             {{ 'Back to the list'|trans }}
         </a>
     </li>
     <li>
-    <a class="sc-button bt-update" href="{{ path('chill_activity_activity_edit', { 'id': entity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}">
-        {{ 'Edit'|trans }}
-    </a>
+        <a class="btn btn-update" href="{{ path('chill_activity_activity_edit', { 'id': entity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}">
+            {{ 'Edit'|trans }}
+        </a>
     </li>
+    
     {# TODO
     {% if is_granted('CHILL_ACTIVITY_DELETE', entity) %}
     #}
+    
     <li>
-        <a href="{{ path('chill_activity_activity_delete', { 'id': entity.id, 'person_id' : person_id, 'accompanying_period_id': accompanying_course_id } ) }}" class="sc-button bt-delete">
+        <a href="{{ path('chill_activity_activity_delete', { 'id': entity.id, 'person_id' : person_id, 'accompanying_period_id': accompanying_course_id } ) }}" class="btn btn-delete">
             {{ 'Delete'|trans }}
         </a>
     </li>
+    
     {#
     {% endif %}
     #}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/showAccompanyingCourse.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/showAccompanyingCourse.html.twig
index fc046ed7e..abfff78be 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/showAccompanyingCourse.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/showAccompanyingCourse.html.twig
@@ -7,5 +7,9 @@
 {% import 'ChillActivityBundle:ActivityReason:macro.html.twig' as m %}
 
 {% block content -%}
-    {% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'accompanyingCourse'} %}
+<div class="activity-show">
+            
+            {% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'accompanyingCourse'} %}
+            
+</div> 
 {% endblock content %}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/showInNotification.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/showInNotification.html.twig
new file mode 100644
index 000000000..5128e9a64
--- /dev/null
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/showInNotification.html.twig
@@ -0,0 +1,4 @@
+
+{{ dump(notification) }}
+
+<a href="{{ path('chill_activity_activity_show', {'id': notification.relatedEntityId })  }}">Go to Activity</a>
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig
index b42de7b7e..3e4674ebf 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig
@@ -1,4 +1,4 @@
-{% extends "@ChillPerson/layout.html.twig"  %}
+{% extends "@ChillPerson/Person/layout.html.twig"  %}
 
 {% set activeRouteKey = 'chill_activity_activity_list' %}
 
@@ -7,5 +7,9 @@
 {% import 'ChillActivityBundle:ActivityReason:macro.html.twig' as m %}
 
 {% block personcontent -%}
-    {% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'person'} %}
+<div class="activity-show">
+            
+            {% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'person'} %}
+            
+</div>                
 {% endblock personcontent %}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/ActivityPresence/index.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/ActivityPresence/index.html.twig
index 04f0f5dec..b3d1ec9f2 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityPresence/index.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityPresence/index.html.twig
@@ -25,7 +25,7 @@
                 <td>
                     <ul class="record_actions">
                         <li>
-                            <a href="{{ path('chill_crud_activity_presence_edit', { 'id': entity.id }) }}" class="sc-button bt-edit" title="{{ 'edit'|trans }}"></a>
+                            <a href="{{ path('chill_crud_activity_presence_edit', { 'id': entity.id }) }}" class="btn btn-edit" title="{{ 'edit'|trans }}"></a>
                         </li>
                     </ul>
                 </td>
@@ -36,7 +36,7 @@
 
     <ul class="record_actions">
         <li>
-            <a href="{{ path('chill_crud_activity_presence_new') }}" class="sc-button bt-create">
+            <a href="{{ path('chill_crud_activity_presence_new') }}" class="btn btn-create">
                 {{ 'Create a new activity presence'|trans }}
             </a>
         </li>
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/edit.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/edit.html.twig
index e8baab4bd..60089fa6f 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/edit.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/edit.html.twig
@@ -26,10 +26,10 @@
 
     <ul class="record_actions">
         <li class="cancel">
-            <a href="{{ path('chill_activity_activityreason') }}" class="sc-button bt-cancel">{{ 'Back to the list'|trans }}</a>
+            <a href="{{ path('chill_activity_activityreason') }}" class="btn btn-cancel">{{ 'Back to the list'|trans }}</a>
         </li>
         <li>
-            {{ form_row(edit_form.submit, { 'attr': { 'class' : 'sc-button orange' } } ) }}
+            {{ form_row(edit_form.submit, { 'attr': { 'class' : 'btn btn-chill-orange' } } ) }}
         </li>
     </ul>
 
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/index.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/index.html.twig
index 99aa1bfa7..0dff9b5c4 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/index.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/index.html.twig
@@ -33,10 +33,10 @@
                 <td>
                 <ul class="record_actions">
                     <li>
-                        <a href="{{ path('chill_activity_activityreason_show', { 'id': entity.id }) }}" class="sc-button bt-show" title="{{ 'show'|trans }}"></a>
+                        <a href="{{ path('chill_activity_activityreason_show', { 'id': entity.id }) }}" class="btn btn-show" title="{{ 'show'|trans }}"></a>
                     </li>
                     <li>
-                        <a href="{{ path('chill_activity_activityreason_edit', { 'id': entity.id }) }}" class="sc-button bt-edit" title="{{ 'edit'|trans }}"></a>
+                        <a href="{{ path('chill_activity_activityreason_edit', { 'id': entity.id }) }}" class="btn btn-edit" title="{{ 'edit'|trans }}"></a>
                     </li>
                 </ul>
                 </td>
@@ -47,7 +47,7 @@
 
     <ul class="record_actions">
         <li>
-            <a href="{{ path('chill_activity_activityreason_new') }}" class="sc-button bt-new">
+            <a href="{{ path('chill_activity_activityreason_new') }}" class="btn btn-new">
                 {{ 'Create a new activity reason'|trans }}
             </a>
         </li>
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/new.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/new.html.twig
index 13b8b41e4..16d8553d1 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/new.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/new.html.twig
@@ -26,10 +26,10 @@
 
     <ul class="record_actions">
         <li class="cancel">
-            <a href="{{ path('chill_activity_activityreason') }}" class="sc-button bt-cancel">{{ 'Back to the list'|trans }}</a>
+            <a href="{{ path('chill_activity_activityreason') }}" class="btn btn-cancel">{{ 'Back to the list'|trans }}</a>
         </li>
         <li>
-            {{ form_row(form.submit, { 'attr': { 'class' : 'sc-button bt-new' } } ) }}
+            {{ form_row(form.submit, { 'attr': { 'class' : 'btn btn-new' } } ) }}
         </li>
     </ul>
 
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/show.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/show.html.twig
index 6ac8e2a24..db846bd73 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/show.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/show.html.twig
@@ -40,12 +40,12 @@
 
     <ul class="record_actions">
         <li class="cancel">
-            <a href="{{ path('chill_activity_activityreason') }}" class="sc-button bt-cancel">
+            <a href="{{ path('chill_activity_activityreason') }}" class="btn btn-cancel">
                 {{ 'Back to the list'|trans }}
             </a>
         </li>
         <li>
-            <a href="{{ path('chill_activity_activityreason_edit', { 'id': entity.id }) }}" class="sc-button bt-edit">
+            <a href="{{ path('chill_activity_activityreason_edit', { 'id': entity.id }) }}" class="btn btn-edit">
                 {{ 'Edit'|trans }}
             </a>
         </li>
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/edit.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/edit.html.twig
index 7a161dad9..516c42f0b 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/edit.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/edit.html.twig
@@ -25,12 +25,12 @@
 
     <ul class="record_actions">
         <li class="cancel">
-            <a href="{{ path('chill_activity_activityreasoncategory') }}" class="sc-button bt-cancel">
+            <a href="{{ path('chill_activity_activityreasoncategory') }}" class="btn btn-cancel">
                 {{ 'Back to the list'|trans }}
             </a>
         </li>
         <li>
-            {{ form_row(edit_form.submit, { 'attr': { 'class': 'sc-button bt-edit' } } ) }}
+            {{ form_row(edit_form.submit, { 'attr': { 'class': 'btn btn-edit' } } ) }}
         </li>
     </ul>
 
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/index.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/index.html.twig
index db9c927c4..213b3a88f 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/index.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/index.html.twig
@@ -34,10 +34,10 @@
                 <td>
                     <ul class="record_actions">
                     <li>
-                        <a href="{{ path('chill_activity_activityreasoncategory_show', { 'id': entity.id }) }}" class="sc-button bt-show" title="{{ 'show'|trans }}"></a>
+                        <a href="{{ path('chill_activity_activityreasoncategory_show', { 'id': entity.id }) }}" class="btn btn-show" title="{{ 'show'|trans }}"></a>
                     </li>
                     <li>
-                        <a href="{{ path('chill_activity_activityreasoncategory_edit', { 'id': entity.id }) }}" class="sc-button bt-edit" title="{{ 'edit'|trans }}"></a>
+                        <a href="{{ path('chill_activity_activityreasoncategory_edit', { 'id': entity.id }) }}" class="btn btn-edit" title="{{ 'edit'|trans }}"></a>
                     </li>
                 </ul>
                 </td>
@@ -48,7 +48,7 @@
 
     <ul class="record_actions">
         <li>
-            <a href="{{ path('chill_activity_activityreasoncategory_new') }}" class="sc-button bt-new">
+            <a href="{{ path('chill_activity_activityreasoncategory_new') }}" class="btn btn-new">
                 {{ 'Create a new activity category reason'|trans }}
             </a>
         </li>
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/new.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/new.html.twig
index 3ac9e503f..d8f737001 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/new.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/new.html.twig
@@ -25,10 +25,10 @@
 
     <ul class="record_actions">
         <li class="cancel">
-            <a href="{{ path('chill_activity_activityreasoncategory') }}" class="sc-button bt-cancel">{{ 'Back to the list'|trans }}</a>
+            <a href="{{ path('chill_activity_activityreasoncategory') }}" class="btn btn-cancel">{{ 'Back to the list'|trans }}</a>
         </li>
         <li>
-            {{ form_widget(form.submit, { 'attr': { 'class' : 'sc-button bt-new' } } ) }}
+            {{ form_widget(form.submit, { 'attr': { 'class' : 'btn btn-new' } } ) }}
         </li>
     </ul>
     {{ form_end(form) }}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/show.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/show.html.twig
index d45a7f27c..7277e4ced 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/show.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/show.html.twig
@@ -39,12 +39,12 @@
     </table>
     <ul class="record_actions">
         <li class="cancel">
-            <a href="{{ path('chill_activity_activityreasoncategory') }}" class="sc-button bt-cancel">
+            <a href="{{ path('chill_activity_activityreasoncategory') }}" class="btn btn-cancel">
                 {{ 'Back to the list'|trans }}
             </a>
         </li>
         <li>
-            <a href="{{ path('chill_activity_activityreasoncategory_edit', { 'id': entity.id }) }}" class="sc-button bt-edit">
+            <a href="{{ path('chill_activity_activityreasoncategory_edit', { 'id': entity.id }) }}" class="btn btn-edit">
                 {{ 'Edit'|trans }}
             </a>
         </li>
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/ActivityType/index.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/ActivityType/index.html.twig
index fd1fd8e29..91e8ebb0e 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityType/index.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityType/index.html.twig
@@ -41,7 +41,7 @@
                 <td>
                 <ul class="record_actions">
                     <li>
-                        <a href="{{ path('chill_crud_activity_type_edit', { 'id': entity.id }) }}" class="sc-button bt-edit" title="{{ 'edit'|trans }}"></a>
+                        <a href="{{ path('chill_crud_activity_type_edit', { 'id': entity.id }) }}" class="btn btn-edit" title="{{ 'edit'|trans }}"></a>
                     </li>
                 </ul>
                 </td>
@@ -52,7 +52,7 @@
 
         <ul class="record_actions">
         <li>
-            <a href="{{ path('chill_crud_activity_type_new') }}" class="sc-button bt-create">
+            <a href="{{ path('chill_crud_activity_type_new') }}" class="btn btn-create">
                 {{ 'Create a new activity type'|trans }}
             </a>
         </li>
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/ActivityTypeCategory/index.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/ActivityTypeCategory/index.html.twig
index 2834e50dd..9d04eb6d0 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityTypeCategory/index.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityTypeCategory/index.html.twig
@@ -25,7 +25,7 @@
                 <td>
                     <ul class="record_actions">
                         <li>
-                            <a href="{{ path('chill_crud_activity_type_category_edit', { 'id': entity.id }) }}" class="sc-button bt-edit" title="{{ 'edit'|trans }}"></a>
+                            <a href="{{ path('chill_crud_activity_type_category_edit', { 'id': entity.id }) }}" class="btn btn-edit" title="{{ 'edit'|trans }}"></a>
                         </li>
                     </ul>
                 </td>
@@ -36,7 +36,7 @@
 
     <ul class="record_actions">
         <li>
-            <a href="{{ path('chill_crud_activity_type_category_new') }}" class="sc-button bt-create">
+            <a href="{{ path('chill_crud_activity_type_category_new') }}" class="btn btn-create">
                 {{ 'Create a new activity type category'|trans }}
             </a>
         </li>
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Timeline/activity_person_context.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Timeline/activity_person_context.html.twig
index c968c889b..435be1958 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Timeline/activity_person_context.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Timeline/activity_person_context.html.twig
@@ -29,13 +29,13 @@
 
     <ul class="record_actions">
         <li>
-            <a href="{{ path('chill_activity_activity_show', { 'person_id': activity.person.id, 'id': activity.id} ) }}" class="sc-button bt-view">
+            <a href="{{ path('chill_activity_activity_show', { 'person_id': activity.person.id, 'id': activity.id} ) }}" class="btn btn-view">
                 {{ 'Show the activity'|trans }}
             </a>
         </li>
         {% if is_granted('CHILL_ACTIVITY_UPDATE', activity) %}
         <li>
-            <a href="{{ path('chill_activity_activity_edit', { 'person_id': activity.person.id, 'id': activity.id} ) }}" class="sc-button bt-edit">
+            <a href="{{ path('chill_activity_activity_edit', { 'person_id': activity.person.id, 'id': activity.id} ) }}" class="btn btn-edit">
                 {{ 'Edit the activity'|trans }}
             </a>
         </li>
diff --git a/src/Bundle/ChillActivityBundle/chill.webpack.config.js b/src/Bundle/ChillActivityBundle/chill.webpack.config.js
index d40ae2d4a..f312e8a19 100644
--- a/src/Bundle/ChillActivityBundle/chill.webpack.config.js
+++ b/src/Bundle/ChillActivityBundle/chill.webpack.config.js
@@ -1,10 +1,11 @@
 // this file loads all assets from the Chill person bundle
-module.exports = function(encore, entries) {
-    entries.push(__dirname + '/Resources/public/index.js');
-    
+module.exports = function(encore, entries)
+{
+    entries.push(__dirname + '/Resources/public/chill/index.js');
+
     encore.addAliases({
         ChillActivityAssets: __dirname + '/Resources/public'
     });
-    
+
     encore.addEntry('vue_activity', __dirname + '/Resources/public/vuejs/Activity/index.js');
 };
diff --git a/src/Bundle/ChillActivityBundle/config/services.yaml b/src/Bundle/ChillActivityBundle/config/services.yaml
index 411ad1b5a..86168101a 100644
--- a/src/Bundle/ChillActivityBundle/config/services.yaml
+++ b/src/Bundle/ChillActivityBundle/config/services.yaml
@@ -1,4 +1,4 @@
-services:     
+services:
     chill.activity.security.authorization.activity_voter:
         class: Chill\ActivityBundle\Security\Authorization\ActivityVoter
         arguments:
@@ -6,7 +6,7 @@ services:
         tags:
             - { name: security.voter }
             - { name: chill.role }
-            
+
     chill.activity.security.authorization.activity_stats_voter:
         class: Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter
         arguments:
@@ -14,8 +14,8 @@ services:
         tags:
             - { name: security.voter }
             - { name: chill.role }
-            
-            
+
+
     chill.activity.timeline:
         class: Chill\ActivityBundle\Timeline\TimelineActivityProvider
         arguments:
@@ -33,3 +33,8 @@ services:
         autoconfigure: true
         resource: '../Menu/'
         tags: ['chill.menu_builder']
+
+    Chill\ActivityBundle\Notification\:
+        autowire: true
+        autoconfigure: true
+        resource: '../Notification'
diff --git a/src/Bundle/ChillBudgetBundle/Resources/views/Charge/confirm_delete.html.twig b/src/Bundle/ChillBudgetBundle/Resources/views/Charge/confirm_delete.html.twig
index 32602f99f..1f191eafd 100644
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Charge/confirm_delete.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Charge/confirm_delete.html.twig
@@ -1,4 +1,4 @@
-{% extends "@ChillPerson/layout.html.twig"  %}
+{% extends "@ChillPerson/Person/layout.html.twig"  %}
 
 {% set activeRouteKey = '' %}
 {% set person = element.person %}
diff --git a/src/Bundle/ChillBudgetBundle/Resources/views/Charge/edit.html.twig b/src/Bundle/ChillBudgetBundle/Resources/views/Charge/edit.html.twig
index dba002163..5b1bc538a 100644
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Charge/edit.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Charge/edit.html.twig
@@ -1,4 +1,4 @@
-{% extends "@ChillPerson/layout.html.twig" %}
+{% extends "@ChillPerson/Person/layout.html.twig" %}
 
 {% set activeRouteKey = '' %}
 {% set title = 'Edit Charge for %name%'|trans({ '%name%' : person.firstName ~ " " ~ person.lastName } ) %}
@@ -18,12 +18,12 @@
 
 <ul class="record_actions sticky-form-buttons">
     <li class="cancel">
-        <a href="{{ path("chill_budget_elements_index", { 'id': person.id } ) }}" class="sc-button bt-cancel">
+        <a href="{{ path("chill_budget_elements_index", { 'id': person.id } ) }}" class="btn btn-cancel">
            {{ 'Back to the list'|trans }}
         </a>
     </li>
     <li>
-        {{ form_widget(form.submit, { 'attr' : { 'class': 'sc-button bt-create' }, 'label': 'Edit' } ) }}
+        {{ form_widget(form.submit, { 'attr' : { 'class': 'btn btn-create' }, 'label': 'Edit' } ) }}
     </li>
 </ul>
        
diff --git a/src/Bundle/ChillBudgetBundle/Resources/views/Charge/new.html.twig b/src/Bundle/ChillBudgetBundle/Resources/views/Charge/new.html.twig
index 5aa0f0728..e784b5bf7 100644
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Charge/new.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Charge/new.html.twig
@@ -1,4 +1,4 @@
-{% extends "@ChillPerson/layout.html.twig" %}
+{% extends "@ChillPerson/Person/layout.html.twig" %}
 
 {% set activeRouteKey = '' %}
 {% set title = 'New Charge for %name%'|trans({ '%name%' : person.firstName ~ " " ~ person.lastName } ) %}
@@ -18,12 +18,12 @@
 
 <ul class="record_actions sticky-form-buttons">
     <li class="cancel">
-        <a href="{{ path("chill_budget_elements_index", { 'id': person.id } ) }}" class="sc-button bt-cancel">
+        <a href="{{ path("chill_budget_elements_index", { 'id': person.id } ) }}" class="btn btn-cancel">
            {{ 'Back to the list'|trans }}
         </a>
     </li>
     <li>
-        {{ form_widget(form.submit, { 'attr' : { 'class': 'sc-button bt-create' }, 'label': 'Create' } ) }}
+        {{ form_widget(form.submit, { 'attr' : { 'class': 'btn btn-create' }, 'label': 'Create' } ) }}
     </li>
 </ul>
        
diff --git a/src/Bundle/ChillBudgetBundle/Resources/views/Charge/view.html.twig b/src/Bundle/ChillBudgetBundle/Resources/views/Charge/view.html.twig
index e339c06e3..d939fe81a 100644
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Charge/view.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Charge/view.html.twig
@@ -1,4 +1,4 @@
-{% extends "@ChillPerson/layout.html.twig" %}
+{% extends "@ChillPerson/Person/layout.html.twig" %}
 
 {% set activeRouteKey = '' %}
 {% set person = element.person %}
@@ -39,13 +39,13 @@
 
 <ul class="record_actions sticky-form-buttons">
     <li class="cancel">
-        <a href="{{ path("chill_budget_elements_index", { 'id': person.id } ) }}" class="sc-button bt-cancel">
+        <a href="{{ path("chill_budget_elements_index", { 'id': person.id } ) }}" class="btn btn-cancel">
            {{ 'Back to the list'|trans }}
         </a>
     </li>
     {% if is_granted(constant('Chill\\AMLI\\BudgetBundle\\Security\\Authorization\\BudgetElementVoter::UPDATE'), element) %}
         <li>
-            <a href="{{ path('chill_budget_charge_edit', { 'id': element.id } ) }}" class="sc-button bt-edit">{{ 'Edit'|trans }}</a>
+            <a href="{{ path('chill_budget_charge_edit', { 'id': element.id } ) }}" class="btn btn-edit">{{ 'Edit'|trans }}</a>
         </li>
     {% endif %}
 </ul>
diff --git a/src/Bundle/ChillBudgetBundle/Resources/views/Element/index.html.twig b/src/Bundle/ChillBudgetBundle/Resources/views/Element/index.html.twig
index 6824b9aac..aaca4c7ac 100644
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Element/index.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Element/index.html.twig
@@ -1,4 +1,4 @@
-{% extends "@ChillPerson/layout.html.twig" %}
+{% extends "@ChillPerson/Person/layout.html.twig" %}
 
 {% set activeRouteKey = '' %}
 {% set title = 'Budget for %name%'|trans({ '%name%' : person.firstName ~ " " ~ person.lastName } ) %}
@@ -68,17 +68,17 @@
                 <ul class="record_actions">
                     {% if is_granted(constant('Chill\\AMLI\\BudgetBundle\\Security\\Authorization\\BudgetElementVoter::SHOW'), f) %}
                         <li>
-                            <a href="{{ path('chill_budget_' ~ family ~ '_view', { 'id': f.id } ) }}" class="sc-button bt-show"></a>
+                            <a href="{{ path('chill_budget_' ~ family ~ '_view', { 'id': f.id } ) }}" class="btn btn-show"></a>
                         </li>
                     {% endif %}
                     {% if is_granted(constant('Chill\\AMLI\\BudgetBundle\\Security\\Authorization\\BudgetElementVoter::UPDATE'), f) %}
                         <li>
-                            <a href="{{ path('chill_budget_' ~ family ~'_edit', { 'id': f.id } ) }}" class="sc-button bt-edit"></a>
+                            <a href="{{ path('chill_budget_' ~ family ~'_edit', { 'id': f.id } ) }}" class="btn btn-edit"></a>
                         </li>
                     {% endif %}
                     {% if is_granted(constant('Chill\\AMLI\\BudgetBundle\\Security\\Authorization\\BudgetElementVoter::DELETE'), f) %}
                         <li>
-                            <a href="{{ path('chill_budget_' ~ family ~ '_delete', { 'id': f.id } ) }}" class="sc-button bt-delete"></a>
+                            <a href="{{ path('chill_budget_' ~ family ~ '_delete', { 'id': f.id } ) }}" class="btn btn-delete"></a>
                         </li>
                     {% endif %}
                 </ul>
@@ -161,10 +161,10 @@
     {% if is_granted(constant('Chill\\AMLI\\BudgetBundle\\Security\\Authorization\\BudgetElementVoter::CREATE'), person) %}
     <ul class="record_actions">
         <li>
-            <a class="sc-button bt-create" href="{{ path('chill_budget_resource_new', { 'id': person.id} ) }}">{{ 'Create new resource'|trans }}</a>
+            <a class="btn btn-create" href="{{ path('chill_budget_resource_new', { 'id': person.id} ) }}">{{ 'Create new resource'|trans }}</a>
         </li>
         <li>
-            <a class="sc-button bt-create" href="{{ path('chill_budget_charge_new', { 'id': person.id} ) }}">{{ 'Create new charge'|trans }}</a>
+            <a class="btn btn-create" href="{{ path('chill_budget_charge_new', { 'id': person.id} ) }}">{{ 'Create new charge'|trans }}</a>
         </li>
     </ul>
     {% endif %}
@@ -215,10 +215,10 @@
     {% if is_granted(constant('Chill\\AMLI\\BudgetBundle\\Security\\Authorization\\BudgetElementVoter::CREATE'), person) %}
         <ul class="record_actions">
             <li>
-                <a class="sc-button bt-create" href="{{ path('chill_budget_resource_new', { 'id': person.id} ) }}">{{ 'Create new resource'|trans }}</a>
+                <a class="btn btn-create" href="{{ path('chill_budget_resource_new', { 'id': person.id} ) }}">{{ 'Create new resource'|trans }}</a>
             </li>
             <li>
-                <a class="sc-button bt-create" href="{{ path('chill_budget_charge_new', { 'id': person.id} ) }}">{{ 'Create new charge'|trans }}</a>
+                <a class="btn btn-create" href="{{ path('chill_budget_charge_new', { 'id': person.id} ) }}">{{ 'Create new charge'|trans }}</a>
             </li>
         </ul>
     {% endif %}
diff --git a/src/Bundle/ChillBudgetBundle/Resources/views/Resource/confirm_delete.html.twig b/src/Bundle/ChillBudgetBundle/Resources/views/Resource/confirm_delete.html.twig
index 3e0903c75..fb5a95f91 100644
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Resource/confirm_delete.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Resource/confirm_delete.html.twig
@@ -1,4 +1,4 @@
-{% extends "@ChillPerson/layout.html.twig"  %}
+{% extends "@ChillPerson/Person/layout.html.twig"  %}
 
 {% set activeRouteKey = '' %}
 {% set person = element.person %}
diff --git a/src/Bundle/ChillBudgetBundle/Resources/views/Resource/edit.html.twig b/src/Bundle/ChillBudgetBundle/Resources/views/Resource/edit.html.twig
index 1b457c1ff..2afe5bf89 100644
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Resource/edit.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Resource/edit.html.twig
@@ -1,4 +1,4 @@
-{% extends "@ChillPerson/layout.html.twig" %}
+{% extends "@ChillPerson/Person/layout.html.twig" %}
 
 {% set activeRouteKey = '' %}
 {% set title = 'Edit Resource for %name%'|trans({ '%name%' : person.firstName ~ " " ~ person.lastName } ) %}
@@ -17,12 +17,12 @@
 
 <ul class="record_actions sticky-form-buttons">
     <li class="cancel">
-        <a href="{{ path("chill_budget_elements_index", { 'id': person.id } ) }}" class="sc-button bt-cancel">
+        <a href="{{ path("chill_budget_elements_index", { 'id': person.id } ) }}" class="btn btn-cancel">
            {{ 'Back to the list'|trans }}
         </a>
     </li>
     <li>
-        {{ form_widget(form.submit, { 'attr' : { 'class': 'sc-button bt-create' }, 'label': 'Edit' } ) }}
+        {{ form_widget(form.submit, { 'attr' : { 'class': 'btn btn-create' }, 'label': 'Edit' } ) }}
     </li>
 </ul>
        
diff --git a/src/Bundle/ChillBudgetBundle/Resources/views/Resource/new.html.twig b/src/Bundle/ChillBudgetBundle/Resources/views/Resource/new.html.twig
index c6eaeb06e..62f7f3c3d 100644
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Resource/new.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Resource/new.html.twig
@@ -1,4 +1,4 @@
-{% extends "@ChillPerson/layout.html.twig" %}
+{% extends "@ChillPerson/Person/layout.html.twig" %}
 
 {% set activeRouteKey = '' %}
 {% set title = 'New Resource for %name%'|trans({ '%name%' : person.firstName ~ " " ~ person.lastName } ) %}
@@ -17,12 +17,12 @@
 
 <ul class="record_actions sticky-form-buttons">
     <li class="cancel">
-        <a href="{{ path("chill_budget_elements_index", { 'id': person.id } ) }}" class="sc-button bt-cancel">
+        <a href="{{ path("chill_budget_elements_index", { 'id': person.id } ) }}" class="btn btn-cancel">
            {{ 'Back to the list'|trans }}
         </a>
     </li>
     <li>
-        {{ form_widget(form.submit, { 'attr' : { 'class': 'sc-button bt-create' }, 'label': 'Create' } ) }}
+        {{ form_widget(form.submit, { 'attr' : { 'class': 'btn btn-create' }, 'label': 'Create' } ) }}
     </li>
 </ul>
        
diff --git a/src/Bundle/ChillBudgetBundle/Resources/views/Resource/view.html.twig b/src/Bundle/ChillBudgetBundle/Resources/views/Resource/view.html.twig
index cbec06382..6f45aad84 100644
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Resource/view.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Resource/view.html.twig
@@ -1,4 +1,4 @@
-{% extends "@ChillPerson/layout.html.twig" %}
+{% extends "@ChillPerson/Person/layout.html.twig" %}
 
 {% set activeRouteKey = '' %}
 {% set person = element.person %}
@@ -39,13 +39,13 @@
 
 <ul class="record_actions sticky-form-buttons">
     <li class="cancel">
-        <a href="{{ path("chill_budget_elements_index", { 'id': person.id } ) }}" class="sc-button bt-cancel">
+        <a href="{{ path("chill_budget_elements_index", { 'id': person.id } ) }}" class="btn btn-cancel">
            {{ 'Back to the list'|trans }}
         </a>
     </li>
     {% if is_granted(constant('Chill\\AMLI\\BudgetBundle\\Security\\Authorization\\BudgetElementVoter::UPDATE'), element) %}
         <li>
-            <a href="{{ path('chill_budget_resource_edit', { 'id': element.id } ) }}" class="sc-button bt-edit">{{ 'Edit'|trans }}</a>
+            <a href="{{ path('chill_budget_resource_edit', { 'id': element.id } ) }}" class="btn btn-edit">{{ 'Edit'|trans }}</a>
         </li>
     {% endif %}
 </ul>
diff --git a/src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomField/edit.html.twig b/src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomField/edit.html.twig
index e2c9f16dc..17180762b 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomField/edit.html.twig
+++ b/src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomField/edit.html.twig
@@ -36,12 +36,12 @@
         {{ form_row(option) }}
     {% endfor %}
     {% endif %}
-    {{ form_row(edit_form.submit, {'attr': { 'class': 'sc-button btn-update' } } ) }}
+    {{ form_row(edit_form.submit, {'attr': { 'class': 'btn btn-update' } } ) }}
     {{ form_end(edit_form) }}
 
         <ul class="record_actions">
     <li>
-        <a href="{{ path('customfieldsgroup_show', { 'id': entity.customFieldsGroup.id }) }}" class="sc-button btn-reset">
+        <a href="{{ path('customfieldsgroup_show', { 'id': entity.customFieldsGroup.id }) }}" class="btn btn-reset">
             {{ 'Back to the group'|trans }}
         </a>
     </li>
diff --git a/src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomField/new.html.twig b/src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomField/new.html.twig
index 53919183b..b45aaa5c1 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomField/new.html.twig
+++ b/src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomField/new.html.twig
@@ -37,17 +37,17 @@
         {{ form_row(option) }}
     {% endfor %}
     {% endif %}
-    {{ form_row(form.submit, {'attr': { 'class': 'sc-button btn-create' } } ) }}
+    {{ form_row(form.submit, {'attr': { 'class': 'btn btn-create' } } ) }}
     {{ form_end(form) }}
     
     <ul class="record_actions">
     <li>
         {% if entity.customFieldsGroup is not null %}
-        <a href="{{ path('customfieldsgroup_show', { 'id': entity.customFieldsGroup.id }) }}" class="sc-button btn-reset">
+        <a href="{{ path('customfieldsgroup_show', { 'id': entity.customFieldsGroup.id }) }}" class="btn btn-reset">
             {{ 'Back to the group'|trans }}
         </a>
         {% else %}
-        <a href="{{ path('customfieldsgroup') }}" class="sc-button btn-reset">
+        <a href="{{ path('customfieldsgroup') }}" class="btn btn-reset">
             {{ 'Back to the list'|trans }}
         </a>
         {% endif %}
diff --git a/src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomFieldsGroup/edit.html.twig b/src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomFieldsGroup/edit.html.twig
index 086114355..2760ba9a0 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomFieldsGroup/edit.html.twig
+++ b/src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomFieldsGroup/edit.html.twig
@@ -27,17 +27,17 @@
     {% if edit_form.options is defined %}
     {{ form_row(edit_form.options) }}
     {% endif %}
-    {{ form_row(edit_form.submit, { 'attr': { 'class': 'sc-button bt-edit' } } ) }}
+    {{ form_row(edit_form.submit, { 'attr': { 'class': 'btn btn-edit' } } ) }}
     {{ form_end(edit_form) }}
 
         <ul class="record_actions">
     <li>
-        <a href="{{ path('customfieldsgroup') }}" class="sc-button bt-cancel">
+        <a href="{{ path('customfieldsgroup') }}" class="btn btn-cancel">
             {{ 'Back to the list'|trans }}
         </a>
     </li>
     <li>
-        <a href="{{ path('customfieldsgroup_show', { 'id' : entity.id }) }}" class="sc-button bt-cancel">
+        <a href="{{ path('customfieldsgroup_show', { 'id' : entity.id }) }}" class="btn btn-cancel">
             {{ 'show'|trans|capitalize }}
         </a>
     </li>
diff --git a/src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomFieldsGroup/index.html.twig b/src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomFieldsGroup/index.html.twig
index a3a8daa5b..8ca67a721 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomFieldsGroup/index.html.twig
+++ b/src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomFieldsGroup/index.html.twig
@@ -40,17 +40,17 @@
                         <i class="fa fa-star"></i>
                     {%- else -%}
                         {{ form_start(make_default_forms[entity.id]) }}
-                        {{ form_widget(make_default_forms[entity.id].submit, { 'attr' : { 'class' : 'sc-button bt-action' } } ) }}
+                        {{ form_widget(make_default_forms[entity.id].submit, { 'attr' : { 'class' : 'btn btn-action' } } ) }}
                         {{ form_end(make_default_forms[entity.id]) }}
                     {%- endif -%}
                 </td>
                 <td>
                 <ul class="record_actions">
                     <li>
-                        <a href="{{ path('customfieldsgroup_show', { 'id': entity.id }) }}" class="sc-button">{{ 'show'|trans|capitalize }}</a>
+                        <a href="{{ path('customfieldsgroup_show', { 'id': entity.id }) }}" class="btn btn-show">{{ 'show'|trans|capitalize }}</a>
                     </li>
                     <li>
-                        <a href="{{ path('customfieldsgroup_edit', { 'id': entity.id }) }}" class="sc-button btn-edit">{{ 'edit'|trans|capitalize }}</a>
+                        <a href="{{ path('customfieldsgroup_edit', { 'id': entity.id }) }}" class="btn btn-edit">{{ 'edit'|trans|capitalize }}</a>
                     </li>
                 </ul>
                 </td>
@@ -60,7 +60,7 @@
     </table>
 
     <p>
-        <a href="{{ path('customfieldsgroup_new') }}" class="sc-button bt-create">
+        <a href="{{ path('customfieldsgroup_new') }}" class="btn btn-create">
             {{ 'Create a new group'|trans }}
         </a>
     </p>
diff --git a/src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomFieldsGroup/new.html.twig b/src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomFieldsGroup/new.html.twig
index 588537f65..fe5f91734 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomFieldsGroup/new.html.twig
+++ b/src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomFieldsGroup/new.html.twig
@@ -23,8 +23,8 @@
     {{ form_row(form.name) }}
     {{ form_row(form.entity) }}
     <p>
-        {{ form_widget(form.submit, { 'attr' : { 'class': 'sc-button bt-create' } } ) }}
-        <a href="{{ path('customfieldsgroup') }}" class="sc-button bt-cancel">
+        {{ form_widget(form.submit, { 'attr' : { 'class': 'btn btn-create' } } ) }}
+        <a href="{{ path('customfieldsgroup') }}" class="btn btn-cancel">
             {{ 'Back to the list'|trans }}
         </a>
     </p>
diff --git a/src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomFieldsGroup/show.html.twig b/src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomFieldsGroup/show.html.twig
index c6e4fada1..38d819ab2 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomFieldsGroup/show.html.twig
+++ b/src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomFieldsGroup/show.html.twig
@@ -52,12 +52,12 @@
 
     <ul class="record_actions">
         <li>
-            <a href="{{ path('customfieldsgroup') }}" class="sc-button bt-cancel">
+            <a href="{{ path('customfieldsgroup') }}" class="btn btn-cancel">
                 {{ 'Back to the list'|trans }}
             </a>
         </li>
         <li>
-            <a href="{{ path('customfieldsgroup_edit', { 'id': entity.id }) }}" class="sc-button bt-edit">
+            <a href="{{ path('customfieldsgroup_edit', { 'id': entity.id }) }}" class="btn btn-edit">
                 {{ 'Edit'|trans }}
             </a>
         </li>
@@ -90,27 +90,27 @@
                 {%- endif -%}
             </td>
             <td style="text-align:center">
-                <a href="{{ path('customfield_edit', { 'id' : field.id }) }}" class="sc-button bt-edit">{{ 'edit'|trans|capitalize }}</a>
+                <a href="{{ path('customfield_edit', { 'id' : field.id }) }}" class="btn btn-edit">{{ 'edit'|trans|capitalize }}</a>
             </td>
         </tr>
         {%- endfor -%}
         </tbody>
     </table>
         {{ form_start(create_field_form) }}
-            <div class="grid-4">
+            <div class="col-4">
             {{ form_widget(create_field_form.type) }}
             </div>
-            {{ form_widget(create_field_form.submit, { 'attr': { 'class': 'sc-button bt-create' }, 'label': 'Add a new field' } ) }}
+            {{ form_widget(create_field_form.submit, { 'attr': { 'class': 'btn btn-create' }, 'label': 'Add a new field' } ) }}
             {{ form_end(create_field_form) }}
     {%- else -%}
         <p>
             {{ 'Any field is currently associated with this group'|trans }}
         </p>
             {{ form_start(create_field_form) }}
-            <div class="grid-4">
+            <div class="col-4">
             {{ form_widget(create_field_form.type) }}
             </div>
-            {{ form_widget(create_field_form.submit, { 'attr': { 'class': 'sc-button bt-create' }, 'label': 'Create a new field' } ) }}
+            {{ form_widget(create_field_form.submit, { 'attr': { 'class': 'btn btn-create' }, 'label': 'Create a new field' } ) }}
             {{ form_end(create_field_form) }}
     {%- endif -%}
 {% endblock %}
diff --git a/src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomFieldsRendering/text.html.twig b/src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomFieldsRendering/text.html.twig
index 6b977f123..ab04ebd7e 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomFieldsRendering/text.html.twig
+++ b/src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomFieldsRendering/text.html.twig
@@ -1 +1,7 @@
-{% if text is not empty %}{{ text|nl2br }}{% else %}<span class="custom_fields_text empty">{{ 'None'|trans }}</span>{% endif %}
\ No newline at end of file
+{% if text is not empty %}
+    {% apply markdown_to_html %}
+    {{ text|raw }}
+    {% endapply %}
+{% else %}
+    <span class="custom_fields_text empty">{{ 'None'|trans }}</span>
+{% endif %}
\ No newline at end of file
diff --git a/src/Bundle/ChillCustomFieldsBundle/Resources/views/Form/fields.html.twig b/src/Bundle/ChillCustomFieldsBundle/Resources/views/Form/fields.html.twig
index 1fc722d77..a19f22e6f 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Resources/views/Form/fields.html.twig
+++ b/src/Bundle/ChillCustomFieldsBundle/Resources/views/Form/fields.html.twig
@@ -65,7 +65,7 @@
         }
 
         function initializeCFChoiceOptionsChoices(div_id) {
-            var add_element_link = $('<a id="' + div_id + '_add_element_link"" href="#" class="sc-button bt-submit">{{ 'Add an element'|trans }}</a>');
+            var add_element_link = $('<a id="' + div_id + '_add_element_link"" href="#" class="btn btn-submit">{{ 'Add an element'|trans }}</a>');
             var div = $('#' + div_id);
             div.append(add_element_link);
             div.data('index', div.find('td').length);
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/module/async_upload/uploader.js b/src/Bundle/ChillDocStoreBundle/Resources/public/module/async_upload/uploader.js
index 3fcfb0a42..6cb68fcea 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/module/async_upload/uploader.js
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/module/async_upload/uploader.js
@@ -280,10 +280,10 @@ var insertRemoveButton = (zone, zoneData) => {
         labelCancel = 'Restaurer'
         ;
     
-    removeButton.classList.add('sc-button', 'bt-delete');
+    removeButton.classList.add('btn', 'btn-delete');
     removeButton.textContent = labelRemove;
     
-    cancelButton.classList.add('sc-button');
+    cancelButton.classList.add('btn', 'btn-cancel');
     cancelButton.textContent = labelCancel;
     
     removeButton.addEventListener('click', (e) => {
@@ -355,7 +355,7 @@ var insertDownloadButton = (zone, zoneData) => {
     newButton.dataset.labelPreparing = labelPreparing;
     newButton.dataset.labelReady = labelReady;
     newButton.dataset.tempUrlGetGenerator = tempUrlGenerator + '?' + tempUrlGeneratorParams.toString();
-    newButton.classList.add('sc-button', 'bt-download', 'dz-bt-below-dropzone');
+    newButton.classList.add('btn', 'btn-download', 'dz-bt-below-dropzone');
     newButton.textContent = labelQuietButton;
     
     addBelowButton(newButton, zone, zoneData);
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/_delete_form.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/_delete_form.html.twig
index 5d77512dd..a6940f25f 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/_delete_form.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/_delete_form.html.twig
@@ -17,5 +17,5 @@
 <form method="post" action="{{ path('document_category_delete', {'bundleId': document_category.bundleId, 'idInsideBundle': document_category.idInsideBundle}) }}">
     <input type="hidden" name="_method" value="DELETE">
     <input type="hidden" name="_token" value="{{ csrf_token('delete' ~ document_category.bundleId ~ document_category.idInsideBundle) }}">
-    <button class="sc-button bt-delete">{{ 'Delete' | trans }}</button>
+    <button class="btn btn-delete">{{ 'Delete' | trans }}</button>
 </form>
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/_form.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/_form.html.twig
index d6e513458..f144e4119 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/_form.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/_form.html.twig
@@ -16,5 +16,5 @@
 #}
 {{ form_start(form) }}
     {{ form_widget(form) }}
-    <button class="sc-button bt-edit">{{ button_label|default('Save') }}</button>
+    <button class="btn btn-edit">{{ button_label|default('Save') }}</button>
 {{ form_end(form) }}
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/edit.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/edit.html.twig
index 2b0556244..2b8f82c0b 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/edit.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/edit.html.twig
@@ -29,12 +29,12 @@
     {{ form_widget(form) }}
     <ul class="record_actions">
         <li class="cancel">
-            <a href="{{ path('document_category_index') }}" class="sc-button bt-cancel">
+            <a href="{{ path('document_category_index') }}" class="btn btn-cancel">
                 {{ 'Back to the category list' | trans }}
             </a>
         </li>
         <li>
-            <button class="sc-button bt-edit">{{ button_label|default('Edit')|trans }}</button>
+            <button class="btn btn-edit">{{ button_label|default('Edit')|trans }}</button>
         </li>
     </ul>
     {{ form_end(form) }}
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/index.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/index.html.twig
index 48512eff6..1c19ab64c 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/index.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/index.html.twig
@@ -41,9 +41,9 @@
 
                 <td>
                     <a href="{{ path('document_category_show', {'bundleId': document_category.bundleId, 'idInsideBundle': document_category.idInsideBundle}) }}"
-                       class="sc-button bt-show" title="{{ 'show' | trans }}"></a>
+                       class="btn btn-show" title="{{ 'show' | trans }}"></a>
                     <a href="{{ path('document_category_edit', {'bundleId': document_category.bundleId, 'idInsideBundle': document_category.idInsideBundle}) }}"
-                       class="sc-button bt-edit" title="{{ 'edit' | trans }}"></a>
+                       class="btn btn-edit" title="{{ 'edit' | trans }}"></a>
                 </td>
             </tr>
         {% else %}
@@ -56,7 +56,7 @@
 
     <ul class="record_actions">
         <li>
-            <a href="{{ path('document_category_new') }}" class="sc-button bt-create">{{ 'Create new category' | trans }}</a>
+            <a href="{{ path('document_category_new') }}" class="btn btn-create">{{ 'Create new category' | trans }}</a>
         </li>
     </ul>
 {% endblock %}
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/new.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/new.html.twig
index addf9922f..ea8685762 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/new.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/new.html.twig
@@ -29,12 +29,12 @@
     {{ form_widget(form) }}
     <ul class="record_actions">
         <li class="cancel">
-            <a href="{{ path('document_category_index') }}" class="sc-button bt-cancel">
+            <a href="{{ path('document_category_index') }}" class="btn btn-cancel">
                 {{ 'Back to the category list' | trans }}
             </a>
         </li>
         <li>
-            <button class="sc-button bt-new">{{ button_label|default('New')|trans }}</button>
+            <button class="btn btn-new">{{ button_label|default('New')|trans }}</button>
         </li>
     </ul>
     {{ form_end(form) }}
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/show.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/show.html.twig
index 3e3470f12..89930df34 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/show.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/show.html.twig
@@ -45,11 +45,11 @@
     <ul class="record_actions">
         <li class="cancel">
             <a href="{{ path('document_category_index') }}"
-               class="sc-button bt-cancel">{{ 'Back to the category list' | trans }}</a>
+               class="btn btn-cancel">{{ 'Back to the category list' | trans }}</a>
         </li>
         <li>
             <a href="{{ path('document_category_edit', {'bundleId': document_category.bundleId, 'idInsideBundle': document_category.idInsideBundle}) }}"
-               class="sc-button bt-edit">{{ 'Edit' | trans }}</a>
+               class="btn btn-edit">{{ 'Edit' | trans }}</a>
         </li>
         <li>
             {{ include('ChillDocStoreBundle:DocumentCategory:_delete_form.html.twig') }}
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/Macro/macro.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/Macro/macro.html.twig
index e42012a0b..886544b1e 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/Macro/macro.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/Macro/macro.html.twig
@@ -2,7 +2,7 @@
     {% if storedObject is null %}
         <!-- No document to download -->
     {% else %}
-        <a class="sc-button bt-download" 
+        <a class="btn btn-download" 
            data-label-preparing="{{ ('Preparing'|trans ~ '...')|escape('html_attr') }}" 
            data-label-ready="{{ 'Ready to show'|trans|escape('html_attr') }}" 
            data-download-button 
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/_delete_form.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/_delete_form.html.twig
index 80ae22935..8e92ef091 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/_delete_form.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/_delete_form.html.twig
@@ -1,5 +1,5 @@
 <form method="post" action="{{ path('person_document_delete', {'id': document.id, 'person': person.id}) }}" onsubmit="return confirm('Are you sure you want to delete this item?');">
     <input type="hidden" name="_method" value="DELETE">
     <input type="hidden" name="_token" value="{{ csrf_token('delete' ~ document.id) }}">
-    <button  class="sc-button bt-delete">{{ 'Delete' | trans }}</button>
+    <button  class="btn btn-delete">{{ 'Delete' | trans }}</button>
 </form>
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/edit.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/edit.html.twig
index 4cc84bd7d..bf3dcd407 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/edit.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/edit.html.twig
@@ -15,18 +15,18 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
 
-{% extends "@ChillPerson/layout.html.twig"  %}
+{% extends "@ChillPerson/Person/layout.html.twig"  %}
 
 {% set activeRouteKey = '' %}
 
 {% block title %}{{ 'Editing document for %name%'|trans({ '%name%': person|chill_entity_render_string } ) }}{% endblock %}
 {% block personcontent %}
     <h1>{{ 'Edit Document' | trans }}</h1>
-    
+
     {{ form_errors(form) }}
 
     {{ form_start(form) }}
-    
+
     {{ form_row(form.title) }}
     {{ form_row(form.date) }}
     {{ form_row(form.category) }}
@@ -36,12 +36,12 @@
 
     <ul class="record_actions">
         <li class="cancel">
-            <a href="{{ path('person_document_index', {'person': person.id}) }}" class="sc-button bt-cancel">
+            <a href="{{ path('person_document_index', {'person': person.id}) }}" class="btn btn-cancel">
                 {{ 'Back to the list' | trans }}
             </a>
         </li>
         <li class="edit">
-            <button class="sc-button bt-edit">{{ 'Edit'|trans }}</button>
+            <button class="btn btn-edit">{{ 'Edit'|trans }}</button>
         </li>
         {# {% if is_granted('CHILL_PERSON_DOCUMENT_DELETE', document) %}
             <li class="delete">
@@ -49,16 +49,16 @@
             </li>
         {% endif %} #}
     </ul>
-        
+
     {{ form_end(form) }}
 
 
 {% endblock %}
 
 {% block js %}
-    <script src="{{ asset('build/async_upload.js') }}" type="text/javascript"></script>
+    {{ encore_entry_script_tags('mod_async_upload') }}
 {% endblock %}
 
 {% block css %}
-    <link rel="stylesheet" href="{{ asset('build/async_upload.css') }}"/>
+    {{ encore_entry_link_tags('mod_async_upload') }}
 {% endblock %}
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/index.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/index.html.twig
index f30bf3558..662477c99 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/index.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/index.html.twig
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
 
-{% extends "@ChillPerson/layout.html.twig"  %}
+{% extends "@ChillPerson/Person/layout.html.twig"  %}
 
 {% set activeRouteKey = '' %}
 
@@ -24,7 +24,7 @@
 {% block title %}{{ 'Documents for %name%'|trans({ '%name%': person|chill_entity_render_string } ) }}{% endblock %}
 
 {% block js %}
-    <script src="{{ asset('build/async_upload.js') }}" type="text/javascript"></script>
+    {{ encore_entry_script_tags('mod_async_upload') }}
 {% endblock %}
 
 {% block personcontent %}
@@ -52,12 +52,12 @@
                             {{ m.download_button(document.object, document.title) }}
                         </li>
                         <li>
-                            <a href="{{ path('person_document_show', {'person': person.id, 'id': document.id}) }}" class="sc-button bt-show"></a>
+                            <a href="{{ path('person_document_show', {'person': person.id, 'id': document.id}) }}" class="btn btn-show"></a>
                         </li>
                     {% endif %}
                     {% if is_granted('CHILL_PERSON_DOCUMENT_UPDATE', document) %}
                         <li>
-                            <a href="{{ path('person_document_edit', {'person': person.id, 'id': document.id}) }}" class="sc-button bt-update"></a>
+                            <a href="{{ path('person_document_edit', {'person': person.id, 'id': document.id}) }}" class="btn btn-update"></a>
                         </li>
                     {% endif %}
                     </ul>
@@ -74,7 +74,7 @@
     {% if is_granted('CHILL_PERSON_DOCUMENT_CREATE', person) %}
         <ul class="record_actions">
             <li class="create">
-                <a href="{{ path('person_document_new', {'person': person.id}) }}" class="sc-button bt-create">
+                <a href="{{ path('person_document_new', {'person': person.id}) }}" class="btn btn-create">
                     {{ 'Create new document' | trans }}
                 </a>
             </li>
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/new.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/new.html.twig
index f16f53794..b60ad6550 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/new.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/new.html.twig
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
-{% extends "@ChillPerson/layout.html.twig"  %}
+{% extends "@ChillPerson/Person/layout.html.twig"  %}
 
 {% set activeRouteKey = '' %}
 
@@ -22,11 +22,11 @@
 
 {% block personcontent %}
     <h1>{{ 'New document for %name%'|trans({ '%name%': person|chill_entity_render_string } ) }}</h1>
-    
+
     {{ form_errors(form) }}
 
     {{ form_start(form) }}
-    
+
     {{ form_row(form.title) }}
     {{ form_row(form.date) }}
     {{ form_row(form.category) }}
@@ -36,21 +36,21 @@
 
     <ul class="record_actions">
         <li class="cancel">
-            <a href="{{ path('person_document_index', {'person': person.id}) }}" class="sc-button bt-cancel">
+            <a href="{{ path('person_document_index', {'person': person.id}) }}" class="btn btn-cancel">
                 {{ 'Back to the list' | trans }}
             </a>
         </li>
         <li class="create">
-            <button  class="sc-button bt-create">{{ 'Create'|trans }}</button>
+            <button  class="btn btn-create">{{ 'Create'|trans }}</button>
         </li>
     </ul>
     {{ form_end(form) }}
 {% endblock %}
 
 {% block js %}
-    <script src="{{ asset('build/async_upload.js') }}" type="text/javascript"></script>
+    {{ encore_entry_script_tags('mod_async_upload') }}
 {% endblock %}
 
 {% block css %}
-    <link rel="stylesheet" href="{{ asset('build/async_upload.css') }}"/>
+    {{ encore_entry_link_tags('mod_async_upload') }}
 {% endblock %}
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/show.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/show.html.twig
index 1761b4db7..f22864645 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/show.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/show.html.twig
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
-{% extends "@ChillPerson/layout.html.twig"  %}
+{% extends "@ChillPerson/Person/layout.html.twig"  %}
 
 {% set activeRouteKey = '' %}
 
@@ -23,19 +23,19 @@
 {% block title %}{{ 'Detail of document of %name%'|trans({ '%name%': person|chill_entity_render_string } ) }}{% endblock %}
 
 {% block js %}
-    <script src="{{ asset('build/async_upload.js') }}" type="text/javascript"></script>
+    {{ encore_entry_script_tags('mod_async_upload') }}
 {% endblock %}
 
 {% block personcontent %}
     <h1>{{ 'Document %title%' | trans({ '%title%': document.title }) }}</h1>
-    
+
     <dl class="chill_view_data">
         <dt>{{ 'Title'|trans }}</dt>
         <dd>{{ document.title }}</dd>
-        
+
         <dt>{{ 'Scope' | trans }}</dt>
         <dd>{{ document.scope.name | localize_translatable_string }}</dd>
-        
+
         <dt>{{ 'Category'|trans }}</dt>
         <dd>{{ document.category.name|localize_translatable_string }}</dd>
 
@@ -54,18 +54,18 @@
 
     <ul class="record_actions">
         <li class="cancel">
-            <a href="{{ path('person_document_index', {'person': person.id}) }}" class="sc-button bt-cancel">
+            <a href="{{ path('person_document_index', {'person': person.id}) }}" class="btn btn-cancel">
                 {{ 'Back to the list' | trans }}
             </a>
         </li>
-        
+
         <li>
             {{ m.download_button(document.object, document.title) }}
         </li>
 
         {% if is_granted('CHILL_PERSON_DOCUMENT_UPDATE', document) %}
             <li>
-                <a href="{{ path('person_document_edit', {'id': document.id, 'person': person.id}) }}" class="sc-button bt-edit">
+                <a href="{{ path('person_document_edit', {'id': document.id, 'person': person.id}) }}" class="btn btn-edit">
                     {{ 'Edit' | trans }}
                 </a>
             </li>
diff --git a/src/Bundle/ChillDocStoreBundle/chill.webpack.config.js b/src/Bundle/ChillDocStoreBundle/chill.webpack.config.js
index 14f94cd53..833052ef4 100644
--- a/src/Bundle/ChillDocStoreBundle/chill.webpack.config.js
+++ b/src/Bundle/ChillDocStoreBundle/chill.webpack.config.js
@@ -1,3 +1,4 @@
-module.exports = function(encore) {
-    encore.addEntry('async_upload', __dirname + '/Resources/public/module/async_upload/index.js');
+module.exports = function(encore)
+{
+    encore.addEntry('mod_async_upload', __dirname + '/Resources/public/module/async_upload/index.js');
 };
diff --git a/src/Bundle/ChillEventBundle/Resources/public/css/chillevent.css b/src/Bundle/ChillEventBundle/Resources/public/chill/chillevent.scss
similarity index 100%
rename from src/Bundle/ChillEventBundle/Resources/public/css/chillevent.css
rename to src/Bundle/ChillEventBundle/Resources/public/chill/chillevent.scss
diff --git a/src/Bundle/ChillEventBundle/Resources/public/chill/index.js b/src/Bundle/ChillEventBundle/Resources/public/chill/index.js
new file mode 100644
index 000000000..adb0dd85e
--- /dev/null
+++ b/src/Bundle/ChillEventBundle/Resources/public/chill/index.js
@@ -0,0 +1 @@
+require('./chillevent.scss');
diff --git a/src/Bundle/ChillEventBundle/Resources/public/index.js b/src/Bundle/ChillEventBundle/Resources/public/index.js
deleted file mode 100644
index 697693c59..000000000
--- a/src/Bundle/ChillEventBundle/Resources/public/index.js
+++ /dev/null
@@ -1 +0,0 @@
-require('./css/chillevent.css');
\ No newline at end of file
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Event/edit.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Event/edit.html.twig
index 97b32b328..288c81edd 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Event/edit.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Event/edit.html.twig
@@ -20,12 +20,12 @@
             {% set returnPath = app.request.get('return_path') %}
             {% set returnLabel = app.request.get('return_label') %}
 
-            <a href="{{ returnPath |default( path('chill_event_list_most_recent') ) }}" class="sc-button bt-cancel">
+            <a href="{{ returnPath |default( path('chill_event_list_most_recent') ) }}" class="btn btn-cancel">
                 {{ returnLabel |default('Back to the most recent events'|trans) }}
             </a>
         </li>
         <li>
-            {{ form_widget(edit_form.submit, { 'attr' : { 'class' : 'sc-button bt-update' } }) }}
+            {{ form_widget(edit_form.submit, { 'attr' : { 'class' : 'btn btn-update' } }) }}
         </li>
     </ul>
             
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Event/list.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Event/list.html.twig
index 366d0c588..6e77b6df8 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Event/list.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Event/list.html.twig
@@ -25,12 +25,12 @@
                         <ul class="record_actions">
                             <li>
                                 {# {% if is_granted('CHILL_EVENT_SEE_DETAILS', event) %} #}
-                                <a href="{{ path('chill_event__event_show', { 'event_id' : event.id } ) }}" class="sc-button black">
+                                <a href="{{ path('chill_event__event_show', { 'event_id' : event.id } ) }}" class="btn btn-dark">
                                     {{ 'See'|trans }}
                                 </a>
                                 {# {% endif %} #}
                                 {% if is_granted('CHILL_EVENT_UPDATE', event) %}
-                                <a href="{{ path('chill_event__event_edit', { 'event_id' : event.id } ) }}" class="sc-button bt-update">
+                                <a href="{{ path('chill_event__event_edit', { 'event_id' : event.id } ) }}" class="btn btn-update">
                                     {{ 'Edit'|trans }}
                                 </a>
                                 {% endif %}
@@ -46,13 +46,13 @@
 
 <ul class="record_actions">
     <li>
-        <a href="{{ path('chill_event__event_new_pickcenter') }}" class="sc-button bt-create" >
+        <a href="{{ path('chill_event__event_new_pickcenter') }}" class="btn btn-create" >
             {{ 'New event'|trans }}
         </a>
     </li>                
     {% if preview == true and events|length < total %}
     <li>
-        <a href="{{ path('chill_main_search', { "name": search_name, "q" : pattern }) }}" class="sc-button btn-next">
+        <a href="{{ path('chill_main_search', { "name": search_name, "q" : pattern }) }}" class="btn btn-next">
             {{ 'See all results'|trans }}
         </a>
     </li>
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Event/listByPerson.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Event/listByPerson.html.twig
index 2cd19d08a..e9f9a0270 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Event/listByPerson.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Event/listByPerson.html.twig
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
-{% extends "@ChillPerson/layout.html.twig"  %}
+{% extends "@ChillPerson/Person/layout.html.twig"  %}
 
 {% set activeRouteKey = 'chill_event__list_by_person' %}
 {% set currentPerson =  person.firstName ~ ' ' ~ person.lastName %}
@@ -24,7 +24,7 @@
 {% block personcontent %}
 <h2>{{ 'Events participation' |trans }}</h2>
 
-<table class="events">
+<table class="table table-striped table-bordered mt-3 events">
     <thead>
         <tr>
             <th class="chill-green">{{ 'Date'|trans }}</th>
@@ -44,53 +44,58 @@
                 <td>{{ participation.role.name|localize_translatable_string }}</td>
                 <td>{{ participation.status.name|localize_translatable_string }}</td>
                 <td>
-                    <ul class="record_actions">
-                        <li>
+                    <ul class="list-inline">
 
-                            {% set currentPath = path(app.request.attributes.get('_route'), app.request.attributes.get('_route_params')) %}
-                            {% set returnLabel = 'Back to %person% events'|trans({ '%person%' : currentPerson } ) %}
+                        {% set currentPath = path(app.request.attributes.get('_route'), app.request.attributes.get('_route_params')) %}
+                        {% set returnLabel = 'Back to %person% events'|trans({ '%person%' : currentPerson } ) %}
 
-                            {% if is_granted('CHILL_EVENT_SEE_DETAILS', participation.event) %}
-                                <a  href="{{ path('chill_event__event_show', { 'event_id' : participation.event.id, 'return_path' : currentPath, 'return_label' : returnLabel } ) }}"
-                                    class="sc-button bt-show" title="{{ 'See details of the event'|trans }}"></a>
-                            {% endif %}
+                        {% if is_granted('CHILL_EVENT_SEE_DETAILS', participation.event) %}
+                        <li class="list-inline-item">
+                            <a  href="{{ path('chill_event__event_show', { 'event_id' : participation.event.id, 'return_path' : currentPath, 'return_label' : returnLabel } ) }}"
+                                class="btn btn-primary btn-sm" title="{{ 'See details of the event'|trans }}"><i class="fa fa-fw fa-eye"></i></a>
+                        </li>
+                        {% endif %}
 
-                            {% if  is_granted('CHILL_EVENT_UPDATE', participation.event)
-                               and is_granted('CHILL_EVENT_PARTICIPATION_UPDATE', participation) %}
+                        {% if  is_granted('CHILL_EVENT_UPDATE', participation.event)
+                           and is_granted('CHILL_EVENT_PARTICIPATION_UPDATE', participation) %}
 
-                                <div class="bt-dropdown">
-                                    <a href="" class="sc-button bt-update"></a>
-                                    <div class="bt-dropdown-content">
+                        <li class="list-inline-item">
+                            <div class="btn dropdown-toggle">
+                                <a href="" class="btn btn-warning btn-sm"><i class="fa fa-fw fa-pencil"></i></a>
+                                <div class="dropdown-menu">
 
-                                        <a  href="{{ path('chill_event__event_edit', { 'event_id' : participation.event.id, 'return_path' : currentPath, 'return_label' : returnLabel }) }}"
-                                            class="sc-button bt-update">
-                                            {{ 'Edit the event'|trans }}
-                                        </a>
-                                        <a  href="{{ path('chill_event_participation_edit', { 'participation_id' : participation.id, 'return_path' : currentPath, 'return_label' : returnLabel }) }}"
-                                            class="sc-button bt-update">
-                                            {{ 'Edit the participation'|trans }}
-                                        </a>
-
-                                    </div>
-                                </div>
-                            {% else %}
-
-                                {% if is_granted('CHILL_EVENT_UPDATE', participation.event) %}
                                     <a  href="{{ path('chill_event__event_edit', { 'event_id' : participation.event.id, 'return_path' : currentPath, 'return_label' : returnLabel }) }}"
-                                        class="sc-button bt-update">
+                                        class="btn btn-warning btn-sm">
                                         {{ 'Edit the event'|trans }}
                                     </a>
-                                {% endif %}
-                                {% if is_granted('CHILL_EVENT_PARTICIPATION_UPDATE', participation) %}
                                     <a  href="{{ path('chill_event_participation_edit', { 'participation_id' : participation.id, 'return_path' : currentPath, 'return_label' : returnLabel }) }}"
-                                        class="sc-button bt-update">
+                                        class="btn btn-warning btn-sm">
                                         {{ 'Edit the participation'|trans }}
                                     </a>
-                                {% endif %}
-
-                            {% endif %}
 
+                                </div>
+                            </div>
                         </li>
+                        {% else %}
+
+                        <li class="list-inline-item">
+                            {% if is_granted('CHILL_EVENT_UPDATE', participation.event) %}
+                                <a  href="{{ path('chill_event__event_edit', { 'event_id' : participation.event.id, 'return_path' : currentPath, 'return_label' : returnLabel }) }}"
+                                    class="btn btn-warning btn-sm">
+                                    {{ 'Edit the event'|trans }}
+                                </a>
+                            {% endif %}
+                            {% if is_granted('CHILL_EVENT_PARTICIPATION_UPDATE', participation) %}
+                                <a  href="{{ path('chill_event_participation_edit', { 'participation_id' : participation.id, 'return_path' : currentPath, 'return_label' : returnLabel }) }}"
+                                    class="btn btn-warning btn-sm">
+                                    {{ 'Edit the participation'|trans }}
+                                </a>
+                            {% endif %}
+                        </li>
+
+                        {% endif %}
+
+
                     </ul>
                 </td>
             </tr>
@@ -103,12 +108,31 @@
     {{ chill_pagination(paginator) }}
 {% endif %}
 
-<div style="margin-bottom: 1.5em; margin-top: 2.5em;">
-    {{ form_start(form_add_event_participation_by_person) }}
-    {{ form_widget(form_add_event_participation_by_person.event_id, { 'attr' : { 'style' : 'width: 25em; display:inline-block; ' } } ) }}
-    {{ form_widget(form_add_event_participation_by_person.submit, { 'attr' : { 'class' : 'sc-button bt-create' } } ) }}
-    {{ form_rest(form_add_event_participation_by_person) }}
-    {{ form_end(form_add_event_participation_by_person) }}
+<div class="input-group mb-3">
+{{ form_start(form_add_event_participation_by_person) }}
+    {#
+    <input type="text" class="form-control" placeholder="Recipient's username" aria-label="Recipient's username" aria-describedby="button-addon2">
+    #}
+    {{ form_widget(form_add_event_participation_by_person.event_id, { 'attr' : { 'class' : 'form-control' } } ) }}
+    <div class="input-group-append input-group-btn">
+        {#
+        <button class="btn btn-outline-secondary" type="button" id="button-addon2">Button</button>
+        #}
+        {{ form_widget(form_add_event_participation_by_person.submit, { 'attr' : { 'class' : 'btn btn-success' } } ) }}
+    </div>
+{{ form_rest(form_add_event_participation_by_person) }}
+{{ form_end(form_add_event_participation_by_person) }}
 </div>
 
-{% endblock %}
\ No newline at end of file
+{#
+{{ form(form_add_event_participation_by_person) }}
+#}
+
+<div class="input-group mb-3">
+    <input class="form-control" placeholder="Recipient's username">
+    <div class="input-group-append">
+        <button class="btn btn-success">Button</button>
+    </div>
+</div>
+
+{% endblock %}
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Event/new.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Event/new.html.twig
index 33a826f85..44d24040b 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Event/new.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Event/new.html.twig
@@ -16,12 +16,12 @@
 
     <ul class="record_actions">
         <li class="cancel">
-            <a href="{{ path('chill_event_list_most_recent') }}" class="sc-button bt-cancel">
+            <a href="{{ path('chill_event_list_most_recent') }}" class="btn btn-cancel">
                 {{ 'Back to the most recent events'|trans }}
             </a>
         </li>
         <li>
-            {{ form_widget(form.submit, { 'attr' : { 'class' : 'sc-button bt-create' } }) }}
+            {{ form_widget(form.submit, { 'attr' : { 'class' : 'btn btn-create' } }) }}
         </li>
     </ul>
             
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Event/newPickCenter.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Event/newPickCenter.html.twig
index 06c29a924..c4fb4aacd 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Event/newPickCenter.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Event/newPickCenter.html.twig
@@ -12,12 +12,12 @@
 
     <ul class="record_actions">
         <li class="cancel">
-            <a href="{{ path('chill_event_list_most_recent') }}" class="sc-button bt-cancel">
+            <a href="{{ path('chill_event_list_most_recent') }}" class="btn btn-cancel">
                 {{ 'Back to the most recent events'|trans }}
             </a>
         </li>
         <li>
-            {{ form_widget(form.submit, { 'attr' : { 'class' : 'sc-button green' } }) }}
+            {{ form_widget(form.submit, { 'attr' : { 'class' : 'btn btn-chill-green' } }) }}
         </li>
     </ul>
             
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Event/show.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Event/show.html.twig
index 9e03f7fe6..6af5dd80a 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Event/show.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Event/show.html.twig
@@ -40,26 +40,26 @@
 
         {% if returnPath and returnLabel %}
             <li class="cancel">
-                <a href="{{ returnPath }}" class="sc-button bt-cancel">{{ returnLabel }}</a>
+                <a href="{{ returnPath }}" class="btn btn-cancel">{{ returnLabel }}</a>
             </li>
             <li>
                 <a href="{{ path('chill_event__event_edit', {
                     'event_id': event.id,
                     'return_path': app.request.getRequestUri,
                     'return_label': 'Back to details of the event'|trans
-                    }) }}" class="sc-button bt-edit">{{ 'Edit'|trans }}
+                    }) }}" class="btn btn-edit">{{ 'Edit'|trans }}
                 </a>
             </li>
         {% else %}
             <li>
-                <a href="{{ path('chill_event__event_edit', {'event_id': event.id }) }}" class="sc-button bt-edit">
+                <a href="{{ path('chill_event__event_edit', {'event_id': event.id }) }}" class="btn btn-edit">
                     {{ 'Edit'|trans }}
                 </a>
             </li>
         {% endif %}
         <li>
             <a href="{{ path('chill_event__event_delete', {'event_id' : event.id } ) }}"
-               class="sc-button bt-delete">{{ 'Delete event'|trans }}</a>
+               class="btn btn-delete">{{ 'Delete event'|trans }}</a>
         </li>
 
     </ul>
@@ -94,11 +94,11 @@
                             {% if is_granted('CHILL_EVENT_PARTICIPATION_UPDATE', participation) %}
                             <li>
                                 <a href="{{ path('chill_event_participation_edit', { 'participation_id' : participation.id } ) }}"
-                                   class="sc-button bt-edit" title="{{ 'Edit'|trans }}"></a>
+                                   class="btn btn-edit" title="{{ 'Edit'|trans }}"></a>
                             </li>
                             <li>
                                 <a href="{{ path('chill_event_participation_delete', {'participation_id' : participation.id } ) }}"
-                                    class="sc-button bt-delete" title="{{ 'Delete'|trans }}"></a>
+                                    class="btn btn-delete" title="{{ 'Delete'|trans }}"></a>
                             </li>
                             {% endif %}
                         </ul>
@@ -113,12 +113,12 @@
         
     <ul class="record_actions">
         {% if count > 0 %}
-            <li><a href="{{ path('chill_event_participation_edit_multiple', { 'event_id' : event.id } ) }}" class="sc-button bt-edit">{{ 'Edit all the participations'|trans }}</a></li>
+            <li><a href="{{ path('chill_event_participation_edit_multiple', { 'event_id' : event.id } ) }}" class="btn btn-edit">{{ 'Edit all the participations'|trans }}</a></li>
         {% endif %}
     </ul>
 
     <div style="margin-bottom: 10em;">
-        <div class="grid-8">
+        <div class="col-8">
             {{ form_start(form_add_participation_by_person) }}
             <div class="input-group">
                 {{ form_widget(form_add_participation_by_person.person_id, { 'attr' : {
@@ -126,19 +126,19 @@
                     'style': 'min-width: 15em; max-width: 18em; display: inline-block;'
                 }} ) }}
                 <div class="input-group-append">
-                    {{ form_widget(form_add_participation_by_person.submit, { 'attr' : { 'class' : 'sc-button bt-create' } } ) }}
+                    {{ form_widget(form_add_participation_by_person.submit, { 'attr' : { 'class' : 'btn btn-create' } } ) }}
                 </div>
             </div>
             {{ form_rest(form_add_participation_by_person) }}
             {{ form_end(form_add_participation_by_person) }}
         </div>
 
-        <div class="grid-4">
+        <div class="col-4">
             {{ form_start(form_export, {'attr': {'id': 'export_tableur'}}) }}
             <div class="input-group">
                 {{ form_widget(form_export.format, { 'attr' : { 'class': 'custom-select' } }) }}
                 <div class="input-group-append">
-                    {{ form_widget(form_export.submit, { 'attr' : { 'class': 'sc-button bt-save' } }) }}
+                    {{ form_widget(form_export.submit, { 'attr' : { 'class': 'btn btn-save' } }) }}
                 </div>
                 <a class="bt-"></a>
             </div>
diff --git a/src/Bundle/ChillEventBundle/Resources/views/EventType/edit.html.twig b/src/Bundle/ChillEventBundle/Resources/views/EventType/edit.html.twig
index 2142998f5..3f2f5b146 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/EventType/edit.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/EventType/edit.html.twig
@@ -10,10 +10,10 @@
 
     <ul class="record_actions">
         <li class="cancel">
-            <a href="{{ path('chill_eventtype_admin') }}" class="sc-button bt-cancel">{{ 'Back to the list'|trans }}</a>
+            <a href="{{ path('chill_eventtype_admin') }}" class="btn btn-cancel">{{ 'Back to the list'|trans }}</a>
         </li>
         <li>
-            {{ form_row(edit_form.submit, { 'attr': { 'class' : 'sc-button bt-edit' }}) }}
+            {{ form_row(edit_form.submit, { 'attr': { 'class' : 'btn btn-edit' }}) }}
         </li>
     </ul>
 
diff --git a/src/Bundle/ChillEventBundle/Resources/views/EventType/index.html.twig b/src/Bundle/ChillEventBundle/Resources/views/EventType/index.html.twig
index f1b2f9acd..308974770 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/EventType/index.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/EventType/index.html.twig
@@ -22,10 +22,10 @@
                 <td>
                 <ul class="record_actions">
                     <li>
-                        <a href="{{ path('chill_eventtype_admin_show', { 'id': entity.id }) }}" class="sc-button bt-show" title="{{ 'show'|trans }}"></a>
+                        <a href="{{ path('chill_eventtype_admin_show', { 'id': entity.id }) }}" class="btn btn-show" title="{{ 'show'|trans }}"></a>
                     </li>
                     <li>
-                        <a href="{{ path('chill_eventtype_admin_edit', { 'id': entity.id }) }}" class="sc-button bt-edit" title="{{ 'edit'|trans }}"></a>
+                        <a href="{{ path('chill_eventtype_admin_edit', { 'id': entity.id }) }}" class="btn btn-edit" title="{{ 'edit'|trans }}"></a>
                     </li>
                 </ul>
                 </td>
@@ -36,7 +36,7 @@
 
     <ul class="record_actions">
         <li>
-            <a href="{{ path('chill_eventtype_admin_new') }}" class="sc-button bt-new">{{ 'Create a new type'|trans }}</a>
+            <a href="{{ path('chill_eventtype_admin_new') }}" class="btn btn-new">{{ 'Create a new type'|trans }}</a>
         </li>
     </ul>
 {% endblock %}
diff --git a/src/Bundle/ChillEventBundle/Resources/views/EventType/new.html.twig b/src/Bundle/ChillEventBundle/Resources/views/EventType/new.html.twig
index b4aa07626..e7d2f0d66 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/EventType/new.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/EventType/new.html.twig
@@ -10,10 +10,10 @@
 
     <ul class="record_actions">
         <li class="cancel">
-            <a href="{{ path('chill_eventtype_admin') }}" class="sc-button bt-cancel">{{ 'Back to the list'|trans }}</a>
+            <a href="{{ path('chill_eventtype_admin') }}" class="btn btn-cancel">{{ 'Back to the list'|trans }}</a>
         </li>
         <li>
-            {{ form_row(form.submit, { 'attr': { 'class' : 'sc-button bt-new' }}) }}
+            {{ form_row(form.submit, { 'attr': { 'class' : 'btn btn-new' }}) }}
         </li>
     </ul>
 
diff --git a/src/Bundle/ChillEventBundle/Resources/views/EventType/show.html.twig b/src/Bundle/ChillEventBundle/Resources/views/EventType/show.html.twig
index 56edf0a19..3e0aaba03 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/EventType/show.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/EventType/show.html.twig
@@ -23,14 +23,14 @@
 
     <ul class="record_actions">
         <li class="cancel">
-            <a href="{{ path('chill_eventtype_admin') }}" class="sc-button bt-cancel">{{ 'Back to the list'|trans }}</a>
+            <a href="{{ path('chill_eventtype_admin') }}" class="btn btn-cancel">{{ 'Back to the list'|trans }}</a>
         </li>
         <li>
-            <a href="{{ path('chill_eventtype_admin_edit', { 'id': entity.id }) }}" class="sc-button bt-edit">{{ 'Edit'|trans }}</a>
+            <a href="{{ path('chill_eventtype_admin_edit', { 'id': entity.id }) }}" class="btn btn-edit">{{ 'Edit'|trans }}</a>
         </li>
         <li>
             {{ form_start(delete_form) }}
-            {{ form_row(delete_form.submit, { 'attr': { 'class' : 'sc-button bt-delete' }}) }}
+            {{ form_row(delete_form.submit, { 'attr': { 'class' : 'btn btn-delete' }}) }}
             {{ form_end(delete_form) }}
         </li>
     </ul>
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Participation/edit-multiple.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Participation/edit-multiple.html.twig
index 18465d241..a50615414 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Participation/edit-multiple.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Participation/edit-multiple.html.twig
@@ -49,12 +49,12 @@
             
     <ul class="record_actions">
         <li>
-            <a href="{{ path('chill_event__event_show', { 'event_id' : event.id } ) }}" class="sc-button bt-cancel">
+            <a href="{{ path('chill_event__event_show', { 'event_id' : event.id } ) }}" class="btn btn-cancel">
                 {{ 'Back to the event'|trans }}
             </a>
         </li>
         <li>
-            {{ form_widget(form.submit, { 'attr' : { 'class' : 'sc-button bt-edit' } } ) }}
+            {{ form_widget(form.submit, { 'attr' : { 'class' : 'btn btn-edit' } } ) }}
         </li>
     </ul>
     
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Participation/edit.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Participation/edit.html.twig
index 93956c5f0..19592526e 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Participation/edit.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Participation/edit.html.twig
@@ -32,12 +32,12 @@
             {% set returnPath = app.request.get('return_path') %}
             {% set returnLabel = app.request.get('return_label') %}
 
-            <a href="{{ returnPath |default( path('chill_event__event_show', { 'event_id' : participation.event.id } )) }}" class="sc-button bt-cancel">
+            <a href="{{ returnPath |default( path('chill_event__event_show', { 'event_id' : participation.event.id } )) }}" class="btn btn-cancel">
                 {{ returnLabel |default('Back to the event'|trans) }}
             </a>
         </li>
         <li>
-            {{ form_widget(form.submit, { 'attr' : { 'class' : 'sc-button bt-edit' } } ) }}
+            {{ form_widget(form.submit, { 'attr' : { 'class' : 'btn btn-edit' } } ) }}
         </li>
     </ul>
     
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Participation/new-multiple.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Participation/new-multiple.html.twig
index f73744a59..a0551ff1a 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Participation/new-multiple.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Participation/new-multiple.html.twig
@@ -3,9 +3,7 @@
 {% import 'ChillPersonBundle:Person:macro.html.twig' as person_macro %}
 
 {% block title 'Participation creation'|trans %}
-    
-        {% form_theme form _self %}
-    
+
     {% block _collection_row %}
         <tr>
         <td>
@@ -28,10 +26,10 @@
             </tr>
         </tbody>
     </table>
- 
+
     {% include 'ChillEventBundle:Participation:_ignored_participations.html.twig' with ignored_participations %}
-    
-    {{ form_start(form) }} 
+
+    {{ form_start(form) }}
     <table>
         <thead>
             <tr>
@@ -47,22 +45,21 @@
                 <td>{{ form_widget(participationField.role) }}</td>
                 <td>{{ form_widget(participationField.status) }}</td>
             </tr>
-            {% endfor %} 
+            {% endfor %}
         </tbody>
     </table>
-        
+
     <ul class="record_actions">
-        <li>
-            <a href="{{ path('chill_event__event_show', { 'event_id' : participations[0].event.id } ) }}" class="sc-button btn-cancel">
-                <i class="fa fa-arrow-left"></i>
+        <li class="cancel">
+            <a href="{{ path('chill_event__event_show', { 'event_id' : participations[0].event.id } ) }}" class="btn btn-cancel">
                 {{ 'Back to the event'|trans }}
             </a>
         </li>
         <li>
-            {{ form_widget(form.submit, { 'attr' : { 'class' : 'sc-button bt-create' } } ) }}
+            {{ form_widget(form.submit, { 'attr' : { 'class' : 'btn btn-create' } } ) }}
         </li>
     </ul>
-    
+
     {{ form_end(form) }}
-    
+
 {% endblock %}
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Participation/new.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Participation/new.html.twig
index 514161c35..33f7bc213 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Participation/new.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Participation/new.html.twig
@@ -33,13 +33,12 @@
 
     <ul class="record_actions">
         <li class="cancel">
-            <a href="{{ path('chill_event__event_show', { 'event_id' : participation.event.id } ) }}" class="sc-button btn-cancel">
-                <i class="fa fa-arrow-left"></i>
+            <a href="{{ path('chill_event__event_show', { 'event_id' : participation.event.id } ) }}" class="btn btn-cancel">
                 {{ 'Back to the event'|trans }}
             </a>
         </li>
         <li>
-            {{ form_widget(form.submit, { 'attr' : { 'class' : 'sc-button bt-create' } } ) }}
+            {{ form_widget(form.submit, { 'attr' : { 'class' : 'btn btn-create' } } ) }}
         </li>
     </ul>
     
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Role/edit.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Role/edit.html.twig
index 0df6e12de..a0b2d4f92 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Role/edit.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Role/edit.html.twig
@@ -10,10 +10,10 @@
 
     <ul class="record_actions">
         <li class="cancel">
-            <a href="{{ path('chill_event_admin_role') }}" class="sc-button bt-cancel">{{ 'Back to the list'|trans }}</a>
+            <a href="{{ path('chill_event_admin_role') }}" class="btn btn-cancel">{{ 'Back to the list'|trans }}</a>
         </li>
         <li>
-            {{ form_row(edit_form.submit, { 'attr': { 'class' : 'sc-button bt-edit' }}) }}
+            {{ form_row(edit_form.submit, { 'attr': { 'class' : 'btn btn-edit' }}) }}
         </li>
     </ul>
 
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Role/index.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Role/index.html.twig
index f6b071924..4fb4f866f 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Role/index.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Role/index.html.twig
@@ -24,10 +24,10 @@
                 <td>
                     <ul class="record_actions">
                         <li>
-                            <a href="{{ path('chill_event_admin_role_show', { 'id': entity.id }) }}" class="sc-button bt-show" title="{{ 'show'|trans }}"></a>
+                            <a href="{{ path('chill_event_admin_role_show', { 'id': entity.id }) }}" class="btn btn-show" title="{{ 'show'|trans }}"></a>
                         </li>
                         <li>
-                            <a href="{{ path('chill_event_admin_role_edit', { 'id': entity.id }) }}" class="sc-button bt-edit" title="{{ 'edit'|trans }}"></a>
+                            <a href="{{ path('chill_event_admin_role_edit', { 'id': entity.id }) }}" class="btn btn-edit" title="{{ 'edit'|trans }}"></a>
                         </li>
                     </ul>
                 </td>
@@ -38,7 +38,7 @@
 
     <ul class="record_actions">
         <li>
-            <a href="{{ path('chill_event_admin_role_new') }}" class="sc-button bt-new">{{ 'Create a new role'|trans }}</a>
+            <a href="{{ path('chill_event_admin_role_new') }}" class="btn btn-new">{{ 'Create a new role'|trans }}</a>
         </li>
     </ul>
     {% endblock %}
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Role/new.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Role/new.html.twig
index 1bc923f09..da0a3e459 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Role/new.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Role/new.html.twig
@@ -11,10 +11,10 @@
 
     <ul class="record_actions">
         <li class="cancel">
-            <a href="{{ path('chill_event_admin_role') }}" class="sc-button bt-cancel">{{ 'Back to the list'|trans }}</a>
+            <a href="{{ path('chill_event_admin_role') }}" class="btn btn-cancel">{{ 'Back to the list'|trans }}</a>
         </li>
         <li>
-            {{ form_row(form.submit, { 'attr': { 'class' : 'sc-button bt-new' }}) }}
+            {{ form_row(form.submit, { 'attr': { 'class' : 'btn btn-new' }}) }}
         </li>
     </ul>
 
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Role/show.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Role/show.html.twig
index 5d24ef14f..2fb920eb2 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Role/show.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Role/show.html.twig
@@ -27,14 +27,14 @@
 
     <ul class="record_actions">
         <li class="cancel">
-            <a href="{{ path('chill_event_admin_role') }}" class="sc-button bt-cancel">{{ 'Back to the list'|trans }}</a>
+            <a href="{{ path('chill_event_admin_role') }}" class="btn btn-cancel">{{ 'Back to the list'|trans }}</a>
         </li>
         <li>
-            <a href="{{ path('chill_event_admin_role_edit', { 'id': entity.id }) }}" class="sc-button bt-edit">{{ 'Edit'|trans }}</a>
+            <a href="{{ path('chill_event_admin_role_edit', { 'id': entity.id }) }}" class="btn btn-edit">{{ 'Edit'|trans }}</a>
         </li>
         <li>
             {{ form_start(delete_form) }}
-            {{ form_row(delete_form.submit, { 'attr': { 'class' : 'sc-button bt-delete' }}) }}
+            {{ form_row(delete_form.submit, { 'attr': { 'class' : 'btn btn-delete' }}) }}
             {{ form_end(delete_form) }}
         </li>
     </ul>
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Status/edit.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Status/edit.html.twig
index 449ddcb1f..e376e05e3 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Status/edit.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Status/edit.html.twig
@@ -11,10 +11,10 @@
 
     <ul class="record_actions">
         <li class="cancel">
-            <a href="{{ path('chill_event_admin_status') }}" class="sc-button bt-cancel">{{ 'Back to the list'|trans }}</a>
+            <a href="{{ path('chill_event_admin_status') }}" class="btn btn-cancel">{{ 'Back to the list'|trans }}</a>
         </li>
         <li>
-            {{ form_row(edit_form.submit, { 'attr': { 'class' : 'sc-button bt-edit' }}) }}
+            {{ form_row(edit_form.submit, { 'attr': { 'class' : 'btn btn-edit' }}) }}
         </li>
     </ul>
 
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Status/index.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Status/index.html.twig
index 8dec02493..7ac4ed37e 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Status/index.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Status/index.html.twig
@@ -24,10 +24,10 @@
                 <td>
                 <ul class="record_actions">
                     <li>
-                        <a href="{{ path('chill_event_admin_status_show', { 'id': entity.id }) }}" class="sc-button bt-show" title="{{ 'show'|trans }}"></a>
+                        <a href="{{ path('chill_event_admin_status_show', { 'id': entity.id }) }}" class="btn btn-show" title="{{ 'show'|trans }}"></a>
                     </li>
                     <li>
-                        <a href="{{ path('chill_event_admin_status_edit', { 'id': entity.id }) }}" class="sc-button bt-edit" title="{{ 'edit'|trans }}"></a>
+                        <a href="{{ path('chill_event_admin_status_edit', { 'id': entity.id }) }}" class="btn btn-edit" title="{{ 'edit'|trans }}"></a>
                     </li>
                 </ul>
                 </td>
@@ -38,7 +38,7 @@
 
     <ul class="record_actions sticky-form-buttons">
         <li>
-            <a href="{{ path('chill_event_admin_status_new') }}" class="sc-button bt-new">{{ 'Create a new status'|trans }}</a>
+            <a href="{{ path('chill_event_admin_status_new') }}" class="btn btn-new">{{ 'Create a new status'|trans }}</a>
         </li>
     </ul>
     {% endblock %}
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Status/new.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Status/new.html.twig
index f88738d23..aa3ecc374 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Status/new.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Status/new.html.twig
@@ -11,10 +11,10 @@
 
     <ul class="record_actions">
         <li class="cancel">
-            <a href="{{ path('chill_event_admin_status') }}" class="sc-button bt-cancel">{{ 'Back to the list'|trans }}</a>
+            <a href="{{ path('chill_event_admin_status') }}" class="btn btn-cancel">{{ 'Back to the list'|trans }}</a>
         </li>
         <li>
-            {{ form_row(form.submit, { 'attr': { 'class' : 'sc-button bt-new' }}) }}
+            {{ form_row(form.submit, { 'attr': { 'class' : 'btn btn-new' }}) }}
         </li>
     </ul>
 
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Status/show.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Status/show.html.twig
index e79de3b1c..624997026 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Status/show.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Status/show.html.twig
@@ -27,14 +27,14 @@
 
     <ul class="record_actions">
         <li class="cancel">
-            <a href="{{ path('chill_event_admin_status') }}" class="sc-button bt-cancel">{{ 'Back to the list'|trans }}</a>
+            <a href="{{ path('chill_event_admin_status') }}" class="btn btn-cancel">{{ 'Back to the list'|trans }}</a>
         </li>
         <li>
-            <a href="{{ path('chill_event_admin_status_edit', { 'id': entity.id }) }}" class="sc-button bt-edit">{{ 'Edit'|trans }}</a>
+            <a href="{{ path('chill_event_admin_status_edit', { 'id': entity.id }) }}" class="btn btn-edit">{{ 'Edit'|trans }}</a>
         </li>
         <li>
             {{ form_start(delete_form) }}
-            {{ form_row(delete_form.submit, { 'attr': { 'class' : 'sc-button bt-delete' }}) }}
+            {{ form_row(delete_form.submit, { 'attr': { 'class' : 'btn btn-delete' }}) }}
             {{ form_end(delete_form) }}
         </li>
     </ul>
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Timeline/event_person_context.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Timeline/event_person_context.html.twig
index 09c2390c2..2750b285f 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Timeline/event_person_context.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Timeline/event_person_context.html.twig
@@ -42,7 +42,7 @@
 
     <ul class="record_actions">
         <li>
-            <a href="{{ path('chill_event__event_show', { 'event_id': event.id} ) }}" class="sc-button bt-view">
+            <a href="{{ path('chill_event__event_show', { 'event_id': event.id} ) }}" class="btn btn-view">
                 {{ 'Show the event'|trans }}
             </a>
         </li>
diff --git a/src/Bundle/ChillEventBundle/chill.webpack.config.js b/src/Bundle/ChillEventBundle/chill.webpack.config.js
index a194522ad..83c08a6ce 100644
--- a/src/Bundle/ChillEventBundle/chill.webpack.config.js
+++ b/src/Bundle/ChillEventBundle/chill.webpack.config.js
@@ -1,4 +1,4 @@
-// this file loads all assets from the Chill Event Bundle
-module.exports = function(encore, entries) {
-    entries.push(__dirname + '/Resources/public/index.js');
-};
\ No newline at end of file
+module.exports = function(encore, entries)
+{
+    entries.push(__dirname + '/Resources/public/chill/index.js');
+};
diff --git a/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/confirm_delete.html.twig b/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/confirm_delete.html.twig
index 23e881d78..67b491ef4 100644
--- a/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/confirm_delete.html.twig
+++ b/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/confirm_delete.html.twig
@@ -1,4 +1,4 @@
-{% extends "@ChillPerson/layout.html.twig"  %}
+{% extends "@ChillPerson/Person/layout.html.twig"  %}
 
 {% set activeRouteKey = '' %}
 {% set person = familyMember.person %}
diff --git a/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/edit.html.twig b/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/edit.html.twig
index 894f65479..31f106b92 100644
--- a/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/edit.html.twig
+++ b/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/edit.html.twig
@@ -1,4 +1,4 @@
-{% extends "@ChillPerson/layout.html.twig" %}
+{% extends "@ChillPerson/Person/layout.html.twig" %}
 
 {% set activeRouteKey = '' %}
 {% set title = 'Edit family members for %name%'|trans({ '%name%' : person.firstName ~ " " ~ person.lastName } ) %}
@@ -26,12 +26,12 @@
 
 <ul class="record_actions sticky-form-buttons">
     <li class="cancel">
-        <a href="{{ path("chill_family_members_family_members_index", { 'id': person.id } ) }}" class="sc-button bt-cancel">
+        <a href="{{ path("chill_family_members_family_members_index", { 'id': person.id } ) }}" class="btn btn-cancel">
            {{ 'Back to the list'|trans }}
         </a>
     </li>
     <li>
-        {{ form_widget(form.submit, { 'attr' : { 'class': 'sc-button bt-edit' }, 'label': 'Edit' } ) }}
+        {{ form_widget(form.submit, { 'attr' : { 'class': 'btn btn-edit' }, 'label': 'Edit' } ) }}
     </li>
 </ul>
        
diff --git a/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/index.html.twig b/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/index.html.twig
index b74fd106d..d50be4b27 100644
--- a/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/index.html.twig
+++ b/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/index.html.twig
@@ -1,4 +1,4 @@
-{% extends "@ChillPerson/layout.html.twig" %}
+{% extends "@ChillPerson/Person/layout.html.twig" %}
 
 {% set activeRouteKey = '' %}
 {% set title = 'Family members for %name%'|trans({ '%name%' : person.firstName ~ " " ~ person.lastName } ) %}
@@ -65,17 +65,17 @@
                 <ul class="record_actions">
                     {% if is_granted(constant('Chill\\AMLI\\FamilyMembersBundle\\Security\\Voter\\FamilyMemberVoter::SHOW'), f) %}
                         <li>
-                            <a href="{{ path('chill_family_members_family_members_view', { 'id': f.id } ) }}" class="sc-button bt-show"></a>
+                            <a href="{{ path('chill_family_members_family_members_view', { 'id': f.id } ) }}" class="btn btn-show"></a>
                         </li>
                     {% endif %}
                     {% if is_granted(constant('Chill\\AMLI\\FamilyMembersBundle\\Security\\Voter\\FamilyMemberVoter::UPDATE'), f) %}
                         <li>
-                            <a href="{{ path('chill_family_members_family_members_edit', { 'id': f.id } ) }}" class="sc-button bt-edit"></a>
+                            <a href="{{ path('chill_family_members_family_members_edit', { 'id': f.id } ) }}" class="btn btn-edit"></a>
                         </li>
                     {% endif %}
                     {% if is_granted(constant('Chill\\AMLI\\FamilyMembersBundle\\Security\\Voter\\FamilyMemberVoter::DELETE'), f) %}
                         <li>
-                            <a href="{{ path('chill_family_members_family_members_delete', { 'id': f.id } ) }}" class="sc-button bt-delete"></a>
+                            <a href="{{ path('chill_family_members_family_members_delete', { 'id': f.id } ) }}" class="btn btn-delete"></a>
                         </li>
                     {% endif %}
                 </ul>
@@ -116,7 +116,7 @@
 {% if is_granted(constant('Chill\\AMLI\\FamilyMembersBundle\\Security\\Voter\\FamilyMemberVoter::CREATE'), person) %}
     <ul class="record_actions">
         <li>
-            <a class="sc-button bt-create" href="{{ path('chill_family_members_family_members_new', { 'id': person.id} ) }}">{{ 'Create new family membership'|trans }}</a>
+            <a class="btn btn-create" href="{{ path('chill_family_members_family_members_new', { 'id': person.id} ) }}">{{ 'Create new family membership'|trans }}</a>
         </li>
     </ul>
 {% endif %}
diff --git a/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/new.html.twig b/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/new.html.twig
index c691bba7e..5a035a79c 100644
--- a/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/new.html.twig
+++ b/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/new.html.twig
@@ -1,4 +1,4 @@
-{% extends "@ChillPerson/layout.html.twig" %}
+{% extends "@ChillPerson/Person/layout.html.twig" %}
 
 {% set activeRouteKey = '' %}
 {% set title = 'New family members for %name%'|trans({ '%name%' : person.firstName ~ " " ~ person.lastName } ) %}
@@ -26,12 +26,12 @@
 
 <ul class="record_actions sticky-form-buttons">
     <li class="cancel">
-        <a href="{{ path("chill_family_members_family_members_index", { 'id': person.id } ) }}" class="sc-button bt-cancel">
+        <a href="{{ path("chill_family_members_family_members_index", { 'id': person.id } ) }}" class="btn btn-cancel">
            {{ 'Back to the list'|trans }}
         </a>
     </li>
     <li>
-        {{ form_widget(form.submit, { 'attr' : { 'class': 'sc-button bt-create' }, 'label': 'Create' } ) }}
+        {{ form_widget(form.submit, { 'attr' : { 'class': 'btn btn-create' }, 'label': 'Create' } ) }}
     </li>
 </ul>
        
diff --git a/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/view.html.twig b/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/view.html.twig
index 357486102..e6e6b12f4 100644
--- a/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/view.html.twig
+++ b/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/view.html.twig
@@ -1,4 +1,4 @@
-{% extends "@ChillPerson/layout.html.twig" %}
+{% extends "@ChillPerson/Person/layout.html.twig" %}
 
 {% set activeRouteKey = '' %}
 {% set person = familyMember.person %}
@@ -73,13 +73,13 @@
 
 <ul class="record_actions sticky-form-buttons">
     <li class="cancel">
-        <a href="{{ path("chill_family_members_family_members_index", { 'id': person.id } ) }}" class="sc-button bt-cancel">
+        <a href="{{ path("chill_family_members_family_members_index", { 'id': person.id } ) }}" class="btn btn-cancel">
            {{ 'Back to the list'|trans }}
         </a>
     </li>
     {% if is_granted(constant('Chill\\AMLI\\FamilyMembersBundle\\Security\\Voter\\FamilyMemberVoter::UPDATE'), familyMember) %}
         <li>
-            <a href="{{ path('chill_family_members_family_members_edit', { 'id': familyMember.id } ) }}" class="sc-button bt-edit">{{ 'Edit'|trans }}</a>
+            <a href="{{ path('chill_family_members_family_members_edit', { 'id': familyMember.id } ) }}" class="btn btn-edit">{{ 'Edit'|trans }}</a>
         </li>
     {% endif %}
 </ul>
diff --git a/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php b/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
index 25b7e5860..ca28b1d14 100644
--- a/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
+++ b/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
@@ -1141,7 +1141,7 @@ class CRUDController extends AbstractController
      */
     protected function getPaginatorFactory(): PaginatorFactory
     {
-        return $this->container->get('chill_main.paginator_factory');
+        return $this->container->get(PaginatorFactory::class);
     }
 
     /**
diff --git a/src/Bundle/ChillMainBundle/Controller/NotificationController.php b/src/Bundle/ChillMainBundle/Controller/NotificationController.php
new file mode 100644
index 000000000..c76e19d9e
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Controller/NotificationController.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace Chill\MainBundle\Controller;
+
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Chill\MainBundle\Repository\NotificationRepository;
+use Chill\MainBundle\Notification\NotificationRenderer;
+use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Routing\Annotation\Route;
+use Chill\MainBundle\Pagination\PaginatorFactory;
+
+
+/**
+ * @Route("/{_locale}/notification")
+ */
+class NotificationController extends AbstractController
+{
+    private $security;
+
+    public function __construct(Security $security)
+    {
+        $this->security = $security;
+    }
+
+
+    /**
+     * @Route("/show", name="chill_main_notification_show")
+     */
+    public function showAction(
+        NotificationRepository $notificationRepository, NotificationRenderer $notificationRenderer,
+        PaginatorFactory $paginatorFactory)
+    {
+        $currentUser = $this->security->getUser();
+
+        $notificationsNbr = $notificationRepository->countAllForAttendee(($currentUser));
+        $paginator = $paginatorFactory->create($notificationsNbr);
+
+        $notifications = $notificationRepository->findAllForAttendee(
+            $currentUser,
+            $limit=$paginator->getItemsPerPage(),
+            $offset= $paginator->getCurrentPage()->getFirstItemNumber());
+
+        $templateData = array();
+        foreach ($notifications as $notification) {
+            $data = [
+                'template' => $notificationRenderer->getTemplate($notification),
+                'template_data' => $notificationRenderer->getTemplateData($notification),
+                'notification' => $notification
+            ];
+            $templateData[] = $data;
+        }
+
+        return $this->render('@ChillMain/Notification/show.html.twig', [
+            'datas' => $templateData,
+            'notifications' => $notifications,
+            'paginator' => $paginator,
+        ]);
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Notification/NotificationRenderer.php b/src/Bundle/ChillMainBundle/Notification/NotificationRenderer.php
new file mode 100644
index 000000000..d6f383b73
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Notification/NotificationRenderer.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace Chill\MainBundle\Notification;
+
+use Chill\MainBundle\Entity\Notification;
+use Chill\PersonBundle\Notification\AccompanyingPeriodNotificationRenderer;
+use Chill\ActivityBundle\Notification\ActivityNotificationRenderer;
+
+final class NotificationRenderer
+{
+    private array $renderers;
+
+    public function __construct(
+        AccompanyingPeriodNotificationRenderer $accompanyingPeriodNotificationRenderer,
+        ActivityNotificationRenderer $activityNotificationRenderer)
+    {
+        // TODO configure automatically
+        // TODO CREER UNE INTERFACE POUR ETRE SUR QUE LES RENDERERS SONT OK
+
+        $this->renderers[] = $accompanyingPeriodNotificationRenderer;
+        $this->renderers[] = $activityNotificationRenderer;
+    }
+
+    private function getRenderer(Notification $notification)
+    {
+        foreach ($this->renderers as $renderer) {
+            if($renderer->supports($notification)) {
+                return $renderer;
+            }
+        }
+
+        throw new \Exception('No renderer for '. $notification);
+    }
+
+    public function getTemplate(Notification $notification)
+    {
+        return $this->getRenderer($notification)->getTemplate();
+    }
+
+    public function getTemplateData(Notification $notification)
+    {
+        return $this->getRenderer($notification)->getTemplateData($notification);
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Repository/NotificationRepository.php b/src/Bundle/ChillMainBundle/Repository/NotificationRepository.php
index 844459f8b..5ffda75dc 100644
--- a/src/Bundle/ChillMainBundle/Repository/NotificationRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/NotificationRepository.php
@@ -23,6 +23,8 @@ use Chill\MainBundle\Entity\Notification;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\Persistence\ObjectRepository;
+use Chill\MainBundle\Entity\User;
+use Doctrine\ORM\Query;
 
 final class NotificationRepository implements ObjectRepository
 {
@@ -59,8 +61,54 @@ final class NotificationRepository implements ObjectRepository
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
 
+    private function queryAllForAttendee(User $addressee, bool $countQuery=False): Query
+    {
+        $qb = $this->repository->createQueryBuilder('n');
+
+        $select = 'n';
+        if($countQuery) {
+            $select = 'count(n)';
+        }
+
+        $qb
+            ->select($select)
+            ->join('n.addressees', 'a')
+            ->where('a = :addressee')
+            ->setParameter('addressee', $addressee);
+
+        return $qb->getQuery();
+    }
+
+    /**
+     * @return int
+     */
+    public function  countAllForAttendee(User $addressee): int // TODO passer à attendees avec S
+    {
+        $query = $this->queryAllForAttendee($addressee, $countQuery=True);
+
+        return $query->getSingleScalarResult();
+    }
+
+
+    /**
+     * @return Notification[]
+     */
+    public function  findAllForAttendee(User $addressee, $limit = null, $offset = null): array // TODO passer à attendees avec S
+    {
+        $query = $this->queryAllForAttendee($addressee);
+
+        if($limit) {
+            $query = $query->setMaxResults($limit);
+        }
+
+        if($offset) {
+            $query = $query->setFirstResult($offset);
+        }
+
+        return $query->getResult();
+    }
+
     public function getClassName() {
         return Notification::class;
     }
-
 }
diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss
new file mode 100644
index 000000000..97c5e3cc9
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss
@@ -0,0 +1,44 @@
+// Access to Bootstrap variables and mixins
+@import '~ChillMainAssets/module/bootstrap/shared';
+
+// Chill mixins
+@import './scss/mixins';
+
+// Chill entity render box system
+@import './scss/render_box';
+
+// Chill flex responsive table/block presentation
+@import './scss/flex_table';
+
+/*
+ * Specific rules
+ */
+
+.custom_field_no_data,
+.chill-no-data-statement {
+   font-style: italic;
+}
+
+// styles communs pour tous les bandeaux
+div.banner {
+   .id-number {
+      font-weight: lighter;
+      font-size: 50%;
+      margin-left: 0.5em;
+      &:before { content: '(n°'; }
+      &:after { content: ')'; }
+   }
+   a.phone,
+   a.email {
+      color: white;
+   }
+   ul.list-content {
+      //margin: 0 auto;
+   }
+   span.age {
+      margin-left: 0.5em;
+      &:before { content: '('; }
+      &:after { content: ')'; }
+   }
+
+}
diff --git a/src/Bundle/ChillMainBundle/Resources/public/css/chillmain.css b/src/Bundle/ChillMainBundle/Resources/public/chill/css/chillmain.css
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/css/chillmain.css
rename to src/Bundle/ChillMainBundle/Resources/public/chill/css/chillmain.css
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/Merriweather_Sans/MerriweatherSans-Bold.ttf b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/Merriweather_Sans/MerriweatherSans-Bold.ttf
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/Merriweather_Sans/MerriweatherSans-Bold.ttf
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/Merriweather_Sans/MerriweatherSans-Bold.ttf
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/Merriweather_Sans/MerriweatherSans-BoldItalic.ttf b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/Merriweather_Sans/MerriweatherSans-BoldItalic.ttf
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/Merriweather_Sans/MerriweatherSans-BoldItalic.ttf
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/Merriweather_Sans/MerriweatherSans-BoldItalic.ttf
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/Merriweather_Sans/MerriweatherSans-ExtraBold.ttf b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/Merriweather_Sans/MerriweatherSans-ExtraBold.ttf
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/Merriweather_Sans/MerriweatherSans-ExtraBold.ttf
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/Merriweather_Sans/MerriweatherSans-ExtraBold.ttf
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/Merriweather_Sans/MerriweatherSans-ExtraBoldItalic.ttf b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/Merriweather_Sans/MerriweatherSans-ExtraBoldItalic.ttf
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/Merriweather_Sans/MerriweatherSans-ExtraBoldItalic.ttf
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/Merriweather_Sans/MerriweatherSans-ExtraBoldItalic.ttf
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/Merriweather_Sans/MerriweatherSans-Italic.ttf b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/Merriweather_Sans/MerriweatherSans-Italic.ttf
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/Merriweather_Sans/MerriweatherSans-Italic.ttf
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/Merriweather_Sans/MerriweatherSans-Italic.ttf
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/Merriweather_Sans/MerriweatherSans-Light.ttf b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/Merriweather_Sans/MerriweatherSans-Light.ttf
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/Merriweather_Sans/MerriweatherSans-Light.ttf
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/Merriweather_Sans/MerriweatherSans-Light.ttf
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/Merriweather_Sans/MerriweatherSans-LightItalic.ttf b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/Merriweather_Sans/MerriweatherSans-LightItalic.ttf
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/Merriweather_Sans/MerriweatherSans-LightItalic.ttf
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/Merriweather_Sans/MerriweatherSans-LightItalic.ttf
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/Merriweather_Sans/MerriweatherSans-Regular.ttf b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/Merriweather_Sans/MerriweatherSans-Regular.ttf
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/Merriweather_Sans/MerriweatherSans-Regular.ttf
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/Merriweather_Sans/MerriweatherSans-Regular.ttf
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/Merriweather_Sans/OFL.txt b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/Merriweather_Sans/OFL.txt
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/Merriweather_Sans/OFL.txt
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/Merriweather_Sans/OFL.txt
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/OpenSans.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/OpenSans.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/OpenSans.scss
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/OpenSans.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-bold-webfont.eot b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-bold-webfont.eot
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-bold-webfont.eot
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-bold-webfont.eot
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-bold-webfont.svg b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-bold-webfont.svg
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-bold-webfont.svg
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-bold-webfont.svg
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-bold-webfont.ttf b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-bold-webfont.ttf
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-bold-webfont.ttf
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-bold-webfont.ttf
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-bold-webfont.woff b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-bold-webfont.woff
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-bold-webfont.woff
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-bold-webfont.woff
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-bold-webfont.woff2 b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-bold-webfont.woff2
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-bold-webfont.woff2
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-bold-webfont.woff2
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-bolditalic-webfont.eot b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-bolditalic-webfont.eot
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-bolditalic-webfont.eot
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-bolditalic-webfont.eot
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-bolditalic-webfont.svg b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-bolditalic-webfont.svg
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-bolditalic-webfont.svg
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-bolditalic-webfont.svg
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-bolditalic-webfont.ttf b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-bolditalic-webfont.ttf
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-bolditalic-webfont.ttf
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-bolditalic-webfont.ttf
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-bolditalic-webfont.woff b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-bolditalic-webfont.woff
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-bolditalic-webfont.woff
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-bolditalic-webfont.woff
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-bolditalic-webfont.woff2 b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-bolditalic-webfont.woff2
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-bolditalic-webfont.woff2
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-bolditalic-webfont.woff2
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-extrabold-webfont.eot b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-extrabold-webfont.eot
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-extrabold-webfont.eot
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-extrabold-webfont.eot
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-extrabold-webfont.svg b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-extrabold-webfont.svg
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-extrabold-webfont.svg
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-extrabold-webfont.svg
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-extrabold-webfont.ttf b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-extrabold-webfont.ttf
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-extrabold-webfont.ttf
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-extrabold-webfont.ttf
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-extrabold-webfont.woff b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-extrabold-webfont.woff
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-extrabold-webfont.woff
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-extrabold-webfont.woff
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-extrabold-webfont.woff2 b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-extrabold-webfont.woff2
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-extrabold-webfont.woff2
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-extrabold-webfont.woff2
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-extrabolditalic-webfont.eot b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-extrabolditalic-webfont.eot
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-extrabolditalic-webfont.eot
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-extrabolditalic-webfont.eot
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-extrabolditalic-webfont.svg b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-extrabolditalic-webfont.svg
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-extrabolditalic-webfont.svg
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-extrabolditalic-webfont.svg
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-extrabolditalic-webfont.ttf b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-extrabolditalic-webfont.ttf
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-extrabolditalic-webfont.ttf
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-extrabolditalic-webfont.ttf
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-extrabolditalic-webfont.woff b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-extrabolditalic-webfont.woff
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-extrabolditalic-webfont.woff
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-extrabolditalic-webfont.woff
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-extrabolditalic-webfont.woff2 b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-extrabolditalic-webfont.woff2
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-extrabolditalic-webfont.woff2
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-extrabolditalic-webfont.woff2
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-italic-webfont.eot b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-italic-webfont.eot
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-italic-webfont.eot
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-italic-webfont.eot
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-italic-webfont.svg b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-italic-webfont.svg
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-italic-webfont.svg
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-italic-webfont.svg
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-italic-webfont.ttf b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-italic-webfont.ttf
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-italic-webfont.ttf
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-italic-webfont.ttf
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-italic-webfont.woff b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-italic-webfont.woff
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-italic-webfont.woff
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-italic-webfont.woff
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-italic-webfont.woff2 b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-italic-webfont.woff2
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-italic-webfont.woff2
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-italic-webfont.woff2
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-light-webfont.eot b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-light-webfont.eot
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-light-webfont.eot
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-light-webfont.eot
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-light-webfont.svg b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-light-webfont.svg
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-light-webfont.svg
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-light-webfont.svg
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-light-webfont.ttf b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-light-webfont.ttf
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-light-webfont.ttf
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-light-webfont.ttf
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-light-webfont.woff b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-light-webfont.woff
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-light-webfont.woff
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-light-webfont.woff
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-light-webfont.woff2 b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-light-webfont.woff2
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-light-webfont.woff2
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-light-webfont.woff2
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-lightitalic-webfont.eot b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-lightitalic-webfont.eot
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-lightitalic-webfont.eot
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-lightitalic-webfont.eot
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-lightitalic-webfont.svg b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-lightitalic-webfont.svg
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-lightitalic-webfont.svg
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-lightitalic-webfont.svg
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-lightitalic-webfont.ttf b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-lightitalic-webfont.ttf
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-lightitalic-webfont.ttf
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-lightitalic-webfont.ttf
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-lightitalic-webfont.woff b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-lightitalic-webfont.woff
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-lightitalic-webfont.woff
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-lightitalic-webfont.woff
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-lightitalic-webfont.woff2 b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-lightitalic-webfont.woff2
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-lightitalic-webfont.woff2
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-lightitalic-webfont.woff2
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-regular-webfont.eot b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-regular-webfont.eot
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-regular-webfont.eot
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-regular-webfont.eot
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-regular-webfont.svg b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-regular-webfont.svg
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-regular-webfont.svg
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-regular-webfont.svg
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-regular-webfont.ttf b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-regular-webfont.ttf
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-regular-webfont.ttf
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-regular-webfont.ttf
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-regular-webfont.woff b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-regular-webfont.woff
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-regular-webfont.woff
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-regular-webfont.woff
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-regular-webfont.woff2 b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-regular-webfont.woff2
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-regular-webfont.woff2
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-regular-webfont.woff2
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-semibold-webfont.eot b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-semibold-webfont.eot
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-semibold-webfont.eot
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-semibold-webfont.eot
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-semibold-webfont.svg b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-semibold-webfont.svg
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-semibold-webfont.svg
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-semibold-webfont.svg
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-semibold-webfont.ttf b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-semibold-webfont.ttf
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-semibold-webfont.ttf
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-semibold-webfont.ttf
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-semibold-webfont.woff b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-semibold-webfont.woff
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-semibold-webfont.woff
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-semibold-webfont.woff
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-semibold-webfont.woff2 b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-semibold-webfont.woff2
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-semibold-webfont.woff2
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-semibold-webfont.woff2
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-semibolditalic-webfont.eot b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-semibolditalic-webfont.eot
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-semibolditalic-webfont.eot
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-semibolditalic-webfont.eot
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-semibolditalic-webfont.svg b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-semibolditalic-webfont.svg
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-semibolditalic-webfont.svg
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-semibolditalic-webfont.svg
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-semibolditalic-webfont.ttf b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-semibolditalic-webfont.ttf
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-semibolditalic-webfont.ttf
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-semibolditalic-webfont.ttf
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-semibolditalic-webfont.woff b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-semibolditalic-webfont.woff
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-semibolditalic-webfont.woff
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-semibolditalic-webfont.woff
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-semibolditalic-webfont.woff2 b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-semibolditalic-webfont.woff2
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/OpenSans/opensans-semibolditalic-webfont.woff2
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/OpenSans/opensans-semibolditalic-webfont.woff2
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/Oxygen/OFL.txt b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/Oxygen/OFL.txt
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/Oxygen/OFL.txt
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/Oxygen/OFL.txt
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/Oxygen/Oxygen-Bold.ttf b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/Oxygen/Oxygen-Bold.ttf
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/Oxygen/Oxygen-Bold.ttf
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/Oxygen/Oxygen-Bold.ttf
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/Oxygen/Oxygen-Light.ttf b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/Oxygen/Oxygen-Light.ttf
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/Oxygen/Oxygen-Light.ttf
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/Oxygen/Oxygen-Light.ttf
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/Oxygen/Oxygen-Regular.ttf b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/Oxygen/Oxygen-Regular.ttf
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/Oxygen/Oxygen-Regular.ttf
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/Oxygen/Oxygen-Regular.ttf
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/Oxygen_Mono/OFL.txt b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/Oxygen_Mono/OFL.txt
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/Oxygen_Mono/OFL.txt
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/Oxygen_Mono/OFL.txt
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/Oxygen_Mono/OxygenMono-Regular.ttf b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/Oxygen_Mono/OxygenMono-Regular.ttf
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/Oxygen_Mono/OxygenMono-Regular.ttf
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/Oxygen_Mono/OxygenMono-Regular.ttf
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/icons/entypo.eot b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/icons/entypo.eot
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/icons/entypo.eot
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/icons/entypo.eot
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/icons/entypo.ttf b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/icons/entypo.ttf
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/icons/entypo.ttf
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/icons/entypo.ttf
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/icons/entypo.woff b/src/Bundle/ChillMainBundle/Resources/public/chill/fonts/icons/entypo.woff
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/fonts/icons/entypo.woff
rename to src/Bundle/ChillMainBundle/Resources/public/chill/fonts/icons/entypo.woff
diff --git a/src/Bundle/ChillMainBundle/Resources/public/img/background/desert.jpg b/src/Bundle/ChillMainBundle/Resources/public/chill/img/background/desert.jpg
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/img/background/desert.jpg
rename to src/Bundle/ChillMainBundle/Resources/public/chill/img/background/desert.jpg
diff --git a/src/Bundle/ChillMainBundle/Resources/public/img/background/kids-1.jpg b/src/Bundle/ChillMainBundle/Resources/public/chill/img/background/kids-1.jpg
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/img/background/kids-1.jpg
rename to src/Bundle/ChillMainBundle/Resources/public/chill/img/background/kids-1.jpg
diff --git a/src/Bundle/ChillMainBundle/Resources/public/img/background/kids-2.jpg b/src/Bundle/ChillMainBundle/Resources/public/chill/img/background/kids-2.jpg
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/img/background/kids-2.jpg
rename to src/Bundle/ChillMainBundle/Resources/public/chill/img/background/kids-2.jpg
diff --git a/src/Bundle/ChillMainBundle/Resources/public/img/background/sun.jpg b/src/Bundle/ChillMainBundle/Resources/public/chill/img/background/sun.jpg
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/img/background/sun.jpg
rename to src/Bundle/ChillMainBundle/Resources/public/chill/img/background/sun.jpg
diff --git a/src/Bundle/ChillMainBundle/Resources/public/img/draggable.svg b/src/Bundle/ChillMainBundle/Resources/public/chill/img/draggable.svg
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/img/draggable.svg
rename to src/Bundle/ChillMainBundle/Resources/public/chill/img/draggable.svg
diff --git a/src/Bundle/ChillMainBundle/Resources/public/img/favicon-32.xcf b/src/Bundle/ChillMainBundle/Resources/public/chill/img/favicon-32.xcf
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/img/favicon-32.xcf
rename to src/Bundle/ChillMainBundle/Resources/public/chill/img/favicon-32.xcf
diff --git a/src/Bundle/ChillMainBundle/Resources/public/img/favicon.ico b/src/Bundle/ChillMainBundle/Resources/public/chill/img/favicon.ico
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/img/favicon.ico
rename to src/Bundle/ChillMainBundle/Resources/public/chill/img/favicon.ico
diff --git a/src/Bundle/ChillMainBundle/Resources/public/img/favicon.svg b/src/Bundle/ChillMainBundle/Resources/public/chill/img/favicon.svg
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/img/favicon.svg
rename to src/Bundle/ChillMainBundle/Resources/public/chill/img/favicon.svg
diff --git a/src/Bundle/ChillMainBundle/Resources/public/img/logo-chill-outil-accompagnement.png b/src/Bundle/ChillMainBundle/Resources/public/chill/img/logo-chill-outil-accompagnement.png
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/img/logo-chill-outil-accompagnement.png
rename to src/Bundle/ChillMainBundle/Resources/public/chill/img/logo-chill-outil-accompagnement.png
diff --git a/src/Bundle/ChillMainBundle/Resources/public/img/logo-chill-outil-accompagnement.svg b/src/Bundle/ChillMainBundle/Resources/public/chill/img/logo-chill-outil-accompagnement.svg
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/img/logo-chill-outil-accompagnement.svg
rename to src/Bundle/ChillMainBundle/Resources/public/chill/img/logo-chill-outil-accompagnement.svg
diff --git a/src/Bundle/ChillMainBundle/Resources/public/img/logo-chill-outil-accompagnement_white.png b/src/Bundle/ChillMainBundle/Resources/public/chill/img/logo-chill-outil-accompagnement_white.png
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/img/logo-chill-outil-accompagnement_white.png
rename to src/Bundle/ChillMainBundle/Resources/public/chill/img/logo-chill-outil-accompagnement_white.png
diff --git a/src/Bundle/ChillMainBundle/Resources/public/img/logo-chill-outil-accompagnement_white.svg b/src/Bundle/ChillMainBundle/Resources/public/chill/img/logo-chill-outil-accompagnement_white.svg
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/img/logo-chill-outil-accompagnement_white.svg
rename to src/Bundle/ChillMainBundle/Resources/public/chill/img/logo-chill-outil-accompagnement_white.svg
diff --git a/src/Bundle/ChillMainBundle/Resources/public/img/logo-chill-sans-slogan.png b/src/Bundle/ChillMainBundle/Resources/public/chill/img/logo-chill-sans-slogan.png
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/img/logo-chill-sans-slogan.png
rename to src/Bundle/ChillMainBundle/Resources/public/chill/img/logo-chill-sans-slogan.png
diff --git a/src/Bundle/ChillMainBundle/Resources/public/img/logo-chill-sans-slogan.svg b/src/Bundle/ChillMainBundle/Resources/public/chill/img/logo-chill-sans-slogan.svg
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/img/logo-chill-sans-slogan.svg
rename to src/Bundle/ChillMainBundle/Resources/public/chill/img/logo-chill-sans-slogan.svg
diff --git a/src/Bundle/ChillMainBundle/Resources/public/img/logo-chill-sans-slogan_white.png b/src/Bundle/ChillMainBundle/Resources/public/chill/img/logo-chill-sans-slogan_white.png
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/img/logo-chill-sans-slogan_white.png
rename to src/Bundle/ChillMainBundle/Resources/public/chill/img/logo-chill-sans-slogan_white.png
diff --git a/src/Bundle/ChillMainBundle/Resources/public/img/logo-chill-sans-slogan_white.svg b/src/Bundle/ChillMainBundle/Resources/public/chill/img/logo-chill-sans-slogan_white.svg
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/img/logo-chill-sans-slogan_white.svg
rename to src/Bundle/ChillMainBundle/Resources/public/chill/img/logo-chill-sans-slogan_white.svg
diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/index.js b/src/Bundle/ChillMainBundle/Resources/public/chill/index.js
new file mode 100644
index 000000000..cf7365631
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/chill/index.js
@@ -0,0 +1,52 @@
+/*
+ * CHILL Entrypoint
+ * Load from node-modules
+ */
+
+/// import jQuery
+const $ = require('jquery');
+global.$ = global.jQuery = $;
+
+/// import select2
+const select2 = require('select2');
+global.select2 = select2;
+
+require('select2/dist/css/select2.css');
+require('select2-bootstrap-theme/dist/select2-bootstrap.css');
+
+/*
+ * Load Chill themes assets
+ */
+
+require('./chillmain.scss');
+require('./css/chillmain.css');
+
+import { chill } from './js/chill.js';
+global.chill = chill;
+
+require('./js/date.js');
+
+/// Load fonts
+require('./fonts/OpenSans/OpenSans.scss')
+
+/// Load images
+require('./img/favicon.ico');
+require('./img/logo-chill-sans-slogan_white.png');
+require('./img/logo-chill-outil-accompagnement_white.png');
+
+/*
+ * Load local libs
+ * Some libs are only used in a few pages, they are loaded on a case by case basis
+ */
+
+require('../lib/collection/index.js');
+
+require('../lib/breadcrumb/index.js');
+require('../lib/download-report/index.js');
+require('../lib/select_interactive_loading/index.js');
+require('../lib/export-list/index.js');
+require('../lib/entity/index.js');
+
+//require('../lib/show_hide/index.js');
+//require('../lib/tabs/index.js');
+
diff --git a/src/Bundle/ChillMainBundle/Resources/public/js/chill.js b/src/Bundle/ChillMainBundle/Resources/public/chill/js/chill.js
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/js/chill.js
rename to src/Bundle/ChillMainBundle/Resources/public/chill/js/chill.js
diff --git a/src/Bundle/ChillMainBundle/Resources/public/js/date.js b/src/Bundle/ChillMainBundle/Resources/public/chill/js/date.js
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/js/date.js
rename to src/Bundle/ChillMainBundle/Resources/public/chill/js/date.js
diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss
new file mode 100644
index 000000000..c01ebc41d
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss
@@ -0,0 +1,130 @@
+/*
+*  FLEX RESPONSIVE TABLE/BLOCK PRESENTATION
+*/
+div.flex-bloc,
+div.flex-table {
+    h2, h3, h4, dl, p {
+        margin: 0;
+    }
+    h2, h3, h4 {
+        color: var(--bs-chill-blue);
+    }
+    div.item-bloc {
+        @include border-collapse;
+    }
+}
+
+/*
+* Bloc appearance
+*/
+div.flex-bloc {
+    box-sizing: border-box;
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+    align-items: stretch;
+    align-content: stretch;
+
+    div.item-bloc {
+        flex-grow: 0; flex-shrink: 1; flex-basis: auto;
+        margin: 0;
+        padding: 1em;
+        display: flex;
+        flex-direction: column;
+
+        div.item-row {
+            flex-grow: 1; flex-shrink: 1; flex-basis: auto;
+            display: flex;
+            flex-direction: column;
+
+            div.item-col {
+                &:first-child {
+                    flex-grow: 0; flex-shrink: 0; flex-basis: auto;
+                    padding-bottom: 0.5em;
+                    border-bottom: 1px dotted #0000004f;
+                    margin-bottom: 0.5em;
+                }
+                &:last-child {
+                    flex-grow: 1; flex-shrink: 1; flex-basis: auto;
+                    display: flex;
+
+                    .list-content { // ul, dl, or div
+                    }
+                    ul.record_actions {
+                        margin: 0;
+                        align-self: flex-end;
+                        flex-grow: 1; flex-shrink: 0; flex-basis: auto;
+                        li {
+                            margin-right: 5px;
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+/*
+* Table appearance
+*/
+div.flex-table {
+    display: flex;
+    flex-direction: column;
+    align-items: stretch;
+    align-content: stretch;
+
+    div.item-bloc {
+        display: flex;
+        flex-direction: column;
+        padding: 1em;
+        &:nth-child(even) {
+            background-color: $gray-200;
+        }
+
+        div.item-row {
+            display: flex;
+            flex-direction: row;
+            &:not(:first-child) {
+                margin-top: 0.5em;
+                border-top: 1px dotted #0000004f;
+                padding-top: 0.5em;
+                flex-direction: column;
+            }
+
+            div.item-col {
+                &:first-child {
+                    flex-grow: 0; flex-shrink: 0; flex-basis: 33%;
+                }
+                &:last-child {
+                    flex-grow: 1; flex-shrink: 1; flex-basis: auto;
+                    display: flex;
+                    justify-content: flex-end;
+
+                    .list-content { // ul, dl, or div
+                    }
+                    ul.record_actions {
+                        margin: 0;
+                        align-self: flex-start;
+                        flex-grow: 1; flex-shrink: 0; flex-basis: auto;
+                        li {
+                            margin-right: 5px;
+                        }
+                    }
+                }
+            }
+            @media only screen and (max-width: 900px) {
+                flex-direction: column;
+                div.item-col {
+                    &:last-child {
+                        ul.record_actions {
+                            align-self: flex-end;
+                        }
+                    }
+                }
+            }
+
+            // neutralize
+            div.chill_address div.chill_address_address p { text-indent: 0; }
+        }
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/mixins.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/mixins.scss
new file mode 100644
index 000000000..22e1d310e
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/mixins.scss
@@ -0,0 +1,14 @@
+
+// We use box-shadow instead of border
+// to avoid to manage border double-width
+// Then we can simulate border-collapse: collapse (table)
+
+@mixin border-collapse {
+    box-shadow:
+        1px 0 0 0 var(--bs-dark),
+        0 1px 0 0 var(--bs-dark),
+        1px 1px 0 0 var(--bs-dark),   /* fix the corner */
+        1px 0 0 0 var(--bs-dark) inset,
+        0 1px 0 0 var(--bs-dark) inset;
+}
+
diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/render_box.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/render_box.scss
new file mode 100644
index 000000000..dd1dc12c5
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/render_box.scss
@@ -0,0 +1,95 @@
+// generic rules
+section.chill-entity {
+
+    // display inline for render raw
+    // have no effect for render label, bloc !
+    display: inline;
+
+    // don't break flex cascade with section tag
+    div.flex-bloc & {
+        display: flex;
+        flex-grow: 1; flex-shrink: 1; flex-basis: auto;
+    }
+}
+
+// specific rules
+.chill-entity {
+
+    // used for: entity-person, entity-thirdparty
+    &.entity-person,
+    &.entity-thirdparty {
+
+        div.entity-label {
+            div.denomination {
+                &.h3 {
+                    font-size: 1.3em;
+                    font-weight: 700;
+                }
+                a {
+                    text-decoration: none;
+                }
+                span.badge {
+                    margin-left: 0.3em;
+                }
+                span.altnames,
+                span.id-number {
+                    font-weight: lighter;
+                    font-size: 50%;
+                    margin-left: 0.5em;
+                }
+                span.id-number {
+                    &:before { content: '(n°'; }
+                    &:after { content: ')'; }
+                }
+            }
+            p.moreinfo {}
+        }
+        div.entity-bloc {}
+    }
+
+    // used for addresses
+    &.entity-address {
+
+        .address {
+            font-size: 98%;
+            font-variant: small-caps;
+
+            &.multiline {
+                margin: 0.7em 0;
+                p {
+                    display: block;
+                }
+            }
+            &.delimiter {
+                p:not(:first-child):before {
+                    content: ' — ';
+                }
+            }
+            p {
+                display: inline-block;
+                margin: 0 0 0 1.5em;
+                text-indent: -1.5em;
+
+                &.street {
+                    span.streetnumber {
+                        &::before { content: ", "; }
+                    }
+                }
+                &.postcode {
+                    span.code {}
+                    span.name {}
+                }
+                &.country {}
+            }
+        }
+
+        .noaddress {
+            font-style: italic;
+        }
+
+        span.address-valid {
+            &.address-since {}
+            &.address-until {}
+        }
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Resources/public/css/pikaday.css b/src/Bundle/ChillMainBundle/Resources/public/css/pikaday.css
deleted file mode 100644
index 495802417..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/css/pikaday.css
+++ /dev/null
@@ -1,173 +0,0 @@
-@charset "UTF-8";
-
-/*!
- * Pikaday
- * Copyright © 2014 David Bushell | BSD & MIT license | http://dbushell.com/
- */
-
-.pika-single {
-    z-index: 9999;
-    display: block;
-    position: relative;
-    width: 240px;
-    padding: 8px;
-    color: #333;
-    background: #fff;
-    border: 1px solid #ccc;
-    border-bottom-color: #bbb;
-    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-}
-
-.pika-single.is-hidden {
-    display: none;
-}
-
-.pika-single.is-bound {
-    position: absolute;
-    box-shadow: 0 5px 15px -5px rgba(0,0,0,.5);
-}
-
-.pika-title {
-    position: relative;
-    text-align: center;
-}
-
-.pika-label {
-    display: inline-block;
-    *display: inline;
-    position: relative;
-    z-index: 9999;
-    overflow: hidden;
-    margin: 0;
-    padding: 5px 3px;
-    font-size: 14px;
-    line-height: 20px;
-    font-weight: bold;
-    background-color: #fff;
-}
-.pika-title select {
-    cursor: pointer;
-    position: absolute;
-    z-index: 9998;
-    margin: 0;
-    left: 0;
-    top: 5px;
-    filter: alpha(opacity=0);
-    opacity: 0;
-}
-
-.pika-prev,
-.pika-next {
-    display: block;
-    cursor: pointer;
-    position: relative;
-    outline: none;
-    border: 0;
-    padding: 0;
-    width: 20px;
-    height: 30px;
-    /* hide text using text-indent trick, using width value (it's enough) */
-    text-indent: 20px;
-    white-space: nowrap;
-    overflow: hidden;
-    background-color: transparent;
-    background-position: center center;
-    background-repeat: no-repeat;
-    background-size: 75% 75%;
-    opacity: .5;
-    *position: absolute;
-    *top: 0;
-}
-
-.pika-prev:hover,
-.pika-next:hover {
-    opacity: 1;
-}
-
-.pika-prev,
-.is-rtl .pika-next {
-    float: left;
-    background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAeCAYAAAAsEj5rAAAAUklEQVR42u3VMQoAIBADQf8Pgj+OD9hG2CtONJB2ymQkKe0HbwAP0xucDiQWARITIDEBEnMgMQ8S8+AqBIl6kKgHiXqQqAeJepBo/z38J/U0uAHlaBkBl9I4GwAAAABJRU5ErkJggg==');
-    *left: 0;
-}
-
-.pika-next,
-.is-rtl .pika-prev {
-    float: right;
-    background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAeCAYAAAAsEj5rAAAAU0lEQVR42u3VOwoAMAgE0dwfAnNjU26bYkBCFGwfiL9VVWoO+BJ4Gf3gtsEKKoFBNTCoCAYVwaAiGNQGMUHMkjGbgjk2mIONuXo0nC8XnCf1JXgArVIZAQh5TKYAAAAASUVORK5CYII=');
-    *right: 0;
-}
-
-.pika-prev.is-disabled,
-.pika-next.is-disabled {
-    cursor: default;
-    opacity: .2;
-}
-
-.pika-select {
-    display: inline-block;
-    *display: inline;
-}
-
-.pika-table {
-    width: 100%;
-    border-collapse: collapse;
-    border-spacing: 0;
-    border: 0;
-}
-
-.pika-table th,
-.pika-table td {
-    width: 14.285714285714286%;
-    padding: 0;
-}
-
-.pika-table th {
-    color: #999;
-    font-size: 12px;
-    line-height: 25px;
-    font-weight: bold;
-    text-align: center;
-}
-
-.pika-button {
-    cursor: pointer;
-    display: block;
-    outline: none;
-    border: 0;
-    margin: 0;
-    width: 100%;
-    padding: 5px;
-    color: #666;
-    font-size: 12px;
-    line-height: 15px;
-    text-align: right;
-    background: #f5f5f5;
-}
-
-.is-today .pika-button {
-    color: #33aaff;
-    font-weight: bold;
-}
-
-.is-selected .pika-button {
-    color: #fff;
-    font-weight: bold;
-    background: #33aaff;
-    box-shadow: inset 0 1px 3px #178fe5;
-    border-radius: 3px;
-}
-
-.is-disabled .pika-button {
-    pointer-events: none;
-    cursor: default;
-    color: #999;
-    opacity: .3;
-}
-
-.pika-button:hover {
-    color: #fff !important;
-    background: #ff8000 !important;
-    box-shadow: none !important;
-    border-radius: 3px !important;
-}
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/icons/Merriweather_Sans/MerriweatherSans-Bold.ttf b/src/Bundle/ChillMainBundle/Resources/public/fonts/icons/Merriweather_Sans/MerriweatherSans-Bold.ttf
deleted file mode 100644
index 1d623bfe9..000000000
Binary files a/src/Bundle/ChillMainBundle/Resources/public/fonts/icons/Merriweather_Sans/MerriweatherSans-Bold.ttf and /dev/null differ
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/icons/Merriweather_Sans/MerriweatherSans-BoldItalic.ttf b/src/Bundle/ChillMainBundle/Resources/public/fonts/icons/Merriweather_Sans/MerriweatherSans-BoldItalic.ttf
deleted file mode 100644
index 89e1809d3..000000000
Binary files a/src/Bundle/ChillMainBundle/Resources/public/fonts/icons/Merriweather_Sans/MerriweatherSans-BoldItalic.ttf and /dev/null differ
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/icons/Merriweather_Sans/MerriweatherSans-ExtraBold.ttf b/src/Bundle/ChillMainBundle/Resources/public/fonts/icons/Merriweather_Sans/MerriweatherSans-ExtraBold.ttf
deleted file mode 100644
index 1d1662ff6..000000000
Binary files a/src/Bundle/ChillMainBundle/Resources/public/fonts/icons/Merriweather_Sans/MerriweatherSans-ExtraBold.ttf and /dev/null differ
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/icons/Merriweather_Sans/MerriweatherSans-ExtraBoldItalic.ttf b/src/Bundle/ChillMainBundle/Resources/public/fonts/icons/Merriweather_Sans/MerriweatherSans-ExtraBoldItalic.ttf
deleted file mode 100644
index 5decede38..000000000
Binary files a/src/Bundle/ChillMainBundle/Resources/public/fonts/icons/Merriweather_Sans/MerriweatherSans-ExtraBoldItalic.ttf and /dev/null differ
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/icons/Merriweather_Sans/MerriweatherSans-Italic.ttf b/src/Bundle/ChillMainBundle/Resources/public/fonts/icons/Merriweather_Sans/MerriweatherSans-Italic.ttf
deleted file mode 100644
index ed36a44f8..000000000
Binary files a/src/Bundle/ChillMainBundle/Resources/public/fonts/icons/Merriweather_Sans/MerriweatherSans-Italic.ttf and /dev/null differ
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/icons/Merriweather_Sans/MerriweatherSans-Light.ttf b/src/Bundle/ChillMainBundle/Resources/public/fonts/icons/Merriweather_Sans/MerriweatherSans-Light.ttf
deleted file mode 100644
index bb0294779..000000000
Binary files a/src/Bundle/ChillMainBundle/Resources/public/fonts/icons/Merriweather_Sans/MerriweatherSans-Light.ttf and /dev/null differ
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/icons/Merriweather_Sans/MerriweatherSans-LightItalic.ttf b/src/Bundle/ChillMainBundle/Resources/public/fonts/icons/Merriweather_Sans/MerriweatherSans-LightItalic.ttf
deleted file mode 100644
index affa9ca50..000000000
Binary files a/src/Bundle/ChillMainBundle/Resources/public/fonts/icons/Merriweather_Sans/MerriweatherSans-LightItalic.ttf and /dev/null differ
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/icons/Merriweather_Sans/MerriweatherSans-Regular.ttf b/src/Bundle/ChillMainBundle/Resources/public/fonts/icons/Merriweather_Sans/MerriweatherSans-Regular.ttf
deleted file mode 100644
index 78c591099..000000000
Binary files a/src/Bundle/ChillMainBundle/Resources/public/fonts/icons/Merriweather_Sans/MerriweatherSans-Regular.ttf and /dev/null differ
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/icons/Merriweather_Sans/OFL.txt b/src/Bundle/ChillMainBundle/Resources/public/fonts/icons/Merriweather_Sans/OFL.txt
deleted file mode 100644
index 6665e9d99..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/fonts/icons/Merriweather_Sans/OFL.txt
+++ /dev/null
@@ -1,94 +0,0 @@
-Copyright (c) 2013, Sorkin Type Co (www.sorkintype.com) with Reserved Font Name 'Merriweather'
-
-Merriweather is a trademark of Sorkin Type Co.
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/icons/Oxygen/OFL.txt b/src/Bundle/ChillMainBundle/Resources/public/fonts/icons/Oxygen/OFL.txt
deleted file mode 100644
index 905e1d607..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/fonts/icons/Oxygen/OFL.txt
+++ /dev/null
@@ -1,92 +0,0 @@
-Copyright (c) 2012, vernon adams (vern@newtypography.co.uk), with Reserved Font Names 'Oxygen'
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/icons/Oxygen/Oxygen-Bold.ttf b/src/Bundle/ChillMainBundle/Resources/public/fonts/icons/Oxygen/Oxygen-Bold.ttf
deleted file mode 100644
index 835ab0536..000000000
Binary files a/src/Bundle/ChillMainBundle/Resources/public/fonts/icons/Oxygen/Oxygen-Bold.ttf and /dev/null differ
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/icons/Oxygen/Oxygen-Light.ttf b/src/Bundle/ChillMainBundle/Resources/public/fonts/icons/Oxygen/Oxygen-Light.ttf
deleted file mode 100644
index 08b9fec30..000000000
Binary files a/src/Bundle/ChillMainBundle/Resources/public/fonts/icons/Oxygen/Oxygen-Light.ttf and /dev/null differ
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/icons/Oxygen/Oxygen-Regular.ttf b/src/Bundle/ChillMainBundle/Resources/public/fonts/icons/Oxygen/Oxygen-Regular.ttf
deleted file mode 100644
index a66ddf1c8..000000000
Binary files a/src/Bundle/ChillMainBundle/Resources/public/fonts/icons/Oxygen/Oxygen-Regular.ttf and /dev/null differ
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/icons/Oxygen_Mono/OFL.txt b/src/Bundle/ChillMainBundle/Resources/public/fonts/icons/Oxygen_Mono/OFL.txt
deleted file mode 100644
index 905e1d607..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/fonts/icons/Oxygen_Mono/OFL.txt
+++ /dev/null
@@ -1,92 +0,0 @@
-Copyright (c) 2012, vernon adams (vern@newtypography.co.uk), with Reserved Font Names 'Oxygen'
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/src/Bundle/ChillMainBundle/Resources/public/fonts/icons/Oxygen_Mono/OxygenMono-Regular.ttf b/src/Bundle/ChillMainBundle/Resources/public/fonts/icons/Oxygen_Mono/OxygenMono-Regular.ttf
deleted file mode 100644
index 64c165c92..000000000
Binary files a/src/Bundle/ChillMainBundle/Resources/public/fonts/icons/Oxygen_Mono/OxygenMono-Regular.ttf and /dev/null differ
diff --git a/src/Bundle/ChillMainBundle/Resources/public/js/collection/collection.scss b/src/Bundle/ChillMainBundle/Resources/public/js/collection/collection.scss
deleted file mode 100644
index ba2f9ce9e..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/js/collection/collection.scss
+++ /dev/null
@@ -1,27 +0,0 @@
-div.chill-collection {
-    ul.chill-collection__list {
-        list-style: none;
-        padding: 0;
-        margin-bottom: 1.5rem;
-        
-        li.chill-collection__list__entry:nth-child(2n) {
-            background-color: var(--chill-light-gray);
-            padding: 0.5rem 0;
-        }
-        
-        // all entries, except the last one
-        li.chill-collection__list__entry:nth-last-child(1n+2) {
-            margin-bottom: 1rem;
-        }
-        
-        button.chill-collection__list__remove-entry {
-            margin-left: 0.5rem;
-        }
-    }
-    
-    button.chill-collection__button--add {
-        
-        
-    }
-}
-
diff --git a/src/Bundle/ChillMainBundle/Resources/public/js/jquery.js b/src/Bundle/ChillMainBundle/Resources/public/js/jquery.js
deleted file mode 100644
index eed17778c..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/js/jquery.js
+++ /dev/null
@@ -1,9210 +0,0 @@
-/*!
- * jQuery JavaScript Library v2.1.4
- * http://jquery.com/
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- *
- * Copyright 2005, 2014 jQuery Foundation, Inc. and other contributors
- * Released under the MIT license
- * http://jquery.org/license
- *
- * Date: 2015-04-28T16:01Z
- */
-
-(function( global, factory ) {
-
-	if ( typeof module === "object" && typeof module.exports === "object" ) {
-		// For CommonJS and CommonJS-like environments where a proper `window`
-		// is present, execute the factory and get jQuery.
-		// For environments that do not have a `window` with a `document`
-		// (such as Node.js), expose a factory as module.exports.
-		// This accentuates the need for the creation of a real `window`.
-		// e.g. var jQuery = require("jquery")(window);
-		// See ticket #14549 for more info.
-		module.exports = global.document ?
-			factory( global, true ) :
-			function( w ) {
-				if ( !w.document ) {
-					throw new Error( "jQuery requires a window with a document" );
-				}
-				return factory( w );
-			};
-	} else {
-		factory( global );
-	}
-
-// Pass this if window is not defined yet
-}(typeof window !== "undefined" ? window : this, function( window, noGlobal ) {
-
-// Support: Firefox 18+
-// Can't be in strict mode, several libs including ASP.NET trace
-// the stack via arguments.caller.callee and Firefox dies if
-// you try to trace through "use strict" call chains. (#13335)
-//
-
-var arr = [];
-
-var slice = arr.slice;
-
-var concat = arr.concat;
-
-var push = arr.push;
-
-var indexOf = arr.indexOf;
-
-var class2type = {};
-
-var toString = class2type.toString;
-
-var hasOwn = class2type.hasOwnProperty;
-
-var support = {};
-
-
-
-var
-	// Use the correct document accordingly with window argument (sandbox)
-	document = window.document,
-
-	version = "2.1.4",
-
-	// Define a local copy of jQuery
-	jQuery = function( selector, context ) {
-		// The jQuery object is actually just the init constructor 'enhanced'
-		// Need init if jQuery is called (just allow error to be thrown if not included)
-		return new jQuery.fn.init( selector, context );
-	},
-
-	// Support: Android<4.1
-	// Make sure we trim BOM and NBSP
-	rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,
-
-	// Matches dashed string for camelizing
-	rmsPrefix = /^-ms-/,
-	rdashAlpha = /-([\da-z])/gi,
-
-	// Used by jQuery.camelCase as callback to replace()
-	fcamelCase = function( all, letter ) {
-		return letter.toUpperCase();
-	};
-
-jQuery.fn = jQuery.prototype = {
-	// The current version of jQuery being used
-	jquery: version,
-
-	constructor: jQuery,
-
-	// Start with an empty selector
-	selector: "",
-
-	// The default length of a jQuery object is 0
-	length: 0,
-
-	toArray: function() {
-		return slice.call( this );
-	},
-
-	// Get the Nth element in the matched element set OR
-	// Get the whole matched element set as a clean array
-	get: function( num ) {
-		return num != null ?
-
-			// Return just the one element from the set
-			( num < 0 ? this[ num + this.length ] : this[ num ] ) :
-
-			// Return all the elements in a clean array
-			slice.call( this );
-	},
-
-	// Take an array of elements and push it onto the stack
-	// (returning the new matched element set)
-	pushStack: function( elems ) {
-
-		// Build a new jQuery matched element set
-		var ret = jQuery.merge( this.constructor(), elems );
-
-		// Add the old object onto the stack (as a reference)
-		ret.prevObject = this;
-		ret.context = this.context;
-
-		// Return the newly-formed element set
-		return ret;
-	},
-
-	// Execute a callback for every element in the matched set.
-	// (You can seed the arguments with an array of args, but this is
-	// only used internally.)
-	each: function( callback, args ) {
-		return jQuery.each( this, callback, args );
-	},
-
-	map: function( callback ) {
-		return this.pushStack( jQuery.map(this, function( elem, i ) {
-			return callback.call( elem, i, elem );
-		}));
-	},
-
-	slice: function() {
-		return this.pushStack( slice.apply( this, arguments ) );
-	},
-
-	first: function() {
-		return this.eq( 0 );
-	},
-
-	last: function() {
-		return this.eq( -1 );
-	},
-
-	eq: function( i ) {
-		var len = this.length,
-			j = +i + ( i < 0 ? len : 0 );
-		return this.pushStack( j >= 0 && j < len ? [ this[j] ] : [] );
-	},
-
-	end: function() {
-		return this.prevObject || this.constructor(null);
-	},
-
-	// For internal use only.
-	// Behaves like an Array's method, not like a jQuery method.
-	push: push,
-	sort: arr.sort,
-	splice: arr.splice
-};
-
-jQuery.extend = jQuery.fn.extend = function() {
-	var options, name, src, copy, copyIsArray, clone,
-		target = arguments[0] || {},
-		i = 1,
-		length = arguments.length,
-		deep = false;
-
-	// Handle a deep copy situation
-	if ( typeof target === "boolean" ) {
-		deep = target;
-
-		// Skip the boolean and the target
-		target = arguments[ i ] || {};
-		i++;
-	}
-
-	// Handle case when target is a string or something (possible in deep copy)
-	if ( typeof target !== "object" && !jQuery.isFunction(target) ) {
-		target = {};
-	}
-
-	// Extend jQuery itself if only one argument is passed
-	if ( i === length ) {
-		target = this;
-		i--;
-	}
-
-	for ( ; i < length; i++ ) {
-		// Only deal with non-null/undefined values
-		if ( (options = arguments[ i ]) != null ) {
-			// Extend the base object
-			for ( name in options ) {
-				src = target[ name ];
-				copy = options[ name ];
-
-				// Prevent never-ending loop
-				if ( target === copy ) {
-					continue;
-				}
-
-				// Recurse if we're merging plain objects or arrays
-				if ( deep && copy && ( jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)) ) ) {
-					if ( copyIsArray ) {
-						copyIsArray = false;
-						clone = src && jQuery.isArray(src) ? src : [];
-
-					} else {
-						clone = src && jQuery.isPlainObject(src) ? src : {};
-					}
-
-					// Never move original objects, clone them
-					target[ name ] = jQuery.extend( deep, clone, copy );
-
-				// Don't bring in undefined values
-				} else if ( copy !== undefined ) {
-					target[ name ] = copy;
-				}
-			}
-		}
-	}
-
-	// Return the modified object
-	return target;
-};
-
-jQuery.extend({
-	// Unique for each copy of jQuery on the page
-	expando: "jQuery" + ( version + Math.random() ).replace( /\D/g, "" ),
-
-	// Assume jQuery is ready without the ready module
-	isReady: true,
-
-	error: function( msg ) {
-		throw new Error( msg );
-	},
-
-	noop: function() {},
-
-	isFunction: function( obj ) {
-		return jQuery.type(obj) === "function";
-	},
-
-	isArray: Array.isArray,
-
-	isWindow: function( obj ) {
-		return obj != null && obj === obj.window;
-	},
-
-	isNumeric: function( obj ) {
-		// parseFloat NaNs numeric-cast false positives (null|true|false|"")
-		// ...but misinterprets leading-number strings, particularly hex literals ("0x...")
-		// subtraction forces infinities to NaN
-		// adding 1 corrects loss of precision from parseFloat (#15100)
-		return !jQuery.isArray( obj ) && (obj - parseFloat( obj ) + 1) >= 0;
-	},
-
-	isPlainObject: function( obj ) {
-		// Not plain objects:
-		// - Any object or value whose internal [[Class]] property is not "[object Object]"
-		// - DOM nodes
-		// - window
-		if ( jQuery.type( obj ) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) {
-			return false;
-		}
-
-		if ( obj.constructor &&
-				!hasOwn.call( obj.constructor.prototype, "isPrototypeOf" ) ) {
-			return false;
-		}
-
-		// If the function hasn't returned already, we're confident that
-		// |obj| is a plain object, created by {} or constructed with new Object
-		return true;
-	},
-
-	isEmptyObject: function( obj ) {
-		var name;
-		for ( name in obj ) {
-			return false;
-		}
-		return true;
-	},
-
-	type: function( obj ) {
-		if ( obj == null ) {
-			return obj + "";
-		}
-		// Support: Android<4.0, iOS<6 (functionish RegExp)
-		return typeof obj === "object" || typeof obj === "function" ?
-			class2type[ toString.call(obj) ] || "object" :
-			typeof obj;
-	},
-
-	// Evaluates a script in a global context
-	globalEval: function( code ) {
-		var script,
-			indirect = eval;
-
-		code = jQuery.trim( code );
-
-		if ( code ) {
-			// If the code includes a valid, prologue position
-			// strict mode pragma, execute code by injecting a
-			// script tag into the document.
-			if ( code.indexOf("use strict") === 1 ) {
-				script = document.createElement("script");
-				script.text = code;
-				document.head.appendChild( script ).parentNode.removeChild( script );
-			} else {
-			// Otherwise, avoid the DOM node creation, insertion
-			// and removal by using an indirect global eval
-				indirect( code );
-			}
-		}
-	},
-
-	// Convert dashed to camelCase; used by the css and data modules
-	// Support: IE9-11+
-	// Microsoft forgot to hump their vendor prefix (#9572)
-	camelCase: function( string ) {
-		return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase );
-	},
-
-	nodeName: function( elem, name ) {
-		return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase();
-	},
-
-	// args is for internal usage only
-	each: function( obj, callback, args ) {
-		var value,
-			i = 0,
-			length = obj.length,
-			isArray = isArraylike( obj );
-
-		if ( args ) {
-			if ( isArray ) {
-				for ( ; i < length; i++ ) {
-					value = callback.apply( obj[ i ], args );
-
-					if ( value === false ) {
-						break;
-					}
-				}
-			} else {
-				for ( i in obj ) {
-					value = callback.apply( obj[ i ], args );
-
-					if ( value === false ) {
-						break;
-					}
-				}
-			}
-
-		// A special, fast, case for the most common use of each
-		} else {
-			if ( isArray ) {
-				for ( ; i < length; i++ ) {
-					value = callback.call( obj[ i ], i, obj[ i ] );
-
-					if ( value === false ) {
-						break;
-					}
-				}
-			} else {
-				for ( i in obj ) {
-					value = callback.call( obj[ i ], i, obj[ i ] );
-
-					if ( value === false ) {
-						break;
-					}
-				}
-			}
-		}
-
-		return obj;
-	},
-
-	// Support: Android<4.1
-	trim: function( text ) {
-		return text == null ?
-			"" :
-			( text + "" ).replace( rtrim, "" );
-	},
-
-	// results is for internal usage only
-	makeArray: function( arr, results ) {
-		var ret = results || [];
-
-		if ( arr != null ) {
-			if ( isArraylike( Object(arr) ) ) {
-				jQuery.merge( ret,
-					typeof arr === "string" ?
-					[ arr ] : arr
-				);
-			} else {
-				push.call( ret, arr );
-			}
-		}
-
-		return ret;
-	},
-
-	inArray: function( elem, arr, i ) {
-		return arr == null ? -1 : indexOf.call( arr, elem, i );
-	},
-
-	merge: function( first, second ) {
-		var len = +second.length,
-			j = 0,
-			i = first.length;
-
-		for ( ; j < len; j++ ) {
-			first[ i++ ] = second[ j ];
-		}
-
-		first.length = i;
-
-		return first;
-	},
-
-	grep: function( elems, callback, invert ) {
-		var callbackInverse,
-			matches = [],
-			i = 0,
-			length = elems.length,
-			callbackExpect = !invert;
-
-		// Go through the array, only saving the items
-		// that pass the validator function
-		for ( ; i < length; i++ ) {
-			callbackInverse = !callback( elems[ i ], i );
-			if ( callbackInverse !== callbackExpect ) {
-				matches.push( elems[ i ] );
-			}
-		}
-
-		return matches;
-	},
-
-	// arg is for internal usage only
-	map: function( elems, callback, arg ) {
-		var value,
-			i = 0,
-			length = elems.length,
-			isArray = isArraylike( elems ),
-			ret = [];
-
-		// Go through the array, translating each of the items to their new values
-		if ( isArray ) {
-			for ( ; i < length; i++ ) {
-				value = callback( elems[ i ], i, arg );
-
-				if ( value != null ) {
-					ret.push( value );
-				}
-			}
-
-		// Go through every key on the object,
-		} else {
-			for ( i in elems ) {
-				value = callback( elems[ i ], i, arg );
-
-				if ( value != null ) {
-					ret.push( value );
-				}
-			}
-		}
-
-		// Flatten any nested arrays
-		return concat.apply( [], ret );
-	},
-
-	// A global GUID counter for objects
-	guid: 1,
-
-	// Bind a function to a context, optionally partially applying any
-	// arguments.
-	proxy: function( fn, context ) {
-		var tmp, args, proxy;
-
-		if ( typeof context === "string" ) {
-			tmp = fn[ context ];
-			context = fn;
-			fn = tmp;
-		}
-
-		// Quick check to determine if target is callable, in the spec
-		// this throws a TypeError, but we will just return undefined.
-		if ( !jQuery.isFunction( fn ) ) {
-			return undefined;
-		}
-
-		// Simulated bind
-		args = slice.call( arguments, 2 );
-		proxy = function() {
-			return fn.apply( context || this, args.concat( slice.call( arguments ) ) );
-		};
-
-		// Set the guid of unique handler to the same of original handler, so it can be removed
-		proxy.guid = fn.guid = fn.guid || jQuery.guid++;
-
-		return proxy;
-	},
-
-	now: Date.now,
-
-	// jQuery.support is not used in Core but other projects attach their
-	// properties to it so it needs to exist.
-	support: support
-});
-
-// Populate the class2type map
-jQuery.each("Boolean Number String Function Array Date RegExp Object Error".split(" "), function(i, name) {
-	class2type[ "[object " + name + "]" ] = name.toLowerCase();
-});
-
-function isArraylike( obj ) {
-
-	// Support: iOS 8.2 (not reproducible in simulator)
-	// `in` check used to prevent JIT error (gh-2145)
-	// hasOwn isn't used here due to false negatives
-	// regarding Nodelist length in IE
-	var length = "length" in obj && obj.length,
-		type = jQuery.type( obj );
-
-	if ( type === "function" || jQuery.isWindow( obj ) ) {
-		return false;
-	}
-
-	if ( obj.nodeType === 1 && length ) {
-		return true;
-	}
-
-	return type === "array" || length === 0 ||
-		typeof length === "number" && length > 0 && ( length - 1 ) in obj;
-}
-var Sizzle =
-/*!
- * Sizzle CSS Selector Engine v2.2.0-pre
- * http://sizzlejs.com/
- *
- * Copyright 2008, 2014 jQuery Foundation, Inc. and other contributors
- * Released under the MIT license
- * http://jquery.org/license
- *
- * Date: 2014-12-16
- */
-(function( window ) {
-
-var i,
-	support,
-	Expr,
-	getText,
-	isXML,
-	tokenize,
-	compile,
-	select,
-	outermostContext,
-	sortInput,
-	hasDuplicate,
-
-	// Local document vars
-	setDocument,
-	document,
-	docElem,
-	documentIsHTML,
-	rbuggyQSA,
-	rbuggyMatches,
-	matches,
-	contains,
-
-	// Instance-specific data
-	expando = "sizzle" + 1 * new Date(),
-	preferredDoc = window.document,
-	dirruns = 0,
-	done = 0,
-	classCache = createCache(),
-	tokenCache = createCache(),
-	compilerCache = createCache(),
-	sortOrder = function( a, b ) {
-		if ( a === b ) {
-			hasDuplicate = true;
-		}
-		return 0;
-	},
-
-	// General-purpose constants
-	MAX_NEGATIVE = 1 << 31,
-
-	// Instance methods
-	hasOwn = ({}).hasOwnProperty,
-	arr = [],
-	pop = arr.pop,
-	push_native = arr.push,
-	push = arr.push,
-	slice = arr.slice,
-	// Use a stripped-down indexOf as it's faster than native
-	// http://jsperf.com/thor-indexof-vs-for/5
-	indexOf = function( list, elem ) {
-		var i = 0,
-			len = list.length;
-		for ( ; i < len; i++ ) {
-			if ( list[i] === elem ) {
-				return i;
-			}
-		}
-		return -1;
-	},
-
-	booleans = "checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",
-
-	// Regular expressions
-
-	// Whitespace characters http://www.w3.org/TR/css3-selectors/#whitespace
-	whitespace = "[\\x20\\t\\r\\n\\f]",
-	// http://www.w3.org/TR/css3-syntax/#characters
-	characterEncoding = "(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",
-
-	// Loosely modeled on CSS identifier characters
-	// An unquoted value should be a CSS identifier http://www.w3.org/TR/css3-selectors/#attribute-selectors
-	// Proper syntax: http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier
-	identifier = characterEncoding.replace( "w", "w#" ),
-
-	// Attribute selectors: http://www.w3.org/TR/selectors/#attribute-selectors
-	attributes = "\\[" + whitespace + "*(" + characterEncoding + ")(?:" + whitespace +
-		// Operator (capture 2)
-		"*([*^$|!~]?=)" + whitespace +
-		// "Attribute values must be CSS identifiers [capture 5] or strings [capture 3 or capture 4]"
-		"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|(" + identifier + "))|)" + whitespace +
-		"*\\]",
-
-	pseudos = ":(" + characterEncoding + ")(?:\\((" +
-		// To reduce the number of selectors needing tokenize in the preFilter, prefer arguments:
-		// 1. quoted (capture 3; capture 4 or capture 5)
-		"('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|" +
-		// 2. simple (capture 6)
-		"((?:\\\\.|[^\\\\()[\\]]|" + attributes + ")*)|" +
-		// 3. anything else (capture 2)
-		".*" +
-		")\\)|)",
-
-	// Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter
-	rwhitespace = new RegExp( whitespace + "+", "g" ),
-	rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + whitespace + "+$", "g" ),
-
-	rcomma = new RegExp( "^" + whitespace + "*," + whitespace + "*" ),
-	rcombinators = new RegExp( "^" + whitespace + "*([>+~]|" + whitespace + ")" + whitespace + "*" ),
-
-	rattributeQuotes = new RegExp( "=" + whitespace + "*([^\\]'\"]*?)" + whitespace + "*\\]", "g" ),
-
-	rpseudo = new RegExp( pseudos ),
-	ridentifier = new RegExp( "^" + identifier + "$" ),
-
-	matchExpr = {
-		"ID": new RegExp( "^#(" + characterEncoding + ")" ),
-		"CLASS": new RegExp( "^\\.(" + characterEncoding + ")" ),
-		"TAG": new RegExp( "^(" + characterEncoding.replace( "w", "w*" ) + ")" ),
-		"ATTR": new RegExp( "^" + attributes ),
-		"PSEUDO": new RegExp( "^" + pseudos ),
-		"CHILD": new RegExp( "^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" + whitespace +
-			"*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" + whitespace +
-			"*(\\d+)|))" + whitespace + "*\\)|)", "i" ),
-		"bool": new RegExp( "^(?:" + booleans + ")$", "i" ),
-		// For use in libraries implementing .is()
-		// We use this for POS matching in `select`
-		"needsContext": new RegExp( "^" + whitespace + "*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" +
-			whitespace + "*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)", "i" )
-	},
-
-	rinputs = /^(?:input|select|textarea|button)$/i,
-	rheader = /^h\d$/i,
-
-	rnative = /^[^{]+\{\s*\[native \w/,
-
-	// Easily-parseable/retrievable ID or TAG or CLASS selectors
-	rquickExpr = /^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,
-
-	rsibling = /[+~]/,
-	rescape = /'|\\/g,
-
-	// CSS escapes http://www.w3.org/TR/CSS21/syndata.html#escaped-characters
-	runescape = new RegExp( "\\\\([\\da-f]{1,6}" + whitespace + "?|(" + whitespace + ")|.)", "ig" ),
-	funescape = function( _, escaped, escapedWhitespace ) {
-		var high = "0x" + escaped - 0x10000;
-		// NaN means non-codepoint
-		// Support: Firefox<24
-		// Workaround erroneous numeric interpretation of +"0x"
-		return high !== high || escapedWhitespace ?
-			escaped :
-			high < 0 ?
-				// BMP codepoint
-				String.fromCharCode( high + 0x10000 ) :
-				// Supplemental Plane codepoint (surrogate pair)
-				String.fromCharCode( high >> 10 | 0xD800, high & 0x3FF | 0xDC00 );
-	},
-
-	// Used for iframes
-	// See setDocument()
-	// Removing the function wrapper causes a "Permission Denied"
-	// error in IE
-	unloadHandler = function() {
-		setDocument();
-	};
-
-// Optimize for push.apply( _, NodeList )
-try {
-	push.apply(
-		(arr = slice.call( preferredDoc.childNodes )),
-		preferredDoc.childNodes
-	);
-	// Support: Android<4.0
-	// Detect silently failing push.apply
-	arr[ preferredDoc.childNodes.length ].nodeType;
-} catch ( e ) {
-	push = { apply: arr.length ?
-
-		// Leverage slice if possible
-		function( target, els ) {
-			push_native.apply( target, slice.call(els) );
-		} :
-
-		// Support: IE<9
-		// Otherwise append directly
-		function( target, els ) {
-			var j = target.length,
-				i = 0;
-			// Can't trust NodeList.length
-			while ( (target[j++] = els[i++]) ) {}
-			target.length = j - 1;
-		}
-	};
-}
-
-function Sizzle( selector, context, results, seed ) {
-	var match, elem, m, nodeType,
-		// QSA vars
-		i, groups, old, nid, newContext, newSelector;
-
-	if ( ( context ? context.ownerDocument || context : preferredDoc ) !== document ) {
-		setDocument( context );
-	}
-
-	context = context || document;
-	results = results || [];
-	nodeType = context.nodeType;
-
-	if ( typeof selector !== "string" || !selector ||
-		nodeType !== 1 && nodeType !== 9 && nodeType !== 11 ) {
-
-		return results;
-	}
-
-	if ( !seed && documentIsHTML ) {
-
-		// Try to shortcut find operations when possible (e.g., not under DocumentFragment)
-		if ( nodeType !== 11 && (match = rquickExpr.exec( selector )) ) {
-			// Speed-up: Sizzle("#ID")
-			if ( (m = match[1]) ) {
-				if ( nodeType === 9 ) {
-					elem = context.getElementById( m );
-					// Check parentNode to catch when Blackberry 4.6 returns
-					// nodes that are no longer in the document (jQuery #6963)
-					if ( elem && elem.parentNode ) {
-						// Handle the case where IE, Opera, and Webkit return items
-						// by name instead of ID
-						if ( elem.id === m ) {
-							results.push( elem );
-							return results;
-						}
-					} else {
-						return results;
-					}
-				} else {
-					// Context is not a document
-					if ( context.ownerDocument && (elem = context.ownerDocument.getElementById( m )) &&
-						contains( context, elem ) && elem.id === m ) {
-						results.push( elem );
-						return results;
-					}
-				}
-
-			// Speed-up: Sizzle("TAG")
-			} else if ( match[2] ) {
-				push.apply( results, context.getElementsByTagName( selector ) );
-				return results;
-
-			// Speed-up: Sizzle(".CLASS")
-			} else if ( (m = match[3]) && support.getElementsByClassName ) {
-				push.apply( results, context.getElementsByClassName( m ) );
-				return results;
-			}
-		}
-
-		// QSA path
-		if ( support.qsa && (!rbuggyQSA || !rbuggyQSA.test( selector )) ) {
-			nid = old = expando;
-			newContext = context;
-			newSelector = nodeType !== 1 && selector;
-
-			// qSA works strangely on Element-rooted queries
-			// We can work around this by specifying an extra ID on the root
-			// and working up from there (Thanks to Andrew Dupont for the technique)
-			// IE 8 doesn't work on object elements
-			if ( nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) {
-				groups = tokenize( selector );
-
-				if ( (old = context.getAttribute("id")) ) {
-					nid = old.replace( rescape, "\\$&" );
-				} else {
-					context.setAttribute( "id", nid );
-				}
-				nid = "[id='" + nid + "'] ";
-
-				i = groups.length;
-				while ( i-- ) {
-					groups[i] = nid + toSelector( groups[i] );
-				}
-				newContext = rsibling.test( selector ) && testContext( context.parentNode ) || context;
-				newSelector = groups.join(",");
-			}
-
-			if ( newSelector ) {
-				try {
-					push.apply( results,
-						newContext.querySelectorAll( newSelector )
-					);
-					return results;
-				} catch(qsaError) {
-				} finally {
-					if ( !old ) {
-						context.removeAttribute("id");
-					}
-				}
-			}
-		}
-	}
-
-	// All others
-	return select( selector.replace( rtrim, "$1" ), context, results, seed );
-}
-
-/**
- * Create key-value caches of limited size
- * @returns {Function(string, Object)} Returns the Object data after storing it on itself with
- *	property name the (space-suffixed) string and (if the cache is larger than Expr.cacheLength)
- *	deleting the oldest entry
- */
-function createCache() {
-	var keys = [];
-
-	function cache( key, value ) {
-		// Use (key + " ") to avoid collision with native prototype properties (see Issue #157)
-		if ( keys.push( key + " " ) > Expr.cacheLength ) {
-			// Only keep the most recent entries
-			delete cache[ keys.shift() ];
-		}
-		return (cache[ key + " " ] = value);
-	}
-	return cache;
-}
-
-/**
- * Mark a function for special use by Sizzle
- * @param {Function} fn The function to mark
- */
-function markFunction( fn ) {
-	fn[ expando ] = true;
-	return fn;
-}
-
-/**
- * Support testing using an element
- * @param {Function} fn Passed the created div and expects a boolean result
- */
-function assert( fn ) {
-	var div = document.createElement("div");
-
-	try {
-		return !!fn( div );
-	} catch (e) {
-		return false;
-	} finally {
-		// Remove from its parent by default
-		if ( div.parentNode ) {
-			div.parentNode.removeChild( div );
-		}
-		// release memory in IE
-		div = null;
-	}
-}
-
-/**
- * Adds the same handler for all of the specified attrs
- * @param {String} attrs Pipe-separated list of attributes
- * @param {Function} handler The method that will be applied
- */
-function addHandle( attrs, handler ) {
-	var arr = attrs.split("|"),
-		i = attrs.length;
-
-	while ( i-- ) {
-		Expr.attrHandle[ arr[i] ] = handler;
-	}
-}
-
-/**
- * Checks document order of two siblings
- * @param {Element} a
- * @param {Element} b
- * @returns {Number} Returns less than 0 if a precedes b, greater than 0 if a follows b
- */
-function siblingCheck( a, b ) {
-	var cur = b && a,
-		diff = cur && a.nodeType === 1 && b.nodeType === 1 &&
-			( ~b.sourceIndex || MAX_NEGATIVE ) -
-			( ~a.sourceIndex || MAX_NEGATIVE );
-
-	// Use IE sourceIndex if available on both nodes
-	if ( diff ) {
-		return diff;
-	}
-
-	// Check if b follows a
-	if ( cur ) {
-		while ( (cur = cur.nextSibling) ) {
-			if ( cur === b ) {
-				return -1;
-			}
-		}
-	}
-
-	return a ? 1 : -1;
-}
-
-/**
- * Returns a function to use in pseudos for input types
- * @param {String} type
- */
-function createInputPseudo( type ) {
-	return function( elem ) {
-		var name = elem.nodeName.toLowerCase();
-		return name === "input" && elem.type === type;
-	};
-}
-
-/**
- * Returns a function to use in pseudos for buttons
- * @param {String} type
- */
-function createButtonPseudo( type ) {
-	return function( elem ) {
-		var name = elem.nodeName.toLowerCase();
-		return (name === "input" || name === "button") && elem.type === type;
-	};
-}
-
-/**
- * Returns a function to use in pseudos for positionals
- * @param {Function} fn
- */
-function createPositionalPseudo( fn ) {
-	return markFunction(function( argument ) {
-		argument = +argument;
-		return markFunction(function( seed, matches ) {
-			var j,
-				matchIndexes = fn( [], seed.length, argument ),
-				i = matchIndexes.length;
-
-			// Match elements found at the specified indexes
-			while ( i-- ) {
-				if ( seed[ (j = matchIndexes[i]) ] ) {
-					seed[j] = !(matches[j] = seed[j]);
-				}
-			}
-		});
-	});
-}
-
-/**
- * Checks a node for validity as a Sizzle context
- * @param {Element|Object=} context
- * @returns {Element|Object|Boolean} The input node if acceptable, otherwise a falsy value
- */
-function testContext( context ) {
-	return context && typeof context.getElementsByTagName !== "undefined" && context;
-}
-
-// Expose support vars for convenience
-support = Sizzle.support = {};
-
-/**
- * Detects XML nodes
- * @param {Element|Object} elem An element or a document
- * @returns {Boolean} True iff elem is a non-HTML XML node
- */
-isXML = Sizzle.isXML = function( elem ) {
-	// documentElement is verified for cases where it doesn't yet exist
-	// (such as loading iframes in IE - #4833)
-	var documentElement = elem && (elem.ownerDocument || elem).documentElement;
-	return documentElement ? documentElement.nodeName !== "HTML" : false;
-};
-
-/**
- * Sets document-related variables once based on the current document
- * @param {Element|Object} [doc] An element or document object to use to set the document
- * @returns {Object} Returns the current document
- */
-setDocument = Sizzle.setDocument = function( node ) {
-	var hasCompare, parent,
-		doc = node ? node.ownerDocument || node : preferredDoc;
-
-	// If no document and documentElement is available, return
-	if ( doc === document || doc.nodeType !== 9 || !doc.documentElement ) {
-		return document;
-	}
-
-	// Set our document
-	document = doc;
-	docElem = doc.documentElement;
-	parent = doc.defaultView;
-
-	// Support: IE>8
-	// If iframe document is assigned to "document" variable and if iframe has been reloaded,
-	// IE will throw "permission denied" error when accessing "document" variable, see jQuery #13936
-	// IE6-8 do not support the defaultView property so parent will be undefined
-	if ( parent && parent !== parent.top ) {
-		// IE11 does not have attachEvent, so all must suffer
-		if ( parent.addEventListener ) {
-			parent.addEventListener( "unload", unloadHandler, false );
-		} else if ( parent.attachEvent ) {
-			parent.attachEvent( "onunload", unloadHandler );
-		}
-	}
-
-	/* Support tests
-	---------------------------------------------------------------------- */
-	documentIsHTML = !isXML( doc );
-
-	/* Attributes
-	---------------------------------------------------------------------- */
-
-	// Support: IE<8
-	// Verify that getAttribute really returns attributes and not properties
-	// (excepting IE8 booleans)
-	support.attributes = assert(function( div ) {
-		div.className = "i";
-		return !div.getAttribute("className");
-	});
-
-	/* getElement(s)By*
-	---------------------------------------------------------------------- */
-
-	// Check if getElementsByTagName("*") returns only elements
-	support.getElementsByTagName = assert(function( div ) {
-		div.appendChild( doc.createComment("") );
-		return !div.getElementsByTagName("*").length;
-	});
-
-	// Support: IE<9
-	support.getElementsByClassName = rnative.test( doc.getElementsByClassName );
-
-	// Support: IE<10
-	// Check if getElementById returns elements by name
-	// The broken getElementById methods don't pick up programatically-set names,
-	// so use a roundabout getElementsByName test
-	support.getById = assert(function( div ) {
-		docElem.appendChild( div ).id = expando;
-		return !doc.getElementsByName || !doc.getElementsByName( expando ).length;
-	});
-
-	// ID find and filter
-	if ( support.getById ) {
-		Expr.find["ID"] = function( id, context ) {
-			if ( typeof context.getElementById !== "undefined" && documentIsHTML ) {
-				var m = context.getElementById( id );
-				// Check parentNode to catch when Blackberry 4.6 returns
-				// nodes that are no longer in the document #6963
-				return m && m.parentNode ? [ m ] : [];
-			}
-		};
-		Expr.filter["ID"] = function( id ) {
-			var attrId = id.replace( runescape, funescape );
-			return function( elem ) {
-				return elem.getAttribute("id") === attrId;
-			};
-		};
-	} else {
-		// Support: IE6/7
-		// getElementById is not reliable as a find shortcut
-		delete Expr.find["ID"];
-
-		Expr.filter["ID"] =  function( id ) {
-			var attrId = id.replace( runescape, funescape );
-			return function( elem ) {
-				var node = typeof elem.getAttributeNode !== "undefined" && elem.getAttributeNode("id");
-				return node && node.value === attrId;
-			};
-		};
-	}
-
-	// Tag
-	Expr.find["TAG"] = support.getElementsByTagName ?
-		function( tag, context ) {
-			if ( typeof context.getElementsByTagName !== "undefined" ) {
-				return context.getElementsByTagName( tag );
-
-			// DocumentFragment nodes don't have gEBTN
-			} else if ( support.qsa ) {
-				return context.querySelectorAll( tag );
-			}
-		} :
-
-		function( tag, context ) {
-			var elem,
-				tmp = [],
-				i = 0,
-				// By happy coincidence, a (broken) gEBTN appears on DocumentFragment nodes too
-				results = context.getElementsByTagName( tag );
-
-			// Filter out possible comments
-			if ( tag === "*" ) {
-				while ( (elem = results[i++]) ) {
-					if ( elem.nodeType === 1 ) {
-						tmp.push( elem );
-					}
-				}
-
-				return tmp;
-			}
-			return results;
-		};
-
-	// Class
-	Expr.find["CLASS"] = support.getElementsByClassName && function( className, context ) {
-		if ( documentIsHTML ) {
-			return context.getElementsByClassName( className );
-		}
-	};
-
-	/* QSA/matchesSelector
-	---------------------------------------------------------------------- */
-
-	// QSA and matchesSelector support
-
-	// matchesSelector(:active) reports false when true (IE9/Opera 11.5)
-	rbuggyMatches = [];
-
-	// qSa(:focus) reports false when true (Chrome 21)
-	// We allow this because of a bug in IE8/9 that throws an error
-	// whenever `document.activeElement` is accessed on an iframe
-	// So, we allow :focus to pass through QSA all the time to avoid the IE error
-	// See http://bugs.jquery.com/ticket/13378
-	rbuggyQSA = [];
-
-	if ( (support.qsa = rnative.test( doc.querySelectorAll )) ) {
-		// Build QSA regex
-		// Regex strategy adopted from Diego Perini
-		assert(function( div ) {
-			// Select is set to empty string on purpose
-			// This is to test IE's treatment of not explicitly
-			// setting a boolean content attribute,
-			// since its presence should be enough
-			// http://bugs.jquery.com/ticket/12359
-			docElem.appendChild( div ).innerHTML = "<a id='" + expando + "'></a>" +
-				"<select id='" + expando + "-\f]' msallowcapture=''>" +
-				"<option selected=''></option></select>";
-
-			// Support: IE8, Opera 11-12.16
-			// Nothing should be selected when empty strings follow ^= or $= or *=
-			// The test attribute must be unknown in Opera but "safe" for WinRT
-			// http://msdn.microsoft.com/en-us/library/ie/hh465388.aspx#attribute_section
-			if ( div.querySelectorAll("[msallowcapture^='']").length ) {
-				rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:''|\"\")" );
-			}
-
-			// Support: IE8
-			// Boolean attributes and "value" are not treated correctly
-			if ( !div.querySelectorAll("[selected]").length ) {
-				rbuggyQSA.push( "\\[" + whitespace + "*(?:value|" + booleans + ")" );
-			}
-
-			// Support: Chrome<29, Android<4.2+, Safari<7.0+, iOS<7.0+, PhantomJS<1.9.7+
-			if ( !div.querySelectorAll( "[id~=" + expando + "-]" ).length ) {
-				rbuggyQSA.push("~=");
-			}
-
-			// Webkit/Opera - :checked should return selected option elements
-			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
-			// IE8 throws error here and will not see later tests
-			if ( !div.querySelectorAll(":checked").length ) {
-				rbuggyQSA.push(":checked");
-			}
-
-			// Support: Safari 8+, iOS 8+
-			// https://bugs.webkit.org/show_bug.cgi?id=136851
-			// In-page `selector#id sibing-combinator selector` fails
-			if ( !div.querySelectorAll( "a#" + expando + "+*" ).length ) {
-				rbuggyQSA.push(".#.+[+~]");
-			}
-		});
-
-		assert(function( div ) {
-			// Support: Windows 8 Native Apps
-			// The type and name attributes are restricted during .innerHTML assignment
-			var input = doc.createElement("input");
-			input.setAttribute( "type", "hidden" );
-			div.appendChild( input ).setAttribute( "name", "D" );
-
-			// Support: IE8
-			// Enforce case-sensitivity of name attribute
-			if ( div.querySelectorAll("[name=d]").length ) {
-				rbuggyQSA.push( "name" + whitespace + "*[*^$|!~]?=" );
-			}
-
-			// FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled)
-			// IE8 throws error here and will not see later tests
-			if ( !div.querySelectorAll(":enabled").length ) {
-				rbuggyQSA.push( ":enabled", ":disabled" );
-			}
-
-			// Opera 10-11 does not throw on post-comma invalid pseudos
-			div.querySelectorAll("*,:x");
-			rbuggyQSA.push(",.*:");
-		});
-	}
-
-	if ( (support.matchesSelector = rnative.test( (matches = docElem.matches ||
-		docElem.webkitMatchesSelector ||
-		docElem.mozMatchesSelector ||
-		docElem.oMatchesSelector ||
-		docElem.msMatchesSelector) )) ) {
-
-		assert(function( div ) {
-			// Check to see if it's possible to do matchesSelector
-			// on a disconnected node (IE 9)
-			support.disconnectedMatch = matches.call( div, "div" );
-
-			// This should fail with an exception
-			// Gecko does not error, returns false instead
-			matches.call( div, "[s!='']:x" );
-			rbuggyMatches.push( "!=", pseudos );
-		});
-	}
-
-	rbuggyQSA = rbuggyQSA.length && new RegExp( rbuggyQSA.join("|") );
-	rbuggyMatches = rbuggyMatches.length && new RegExp( rbuggyMatches.join("|") );
-
-	/* Contains
-	---------------------------------------------------------------------- */
-	hasCompare = rnative.test( docElem.compareDocumentPosition );
-
-	// Element contains another
-	// Purposefully does not implement inclusive descendent
-	// As in, an element does not contain itself
-	contains = hasCompare || rnative.test( docElem.contains ) ?
-		function( a, b ) {
-			var adown = a.nodeType === 9 ? a.documentElement : a,
-				bup = b && b.parentNode;
-			return a === bup || !!( bup && bup.nodeType === 1 && (
-				adown.contains ?
-					adown.contains( bup ) :
-					a.compareDocumentPosition && a.compareDocumentPosition( bup ) & 16
-			));
-		} :
-		function( a, b ) {
-			if ( b ) {
-				while ( (b = b.parentNode) ) {
-					if ( b === a ) {
-						return true;
-					}
-				}
-			}
-			return false;
-		};
-
-	/* Sorting
-	---------------------------------------------------------------------- */
-
-	// Document order sorting
-	sortOrder = hasCompare ?
-	function( a, b ) {
-
-		// Flag for duplicate removal
-		if ( a === b ) {
-			hasDuplicate = true;
-			return 0;
-		}
-
-		// Sort on method existence if only one input has compareDocumentPosition
-		var compare = !a.compareDocumentPosition - !b.compareDocumentPosition;
-		if ( compare ) {
-			return compare;
-		}
-
-		// Calculate position if both inputs belong to the same document
-		compare = ( a.ownerDocument || a ) === ( b.ownerDocument || b ) ?
-			a.compareDocumentPosition( b ) :
-
-			// Otherwise we know they are disconnected
-			1;
-
-		// Disconnected nodes
-		if ( compare & 1 ||
-			(!support.sortDetached && b.compareDocumentPosition( a ) === compare) ) {
-
-			// Choose the first element that is related to our preferred document
-			if ( a === doc || a.ownerDocument === preferredDoc && contains(preferredDoc, a) ) {
-				return -1;
-			}
-			if ( b === doc || b.ownerDocument === preferredDoc && contains(preferredDoc, b) ) {
-				return 1;
-			}
-
-			// Maintain original order
-			return sortInput ?
-				( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) :
-				0;
-		}
-
-		return compare & 4 ? -1 : 1;
-	} :
-	function( a, b ) {
-		// Exit early if the nodes are identical
-		if ( a === b ) {
-			hasDuplicate = true;
-			return 0;
-		}
-
-		var cur,
-			i = 0,
-			aup = a.parentNode,
-			bup = b.parentNode,
-			ap = [ a ],
-			bp = [ b ];
-
-		// Parentless nodes are either documents or disconnected
-		if ( !aup || !bup ) {
-			return a === doc ? -1 :
-				b === doc ? 1 :
-				aup ? -1 :
-				bup ? 1 :
-				sortInput ?
-				( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) :
-				0;
-
-		// If the nodes are siblings, we can do a quick check
-		} else if ( aup === bup ) {
-			return siblingCheck( a, b );
-		}
-
-		// Otherwise we need full lists of their ancestors for comparison
-		cur = a;
-		while ( (cur = cur.parentNode) ) {
-			ap.unshift( cur );
-		}
-		cur = b;
-		while ( (cur = cur.parentNode) ) {
-			bp.unshift( cur );
-		}
-
-		// Walk down the tree looking for a discrepancy
-		while ( ap[i] === bp[i] ) {
-			i++;
-		}
-
-		return i ?
-			// Do a sibling check if the nodes have a common ancestor
-			siblingCheck( ap[i], bp[i] ) :
-
-			// Otherwise nodes in our document sort first
-			ap[i] === preferredDoc ? -1 :
-			bp[i] === preferredDoc ? 1 :
-			0;
-	};
-
-	return doc;
-};
-
-Sizzle.matches = function( expr, elements ) {
-	return Sizzle( expr, null, null, elements );
-};
-
-Sizzle.matchesSelector = function( elem, expr ) {
-	// Set document vars if needed
-	if ( ( elem.ownerDocument || elem ) !== document ) {
-		setDocument( elem );
-	}
-
-	// Make sure that attribute selectors are quoted
-	expr = expr.replace( rattributeQuotes, "='$1']" );
-
-	if ( support.matchesSelector && documentIsHTML &&
-		( !rbuggyMatches || !rbuggyMatches.test( expr ) ) &&
-		( !rbuggyQSA     || !rbuggyQSA.test( expr ) ) ) {
-
-		try {
-			var ret = matches.call( elem, expr );
-
-			// IE 9's matchesSelector returns false on disconnected nodes
-			if ( ret || support.disconnectedMatch ||
-					// As well, disconnected nodes are said to be in a document
-					// fragment in IE 9
-					elem.document && elem.document.nodeType !== 11 ) {
-				return ret;
-			}
-		} catch (e) {}
-	}
-
-	return Sizzle( expr, document, null, [ elem ] ).length > 0;
-};
-
-Sizzle.contains = function( context, elem ) {
-	// Set document vars if needed
-	if ( ( context.ownerDocument || context ) !== document ) {
-		setDocument( context );
-	}
-	return contains( context, elem );
-};
-
-Sizzle.attr = function( elem, name ) {
-	// Set document vars if needed
-	if ( ( elem.ownerDocument || elem ) !== document ) {
-		setDocument( elem );
-	}
-
-	var fn = Expr.attrHandle[ name.toLowerCase() ],
-		// Don't get fooled by Object.prototype properties (jQuery #13807)
-		val = fn && hasOwn.call( Expr.attrHandle, name.toLowerCase() ) ?
-			fn( elem, name, !documentIsHTML ) :
-			undefined;
-
-	return val !== undefined ?
-		val :
-		support.attributes || !documentIsHTML ?
-			elem.getAttribute( name ) :
-			(val = elem.getAttributeNode(name)) && val.specified ?
-				val.value :
-				null;
-};
-
-Sizzle.error = function( msg ) {
-	throw new Error( "Syntax error, unrecognized expression: " + msg );
-};
-
-/**
- * Document sorting and removing duplicates
- * @param {ArrayLike} results
- */
-Sizzle.uniqueSort = function( results ) {
-	var elem,
-		duplicates = [],
-		j = 0,
-		i = 0;
-
-	// Unless we *know* we can detect duplicates, assume their presence
-	hasDuplicate = !support.detectDuplicates;
-	sortInput = !support.sortStable && results.slice( 0 );
-	results.sort( sortOrder );
-
-	if ( hasDuplicate ) {
-		while ( (elem = results[i++]) ) {
-			if ( elem === results[ i ] ) {
-				j = duplicates.push( i );
-			}
-		}
-		while ( j-- ) {
-			results.splice( duplicates[ j ], 1 );
-		}
-	}
-
-	// Clear input after sorting to release objects
-	// See https://github.com/jquery/sizzle/pull/225
-	sortInput = null;
-
-	return results;
-};
-
-/**
- * Utility function for retrieving the text value of an array of DOM nodes
- * @param {Array|Element} elem
- */
-getText = Sizzle.getText = function( elem ) {
-	var node,
-		ret = "",
-		i = 0,
-		nodeType = elem.nodeType;
-
-	if ( !nodeType ) {
-		// If no nodeType, this is expected to be an array
-		while ( (node = elem[i++]) ) {
-			// Do not traverse comment nodes
-			ret += getText( node );
-		}
-	} else if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) {
-		// Use textContent for elements
-		// innerText usage removed for consistency of new lines (jQuery #11153)
-		if ( typeof elem.textContent === "string" ) {
-			return elem.textContent;
-		} else {
-			// Traverse its children
-			for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
-				ret += getText( elem );
-			}
-		}
-	} else if ( nodeType === 3 || nodeType === 4 ) {
-		return elem.nodeValue;
-	}
-	// Do not include comment or processing instruction nodes
-
-	return ret;
-};
-
-Expr = Sizzle.selectors = {
-
-	// Can be adjusted by the user
-	cacheLength: 50,
-
-	createPseudo: markFunction,
-
-	match: matchExpr,
-
-	attrHandle: {},
-
-	find: {},
-
-	relative: {
-		">": { dir: "parentNode", first: true },
-		" ": { dir: "parentNode" },
-		"+": { dir: "previousSibling", first: true },
-		"~": { dir: "previousSibling" }
-	},
-
-	preFilter: {
-		"ATTR": function( match ) {
-			match[1] = match[1].replace( runescape, funescape );
-
-			// Move the given value to match[3] whether quoted or unquoted
-			match[3] = ( match[3] || match[4] || match[5] || "" ).replace( runescape, funescape );
-
-			if ( match[2] === "~=" ) {
-				match[3] = " " + match[3] + " ";
-			}
-
-			return match.slice( 0, 4 );
-		},
-
-		"CHILD": function( match ) {
-			/* matches from matchExpr["CHILD"]
-				1 type (only|nth|...)
-				2 what (child|of-type)
-				3 argument (even|odd|\d*|\d*n([+-]\d+)?|...)
-				4 xn-component of xn+y argument ([+-]?\d*n|)
-				5 sign of xn-component
-				6 x of xn-component
-				7 sign of y-component
-				8 y of y-component
-			*/
-			match[1] = match[1].toLowerCase();
-
-			if ( match[1].slice( 0, 3 ) === "nth" ) {
-				// nth-* requires argument
-				if ( !match[3] ) {
-					Sizzle.error( match[0] );
-				}
-
-				// numeric x and y parameters for Expr.filter.CHILD
-				// remember that false/true cast respectively to 0/1
-				match[4] = +( match[4] ? match[5] + (match[6] || 1) : 2 * ( match[3] === "even" || match[3] === "odd" ) );
-				match[5] = +( ( match[7] + match[8] ) || match[3] === "odd" );
-
-			// other types prohibit arguments
-			} else if ( match[3] ) {
-				Sizzle.error( match[0] );
-			}
-
-			return match;
-		},
-
-		"PSEUDO": function( match ) {
-			var excess,
-				unquoted = !match[6] && match[2];
-
-			if ( matchExpr["CHILD"].test( match[0] ) ) {
-				return null;
-			}
-
-			// Accept quoted arguments as-is
-			if ( match[3] ) {
-				match[2] = match[4] || match[5] || "";
-
-			// Strip excess characters from unquoted arguments
-			} else if ( unquoted && rpseudo.test( unquoted ) &&
-				// Get excess from tokenize (recursively)
-				(excess = tokenize( unquoted, true )) &&
-				// advance to the next closing parenthesis
-				(excess = unquoted.indexOf( ")", unquoted.length - excess ) - unquoted.length) ) {
-
-				// excess is a negative index
-				match[0] = match[0].slice( 0, excess );
-				match[2] = unquoted.slice( 0, excess );
-			}
-
-			// Return only captures needed by the pseudo filter method (type and argument)
-			return match.slice( 0, 3 );
-		}
-	},
-
-	filter: {
-
-		"TAG": function( nodeNameSelector ) {
-			var nodeName = nodeNameSelector.replace( runescape, funescape ).toLowerCase();
-			return nodeNameSelector === "*" ?
-				function() { return true; } :
-				function( elem ) {
-					return elem.nodeName && elem.nodeName.toLowerCase() === nodeName;
-				};
-		},
-
-		"CLASS": function( className ) {
-			var pattern = classCache[ className + " " ];
-
-			return pattern ||
-				(pattern = new RegExp( "(^|" + whitespace + ")" + className + "(" + whitespace + "|$)" )) &&
-				classCache( className, function( elem ) {
-					return pattern.test( typeof elem.className === "string" && elem.className || typeof elem.getAttribute !== "undefined" && elem.getAttribute("class") || "" );
-				});
-		},
-
-		"ATTR": function( name, operator, check ) {
-			return function( elem ) {
-				var result = Sizzle.attr( elem, name );
-
-				if ( result == null ) {
-					return operator === "!=";
-				}
-				if ( !operator ) {
-					return true;
-				}
-
-				result += "";
-
-				return operator === "=" ? result === check :
-					operator === "!=" ? result !== check :
-					operator === "^=" ? check && result.indexOf( check ) === 0 :
-					operator === "*=" ? check && result.indexOf( check ) > -1 :
-					operator === "$=" ? check && result.slice( -check.length ) === check :
-					operator === "~=" ? ( " " + result.replace( rwhitespace, " " ) + " " ).indexOf( check ) > -1 :
-					operator === "|=" ? result === check || result.slice( 0, check.length + 1 ) === check + "-" :
-					false;
-			};
-		},
-
-		"CHILD": function( type, what, argument, first, last ) {
-			var simple = type.slice( 0, 3 ) !== "nth",
-				forward = type.slice( -4 ) !== "last",
-				ofType = what === "of-type";
-
-			return first === 1 && last === 0 ?
-
-				// Shortcut for :nth-*(n)
-				function( elem ) {
-					return !!elem.parentNode;
-				} :
-
-				function( elem, context, xml ) {
-					var cache, outerCache, node, diff, nodeIndex, start,
-						dir = simple !== forward ? "nextSibling" : "previousSibling",
-						parent = elem.parentNode,
-						name = ofType && elem.nodeName.toLowerCase(),
-						useCache = !xml && !ofType;
-
-					if ( parent ) {
-
-						// :(first|last|only)-(child|of-type)
-						if ( simple ) {
-							while ( dir ) {
-								node = elem;
-								while ( (node = node[ dir ]) ) {
-									if ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) {
-										return false;
-									}
-								}
-								// Reverse direction for :only-* (if we haven't yet done so)
-								start = dir = type === "only" && !start && "nextSibling";
-							}
-							return true;
-						}
-
-						start = [ forward ? parent.firstChild : parent.lastChild ];
-
-						// non-xml :nth-child(...) stores cache data on `parent`
-						if ( forward && useCache ) {
-							// Seek `elem` from a previously-cached index
-							outerCache = parent[ expando ] || (parent[ expando ] = {});
-							cache = outerCache[ type ] || [];
-							nodeIndex = cache[0] === dirruns && cache[1];
-							diff = cache[0] === dirruns && cache[2];
-							node = nodeIndex && parent.childNodes[ nodeIndex ];
-
-							while ( (node = ++nodeIndex && node && node[ dir ] ||
-
-								// Fallback to seeking `elem` from the start
-								(diff = nodeIndex = 0) || start.pop()) ) {
-
-								// When found, cache indexes on `parent` and break
-								if ( node.nodeType === 1 && ++diff && node === elem ) {
-									outerCache[ type ] = [ dirruns, nodeIndex, diff ];
-									break;
-								}
-							}
-
-						// Use previously-cached element index if available
-						} else if ( useCache && (cache = (elem[ expando ] || (elem[ expando ] = {}))[ type ]) && cache[0] === dirruns ) {
-							diff = cache[1];
-
-						// xml :nth-child(...) or :nth-last-child(...) or :nth(-last)?-of-type(...)
-						} else {
-							// Use the same loop as above to seek `elem` from the start
-							while ( (node = ++nodeIndex && node && node[ dir ] ||
-								(diff = nodeIndex = 0) || start.pop()) ) {
-
-								if ( ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) && ++diff ) {
-									// Cache the index of each encountered element
-									if ( useCache ) {
-										(node[ expando ] || (node[ expando ] = {}))[ type ] = [ dirruns, diff ];
-									}
-
-									if ( node === elem ) {
-										break;
-									}
-								}
-							}
-						}
-
-						// Incorporate the offset, then check against cycle size
-						diff -= last;
-						return diff === first || ( diff % first === 0 && diff / first >= 0 );
-					}
-				};
-		},
-
-		"PSEUDO": function( pseudo, argument ) {
-			// pseudo-class names are case-insensitive
-			// http://www.w3.org/TR/selectors/#pseudo-classes
-			// Prioritize by case sensitivity in case custom pseudos are added with uppercase letters
-			// Remember that setFilters inherits from pseudos
-			var args,
-				fn = Expr.pseudos[ pseudo ] || Expr.setFilters[ pseudo.toLowerCase() ] ||
-					Sizzle.error( "unsupported pseudo: " + pseudo );
-
-			// The user may use createPseudo to indicate that
-			// arguments are needed to create the filter function
-			// just as Sizzle does
-			if ( fn[ expando ] ) {
-				return fn( argument );
-			}
-
-			// But maintain support for old signatures
-			if ( fn.length > 1 ) {
-				args = [ pseudo, pseudo, "", argument ];
-				return Expr.setFilters.hasOwnProperty( pseudo.toLowerCase() ) ?
-					markFunction(function( seed, matches ) {
-						var idx,
-							matched = fn( seed, argument ),
-							i = matched.length;
-						while ( i-- ) {
-							idx = indexOf( seed, matched[i] );
-							seed[ idx ] = !( matches[ idx ] = matched[i] );
-						}
-					}) :
-					function( elem ) {
-						return fn( elem, 0, args );
-					};
-			}
-
-			return fn;
-		}
-	},
-
-	pseudos: {
-		// Potentially complex pseudos
-		"not": markFunction(function( selector ) {
-			// Trim the selector passed to compile
-			// to avoid treating leading and trailing
-			// spaces as combinators
-			var input = [],
-				results = [],
-				matcher = compile( selector.replace( rtrim, "$1" ) );
-
-			return matcher[ expando ] ?
-				markFunction(function( seed, matches, context, xml ) {
-					var elem,
-						unmatched = matcher( seed, null, xml, [] ),
-						i = seed.length;
-
-					// Match elements unmatched by `matcher`
-					while ( i-- ) {
-						if ( (elem = unmatched[i]) ) {
-							seed[i] = !(matches[i] = elem);
-						}
-					}
-				}) :
-				function( elem, context, xml ) {
-					input[0] = elem;
-					matcher( input, null, xml, results );
-					// Don't keep the element (issue #299)
-					input[0] = null;
-					return !results.pop();
-				};
-		}),
-
-		"has": markFunction(function( selector ) {
-			return function( elem ) {
-				return Sizzle( selector, elem ).length > 0;
-			};
-		}),
-
-		"contains": markFunction(function( text ) {
-			text = text.replace( runescape, funescape );
-			return function( elem ) {
-				return ( elem.textContent || elem.innerText || getText( elem ) ).indexOf( text ) > -1;
-			};
-		}),
-
-		// "Whether an element is represented by a :lang() selector
-		// is based solely on the element's language value
-		// being equal to the identifier C,
-		// or beginning with the identifier C immediately followed by "-".
-		// The matching of C against the element's language value is performed case-insensitively.
-		// The identifier C does not have to be a valid language name."
-		// http://www.w3.org/TR/selectors/#lang-pseudo
-		"lang": markFunction( function( lang ) {
-			// lang value must be a valid identifier
-			if ( !ridentifier.test(lang || "") ) {
-				Sizzle.error( "unsupported lang: " + lang );
-			}
-			lang = lang.replace( runescape, funescape ).toLowerCase();
-			return function( elem ) {
-				var elemLang;
-				do {
-					if ( (elemLang = documentIsHTML ?
-						elem.lang :
-						elem.getAttribute("xml:lang") || elem.getAttribute("lang")) ) {
-
-						elemLang = elemLang.toLowerCase();
-						return elemLang === lang || elemLang.indexOf( lang + "-" ) === 0;
-					}
-				} while ( (elem = elem.parentNode) && elem.nodeType === 1 );
-				return false;
-			};
-		}),
-
-		// Miscellaneous
-		"target": function( elem ) {
-			var hash = window.location && window.location.hash;
-			return hash && hash.slice( 1 ) === elem.id;
-		},
-
-		"root": function( elem ) {
-			return elem === docElem;
-		},
-
-		"focus": function( elem ) {
-			return elem === document.activeElement && (!document.hasFocus || document.hasFocus()) && !!(elem.type || elem.href || ~elem.tabIndex);
-		},
-
-		// Boolean properties
-		"enabled": function( elem ) {
-			return elem.disabled === false;
-		},
-
-		"disabled": function( elem ) {
-			return elem.disabled === true;
-		},
-
-		"checked": function( elem ) {
-			// In CSS3, :checked should return both checked and selected elements
-			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
-			var nodeName = elem.nodeName.toLowerCase();
-			return (nodeName === "input" && !!elem.checked) || (nodeName === "option" && !!elem.selected);
-		},
-
-		"selected": function( elem ) {
-			// Accessing this property makes selected-by-default
-			// options in Safari work properly
-			if ( elem.parentNode ) {
-				elem.parentNode.selectedIndex;
-			}
-
-			return elem.selected === true;
-		},
-
-		// Contents
-		"empty": function( elem ) {
-			// http://www.w3.org/TR/selectors/#empty-pseudo
-			// :empty is negated by element (1) or content nodes (text: 3; cdata: 4; entity ref: 5),
-			//   but not by others (comment: 8; processing instruction: 7; etc.)
-			// nodeType < 6 works because attributes (2) do not appear as children
-			for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
-				if ( elem.nodeType < 6 ) {
-					return false;
-				}
-			}
-			return true;
-		},
-
-		"parent": function( elem ) {
-			return !Expr.pseudos["empty"]( elem );
-		},
-
-		// Element/input types
-		"header": function( elem ) {
-			return rheader.test( elem.nodeName );
-		},
-
-		"input": function( elem ) {
-			return rinputs.test( elem.nodeName );
-		},
-
-		"button": function( elem ) {
-			var name = elem.nodeName.toLowerCase();
-			return name === "input" && elem.type === "button" || name === "button";
-		},
-
-		"text": function( elem ) {
-			var attr;
-			return elem.nodeName.toLowerCase() === "input" &&
-				elem.type === "text" &&
-
-				// Support: IE<8
-				// New HTML5 attribute values (e.g., "search") appear with elem.type === "text"
-				( (attr = elem.getAttribute("type")) == null || attr.toLowerCase() === "text" );
-		},
-
-		// Position-in-collection
-		"first": createPositionalPseudo(function() {
-			return [ 0 ];
-		}),
-
-		"last": createPositionalPseudo(function( matchIndexes, length ) {
-			return [ length - 1 ];
-		}),
-
-		"eq": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			return [ argument < 0 ? argument + length : argument ];
-		}),
-
-		"even": createPositionalPseudo(function( matchIndexes, length ) {
-			var i = 0;
-			for ( ; i < length; i += 2 ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		}),
-
-		"odd": createPositionalPseudo(function( matchIndexes, length ) {
-			var i = 1;
-			for ( ; i < length; i += 2 ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		}),
-
-		"lt": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			var i = argument < 0 ? argument + length : argument;
-			for ( ; --i >= 0; ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		}),
-
-		"gt": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			var i = argument < 0 ? argument + length : argument;
-			for ( ; ++i < length; ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		})
-	}
-};
-
-Expr.pseudos["nth"] = Expr.pseudos["eq"];
-
-// Add button/input type pseudos
-for ( i in { radio: true, checkbox: true, file: true, password: true, image: true } ) {
-	Expr.pseudos[ i ] = createInputPseudo( i );
-}
-for ( i in { submit: true, reset: true } ) {
-	Expr.pseudos[ i ] = createButtonPseudo( i );
-}
-
-// Easy API for creating new setFilters
-function setFilters() {}
-setFilters.prototype = Expr.filters = Expr.pseudos;
-Expr.setFilters = new setFilters();
-
-tokenize = Sizzle.tokenize = function( selector, parseOnly ) {
-	var matched, match, tokens, type,
-		soFar, groups, preFilters,
-		cached = tokenCache[ selector + " " ];
-
-	if ( cached ) {
-		return parseOnly ? 0 : cached.slice( 0 );
-	}
-
-	soFar = selector;
-	groups = [];
-	preFilters = Expr.preFilter;
-
-	while ( soFar ) {
-
-		// Comma and first run
-		if ( !matched || (match = rcomma.exec( soFar )) ) {
-			if ( match ) {
-				// Don't consume trailing commas as valid
-				soFar = soFar.slice( match[0].length ) || soFar;
-			}
-			groups.push( (tokens = []) );
-		}
-
-		matched = false;
-
-		// Combinators
-		if ( (match = rcombinators.exec( soFar )) ) {
-			matched = match.shift();
-			tokens.push({
-				value: matched,
-				// Cast descendant combinators to space
-				type: match[0].replace( rtrim, " " )
-			});
-			soFar = soFar.slice( matched.length );
-		}
-
-		// Filters
-		for ( type in Expr.filter ) {
-			if ( (match = matchExpr[ type ].exec( soFar )) && (!preFilters[ type ] ||
-				(match = preFilters[ type ]( match ))) ) {
-				matched = match.shift();
-				tokens.push({
-					value: matched,
-					type: type,
-					matches: match
-				});
-				soFar = soFar.slice( matched.length );
-			}
-		}
-
-		if ( !matched ) {
-			break;
-		}
-	}
-
-	// Return the length of the invalid excess
-	// if we're just parsing
-	// Otherwise, throw an error or return tokens
-	return parseOnly ?
-		soFar.length :
-		soFar ?
-			Sizzle.error( selector ) :
-			// Cache the tokens
-			tokenCache( selector, groups ).slice( 0 );
-};
-
-function toSelector( tokens ) {
-	var i = 0,
-		len = tokens.length,
-		selector = "";
-	for ( ; i < len; i++ ) {
-		selector += tokens[i].value;
-	}
-	return selector;
-}
-
-function addCombinator( matcher, combinator, base ) {
-	var dir = combinator.dir,
-		checkNonElements = base && dir === "parentNode",
-		doneName = done++;
-
-	return combinator.first ?
-		// Check against closest ancestor/preceding element
-		function( elem, context, xml ) {
-			while ( (elem = elem[ dir ]) ) {
-				if ( elem.nodeType === 1 || checkNonElements ) {
-					return matcher( elem, context, xml );
-				}
-			}
-		} :
-
-		// Check against all ancestor/preceding elements
-		function( elem, context, xml ) {
-			var oldCache, outerCache,
-				newCache = [ dirruns, doneName ];
-
-			// We can't set arbitrary data on XML nodes, so they don't benefit from dir caching
-			if ( xml ) {
-				while ( (elem = elem[ dir ]) ) {
-					if ( elem.nodeType === 1 || checkNonElements ) {
-						if ( matcher( elem, context, xml ) ) {
-							return true;
-						}
-					}
-				}
-			} else {
-				while ( (elem = elem[ dir ]) ) {
-					if ( elem.nodeType === 1 || checkNonElements ) {
-						outerCache = elem[ expando ] || (elem[ expando ] = {});
-						if ( (oldCache = outerCache[ dir ]) &&
-							oldCache[ 0 ] === dirruns && oldCache[ 1 ] === doneName ) {
-
-							// Assign to newCache so results back-propagate to previous elements
-							return (newCache[ 2 ] = oldCache[ 2 ]);
-						} else {
-							// Reuse newcache so results back-propagate to previous elements
-							outerCache[ dir ] = newCache;
-
-							// A match means we're done; a fail means we have to keep checking
-							if ( (newCache[ 2 ] = matcher( elem, context, xml )) ) {
-								return true;
-							}
-						}
-					}
-				}
-			}
-		};
-}
-
-function elementMatcher( matchers ) {
-	return matchers.length > 1 ?
-		function( elem, context, xml ) {
-			var i = matchers.length;
-			while ( i-- ) {
-				if ( !matchers[i]( elem, context, xml ) ) {
-					return false;
-				}
-			}
-			return true;
-		} :
-		matchers[0];
-}
-
-function multipleContexts( selector, contexts, results ) {
-	var i = 0,
-		len = contexts.length;
-	for ( ; i < len; i++ ) {
-		Sizzle( selector, contexts[i], results );
-	}
-	return results;
-}
-
-function condense( unmatched, map, filter, context, xml ) {
-	var elem,
-		newUnmatched = [],
-		i = 0,
-		len = unmatched.length,
-		mapped = map != null;
-
-	for ( ; i < len; i++ ) {
-		if ( (elem = unmatched[i]) ) {
-			if ( !filter || filter( elem, context, xml ) ) {
-				newUnmatched.push( elem );
-				if ( mapped ) {
-					map.push( i );
-				}
-			}
-		}
-	}
-
-	return newUnmatched;
-}
-
-function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postSelector ) {
-	if ( postFilter && !postFilter[ expando ] ) {
-		postFilter = setMatcher( postFilter );
-	}
-	if ( postFinder && !postFinder[ expando ] ) {
-		postFinder = setMatcher( postFinder, postSelector );
-	}
-	return markFunction(function( seed, results, context, xml ) {
-		var temp, i, elem,
-			preMap = [],
-			postMap = [],
-			preexisting = results.length,
-
-			// Get initial elements from seed or context
-			elems = seed || multipleContexts( selector || "*", context.nodeType ? [ context ] : context, [] ),
-
-			// Prefilter to get matcher input, preserving a map for seed-results synchronization
-			matcherIn = preFilter && ( seed || !selector ) ?
-				condense( elems, preMap, preFilter, context, xml ) :
-				elems,
-
-			matcherOut = matcher ?
-				// If we have a postFinder, or filtered seed, or non-seed postFilter or preexisting results,
-				postFinder || ( seed ? preFilter : preexisting || postFilter ) ?
-
-					// ...intermediate processing is necessary
-					[] :
-
-					// ...otherwise use results directly
-					results :
-				matcherIn;
-
-		// Find primary matches
-		if ( matcher ) {
-			matcher( matcherIn, matcherOut, context, xml );
-		}
-
-		// Apply postFilter
-		if ( postFilter ) {
-			temp = condense( matcherOut, postMap );
-			postFilter( temp, [], context, xml );
-
-			// Un-match failing elements by moving them back to matcherIn
-			i = temp.length;
-			while ( i-- ) {
-				if ( (elem = temp[i]) ) {
-					matcherOut[ postMap[i] ] = !(matcherIn[ postMap[i] ] = elem);
-				}
-			}
-		}
-
-		if ( seed ) {
-			if ( postFinder || preFilter ) {
-				if ( postFinder ) {
-					// Get the final matcherOut by condensing this intermediate into postFinder contexts
-					temp = [];
-					i = matcherOut.length;
-					while ( i-- ) {
-						if ( (elem = matcherOut[i]) ) {
-							// Restore matcherIn since elem is not yet a final match
-							temp.push( (matcherIn[i] = elem) );
-						}
-					}
-					postFinder( null, (matcherOut = []), temp, xml );
-				}
-
-				// Move matched elements from seed to results to keep them synchronized
-				i = matcherOut.length;
-				while ( i-- ) {
-					if ( (elem = matcherOut[i]) &&
-						(temp = postFinder ? indexOf( seed, elem ) : preMap[i]) > -1 ) {
-
-						seed[temp] = !(results[temp] = elem);
-					}
-				}
-			}
-
-		// Add elements to results, through postFinder if defined
-		} else {
-			matcherOut = condense(
-				matcherOut === results ?
-					matcherOut.splice( preexisting, matcherOut.length ) :
-					matcherOut
-			);
-			if ( postFinder ) {
-				postFinder( null, results, matcherOut, xml );
-			} else {
-				push.apply( results, matcherOut );
-			}
-		}
-	});
-}
-
-function matcherFromTokens( tokens ) {
-	var checkContext, matcher, j,
-		len = tokens.length,
-		leadingRelative = Expr.relative[ tokens[0].type ],
-		implicitRelative = leadingRelative || Expr.relative[" "],
-		i = leadingRelative ? 1 : 0,
-
-		// The foundational matcher ensures that elements are reachable from top-level context(s)
-		matchContext = addCombinator( function( elem ) {
-			return elem === checkContext;
-		}, implicitRelative, true ),
-		matchAnyContext = addCombinator( function( elem ) {
-			return indexOf( checkContext, elem ) > -1;
-		}, implicitRelative, true ),
-		matchers = [ function( elem, context, xml ) {
-			var ret = ( !leadingRelative && ( xml || context !== outermostContext ) ) || (
-				(checkContext = context).nodeType ?
-					matchContext( elem, context, xml ) :
-					matchAnyContext( elem, context, xml ) );
-			// Avoid hanging onto element (issue #299)
-			checkContext = null;
-			return ret;
-		} ];
-
-	for ( ; i < len; i++ ) {
-		if ( (matcher = Expr.relative[ tokens[i].type ]) ) {
-			matchers = [ addCombinator(elementMatcher( matchers ), matcher) ];
-		} else {
-			matcher = Expr.filter[ tokens[i].type ].apply( null, tokens[i].matches );
-
-			// Return special upon seeing a positional matcher
-			if ( matcher[ expando ] ) {
-				// Find the next relative operator (if any) for proper handling
-				j = ++i;
-				for ( ; j < len; j++ ) {
-					if ( Expr.relative[ tokens[j].type ] ) {
-						break;
-					}
-				}
-				return setMatcher(
-					i > 1 && elementMatcher( matchers ),
-					i > 1 && toSelector(
-						// If the preceding token was a descendant combinator, insert an implicit any-element `*`
-						tokens.slice( 0, i - 1 ).concat({ value: tokens[ i - 2 ].type === " " ? "*" : "" })
-					).replace( rtrim, "$1" ),
-					matcher,
-					i < j && matcherFromTokens( tokens.slice( i, j ) ),
-					j < len && matcherFromTokens( (tokens = tokens.slice( j )) ),
-					j < len && toSelector( tokens )
-				);
-			}
-			matchers.push( matcher );
-		}
-	}
-
-	return elementMatcher( matchers );
-}
-
-function matcherFromGroupMatchers( elementMatchers, setMatchers ) {
-	var bySet = setMatchers.length > 0,
-		byElement = elementMatchers.length > 0,
-		superMatcher = function( seed, context, xml, results, outermost ) {
-			var elem, j, matcher,
-				matchedCount = 0,
-				i = "0",
-				unmatched = seed && [],
-				setMatched = [],
-				contextBackup = outermostContext,
-				// We must always have either seed elements or outermost context
-				elems = seed || byElement && Expr.find["TAG"]( "*", outermost ),
-				// Use integer dirruns iff this is the outermost matcher
-				dirrunsUnique = (dirruns += contextBackup == null ? 1 : Math.random() || 0.1),
-				len = elems.length;
-
-			if ( outermost ) {
-				outermostContext = context !== document && context;
-			}
-
-			// Add elements passing elementMatchers directly to results
-			// Keep `i` a string if there are no elements so `matchedCount` will be "00" below
-			// Support: IE<9, Safari
-			// Tolerate NodeList properties (IE: "length"; Safari: <number>) matching elements by id
-			for ( ; i !== len && (elem = elems[i]) != null; i++ ) {
-				if ( byElement && elem ) {
-					j = 0;
-					while ( (matcher = elementMatchers[j++]) ) {
-						if ( matcher( elem, context, xml ) ) {
-							results.push( elem );
-							break;
-						}
-					}
-					if ( outermost ) {
-						dirruns = dirrunsUnique;
-					}
-				}
-
-				// Track unmatched elements for set filters
-				if ( bySet ) {
-					// They will have gone through all possible matchers
-					if ( (elem = !matcher && elem) ) {
-						matchedCount--;
-					}
-
-					// Lengthen the array for every element, matched or not
-					if ( seed ) {
-						unmatched.push( elem );
-					}
-				}
-			}
-
-			// Apply set filters to unmatched elements
-			matchedCount += i;
-			if ( bySet && i !== matchedCount ) {
-				j = 0;
-				while ( (matcher = setMatchers[j++]) ) {
-					matcher( unmatched, setMatched, context, xml );
-				}
-
-				if ( seed ) {
-					// Reintegrate element matches to eliminate the need for sorting
-					if ( matchedCount > 0 ) {
-						while ( i-- ) {
-							if ( !(unmatched[i] || setMatched[i]) ) {
-								setMatched[i] = pop.call( results );
-							}
-						}
-					}
-
-					// Discard index placeholder values to get only actual matches
-					setMatched = condense( setMatched );
-				}
-
-				// Add matches to results
-				push.apply( results, setMatched );
-
-				// Seedless set matches succeeding multiple successful matchers stipulate sorting
-				if ( outermost && !seed && setMatched.length > 0 &&
-					( matchedCount + setMatchers.length ) > 1 ) {
-
-					Sizzle.uniqueSort( results );
-				}
-			}
-
-			// Override manipulation of globals by nested matchers
-			if ( outermost ) {
-				dirruns = dirrunsUnique;
-				outermostContext = contextBackup;
-			}
-
-			return unmatched;
-		};
-
-	return bySet ?
-		markFunction( superMatcher ) :
-		superMatcher;
-}
-
-compile = Sizzle.compile = function( selector, match /* Internal Use Only */ ) {
-	var i,
-		setMatchers = [],
-		elementMatchers = [],
-		cached = compilerCache[ selector + " " ];
-
-	if ( !cached ) {
-		// Generate a function of recursive functions that can be used to check each element
-		if ( !match ) {
-			match = tokenize( selector );
-		}
-		i = match.length;
-		while ( i-- ) {
-			cached = matcherFromTokens( match[i] );
-			if ( cached[ expando ] ) {
-				setMatchers.push( cached );
-			} else {
-				elementMatchers.push( cached );
-			}
-		}
-
-		// Cache the compiled function
-		cached = compilerCache( selector, matcherFromGroupMatchers( elementMatchers, setMatchers ) );
-
-		// Save selector and tokenization
-		cached.selector = selector;
-	}
-	return cached;
-};
-
-/**
- * A low-level selection function that works with Sizzle's compiled
- *  selector functions
- * @param {String|Function} selector A selector or a pre-compiled
- *  selector function built with Sizzle.compile
- * @param {Element} context
- * @param {Array} [results]
- * @param {Array} [seed] A set of elements to match against
- */
-select = Sizzle.select = function( selector, context, results, seed ) {
-	var i, tokens, token, type, find,
-		compiled = typeof selector === "function" && selector,
-		match = !seed && tokenize( (selector = compiled.selector || selector) );
-
-	results = results || [];
-
-	// Try to minimize operations if there is no seed and only one group
-	if ( match.length === 1 ) {
-
-		// Take a shortcut and set the context if the root selector is an ID
-		tokens = match[0] = match[0].slice( 0 );
-		if ( tokens.length > 2 && (token = tokens[0]).type === "ID" &&
-				support.getById && context.nodeType === 9 && documentIsHTML &&
-				Expr.relative[ tokens[1].type ] ) {
-
-			context = ( Expr.find["ID"]( token.matches[0].replace(runescape, funescape), context ) || [] )[0];
-			if ( !context ) {
-				return results;
-
-			// Precompiled matchers will still verify ancestry, so step up a level
-			} else if ( compiled ) {
-				context = context.parentNode;
-			}
-
-			selector = selector.slice( tokens.shift().value.length );
-		}
-
-		// Fetch a seed set for right-to-left matching
-		i = matchExpr["needsContext"].test( selector ) ? 0 : tokens.length;
-		while ( i-- ) {
-			token = tokens[i];
-
-			// Abort if we hit a combinator
-			if ( Expr.relative[ (type = token.type) ] ) {
-				break;
-			}
-			if ( (find = Expr.find[ type ]) ) {
-				// Search, expanding context for leading sibling combinators
-				if ( (seed = find(
-					token.matches[0].replace( runescape, funescape ),
-					rsibling.test( tokens[0].type ) && testContext( context.parentNode ) || context
-				)) ) {
-
-					// If seed is empty or no tokens remain, we can return early
-					tokens.splice( i, 1 );
-					selector = seed.length && toSelector( tokens );
-					if ( !selector ) {
-						push.apply( results, seed );
-						return results;
-					}
-
-					break;
-				}
-			}
-		}
-	}
-
-	// Compile and execute a filtering function if one is not provided
-	// Provide `match` to avoid retokenization if we modified the selector above
-	( compiled || compile( selector, match ) )(
-		seed,
-		context,
-		!documentIsHTML,
-		results,
-		rsibling.test( selector ) && testContext( context.parentNode ) || context
-	);
-	return results;
-};
-
-// One-time assignments
-
-// Sort stability
-support.sortStable = expando.split("").sort( sortOrder ).join("") === expando;
-
-// Support: Chrome 14-35+
-// Always assume duplicates if they aren't passed to the comparison function
-support.detectDuplicates = !!hasDuplicate;
-
-// Initialize against the default document
-setDocument();
-
-// Support: Webkit<537.32 - Safari 6.0.3/Chrome 25 (fixed in Chrome 27)
-// Detached nodes confoundingly follow *each other*
-support.sortDetached = assert(function( div1 ) {
-	// Should return 1, but returns 4 (following)
-	return div1.compareDocumentPosition( document.createElement("div") ) & 1;
-});
-
-// Support: IE<8
-// Prevent attribute/property "interpolation"
-// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx
-if ( !assert(function( div ) {
-	div.innerHTML = "<a href='#'></a>";
-	return div.firstChild.getAttribute("href") === "#" ;
-}) ) {
-	addHandle( "type|href|height|width", function( elem, name, isXML ) {
-		if ( !isXML ) {
-			return elem.getAttribute( name, name.toLowerCase() === "type" ? 1 : 2 );
-		}
-	});
-}
-
-// Support: IE<9
-// Use defaultValue in place of getAttribute("value")
-if ( !support.attributes || !assert(function( div ) {
-	div.innerHTML = "<input/>";
-	div.firstChild.setAttribute( "value", "" );
-	return div.firstChild.getAttribute( "value" ) === "";
-}) ) {
-	addHandle( "value", function( elem, name, isXML ) {
-		if ( !isXML && elem.nodeName.toLowerCase() === "input" ) {
-			return elem.defaultValue;
-		}
-	});
-}
-
-// Support: IE<9
-// Use getAttributeNode to fetch booleans when getAttribute lies
-if ( !assert(function( div ) {
-	return div.getAttribute("disabled") == null;
-}) ) {
-	addHandle( booleans, function( elem, name, isXML ) {
-		var val;
-		if ( !isXML ) {
-			return elem[ name ] === true ? name.toLowerCase() :
-					(val = elem.getAttributeNode( name )) && val.specified ?
-					val.value :
-				null;
-		}
-	});
-}
-
-return Sizzle;
-
-})( window );
-
-
-
-jQuery.find = Sizzle;
-jQuery.expr = Sizzle.selectors;
-jQuery.expr[":"] = jQuery.expr.pseudos;
-jQuery.unique = Sizzle.uniqueSort;
-jQuery.text = Sizzle.getText;
-jQuery.isXMLDoc = Sizzle.isXML;
-jQuery.contains = Sizzle.contains;
-
-
-
-var rneedsContext = jQuery.expr.match.needsContext;
-
-var rsingleTag = (/^<(\w+)\s*\/?>(?:<\/\1>|)$/);
-
-
-
-var risSimple = /^.[^:#\[\.,]*$/;
-
-// Implement the identical functionality for filter and not
-function winnow( elements, qualifier, not ) {
-	if ( jQuery.isFunction( qualifier ) ) {
-		return jQuery.grep( elements, function( elem, i ) {
-			/* jshint -W018 */
-			return !!qualifier.call( elem, i, elem ) !== not;
-		});
-
-	}
-
-	if ( qualifier.nodeType ) {
-		return jQuery.grep( elements, function( elem ) {
-			return ( elem === qualifier ) !== not;
-		});
-
-	}
-
-	if ( typeof qualifier === "string" ) {
-		if ( risSimple.test( qualifier ) ) {
-			return jQuery.filter( qualifier, elements, not );
-		}
-
-		qualifier = jQuery.filter( qualifier, elements );
-	}
-
-	return jQuery.grep( elements, function( elem ) {
-		return ( indexOf.call( qualifier, elem ) >= 0 ) !== not;
-	});
-}
-
-jQuery.filter = function( expr, elems, not ) {
-	var elem = elems[ 0 ];
-
-	if ( not ) {
-		expr = ":not(" + expr + ")";
-	}
-
-	return elems.length === 1 && elem.nodeType === 1 ?
-		jQuery.find.matchesSelector( elem, expr ) ? [ elem ] : [] :
-		jQuery.find.matches( expr, jQuery.grep( elems, function( elem ) {
-			return elem.nodeType === 1;
-		}));
-};
-
-jQuery.fn.extend({
-	find: function( selector ) {
-		var i,
-			len = this.length,
-			ret = [],
-			self = this;
-
-		if ( typeof selector !== "string" ) {
-			return this.pushStack( jQuery( selector ).filter(function() {
-				for ( i = 0; i < len; i++ ) {
-					if ( jQuery.contains( self[ i ], this ) ) {
-						return true;
-					}
-				}
-			}) );
-		}
-
-		for ( i = 0; i < len; i++ ) {
-			jQuery.find( selector, self[ i ], ret );
-		}
-
-		// Needed because $( selector, context ) becomes $( context ).find( selector )
-		ret = this.pushStack( len > 1 ? jQuery.unique( ret ) : ret );
-		ret.selector = this.selector ? this.selector + " " + selector : selector;
-		return ret;
-	},
-	filter: function( selector ) {
-		return this.pushStack( winnow(this, selector || [], false) );
-	},
-	not: function( selector ) {
-		return this.pushStack( winnow(this, selector || [], true) );
-	},
-	is: function( selector ) {
-		return !!winnow(
-			this,
-
-			// If this is a positional/relative selector, check membership in the returned set
-			// so $("p:first").is("p:last") won't return true for a doc with two "p".
-			typeof selector === "string" && rneedsContext.test( selector ) ?
-				jQuery( selector ) :
-				selector || [],
-			false
-		).length;
-	}
-});
-
-
-// Initialize a jQuery object
-
-
-// A central reference to the root jQuery(document)
-var rootjQuery,
-
-	// A simple way to check for HTML strings
-	// Prioritize #id over <tag> to avoid XSS via location.hash (#9521)
-	// Strict HTML recognition (#11290: must start with <)
-	rquickExpr = /^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,
-
-	init = jQuery.fn.init = function( selector, context ) {
-		var match, elem;
-
-		// HANDLE: $(""), $(null), $(undefined), $(false)
-		if ( !selector ) {
-			return this;
-		}
-
-		// Handle HTML strings
-		if ( typeof selector === "string" ) {
-			if ( selector[0] === "<" && selector[ selector.length - 1 ] === ">" && selector.length >= 3 ) {
-				// Assume that strings that start and end with <> are HTML and skip the regex check
-				match = [ null, selector, null ];
-
-			} else {
-				match = rquickExpr.exec( selector );
-			}
-
-			// Match html or make sure no context is specified for #id
-			if ( match && (match[1] || !context) ) {
-
-				// HANDLE: $(html) -> $(array)
-				if ( match[1] ) {
-					context = context instanceof jQuery ? context[0] : context;
-
-					// Option to run scripts is true for back-compat
-					// Intentionally let the error be thrown if parseHTML is not present
-					jQuery.merge( this, jQuery.parseHTML(
-						match[1],
-						context && context.nodeType ? context.ownerDocument || context : document,
-						true
-					) );
-
-					// HANDLE: $(html, props)
-					if ( rsingleTag.test( match[1] ) && jQuery.isPlainObject( context ) ) {
-						for ( match in context ) {
-							// Properties of context are called as methods if possible
-							if ( jQuery.isFunction( this[ match ] ) ) {
-								this[ match ]( context[ match ] );
-
-							// ...and otherwise set as attributes
-							} else {
-								this.attr( match, context[ match ] );
-							}
-						}
-					}
-
-					return this;
-
-				// HANDLE: $(#id)
-				} else {
-					elem = document.getElementById( match[2] );
-
-					// Support: Blackberry 4.6
-					// gEBID returns nodes no longer in the document (#6963)
-					if ( elem && elem.parentNode ) {
-						// Inject the element directly into the jQuery object
-						this.length = 1;
-						this[0] = elem;
-					}
-
-					this.context = document;
-					this.selector = selector;
-					return this;
-				}
-
-			// HANDLE: $(expr, $(...))
-			} else if ( !context || context.jquery ) {
-				return ( context || rootjQuery ).find( selector );
-
-			// HANDLE: $(expr, context)
-			// (which is just equivalent to: $(context).find(expr)
-			} else {
-				return this.constructor( context ).find( selector );
-			}
-
-		// HANDLE: $(DOMElement)
-		} else if ( selector.nodeType ) {
-			this.context = this[0] = selector;
-			this.length = 1;
-			return this;
-
-		// HANDLE: $(function)
-		// Shortcut for document ready
-		} else if ( jQuery.isFunction( selector ) ) {
-			return typeof rootjQuery.ready !== "undefined" ?
-				rootjQuery.ready( selector ) :
-				// Execute immediately if ready is not present
-				selector( jQuery );
-		}
-
-		if ( selector.selector !== undefined ) {
-			this.selector = selector.selector;
-			this.context = selector.context;
-		}
-
-		return jQuery.makeArray( selector, this );
-	};
-
-// Give the init function the jQuery prototype for later instantiation
-init.prototype = jQuery.fn;
-
-// Initialize central reference
-rootjQuery = jQuery( document );
-
-
-var rparentsprev = /^(?:parents|prev(?:Until|All))/,
-	// Methods guaranteed to produce a unique set when starting from a unique set
-	guaranteedUnique = {
-		children: true,
-		contents: true,
-		next: true,
-		prev: true
-	};
-
-jQuery.extend({
-	dir: function( elem, dir, until ) {
-		var matched = [],
-			truncate = until !== undefined;
-
-		while ( (elem = elem[ dir ]) && elem.nodeType !== 9 ) {
-			if ( elem.nodeType === 1 ) {
-				if ( truncate && jQuery( elem ).is( until ) ) {
-					break;
-				}
-				matched.push( elem );
-			}
-		}
-		return matched;
-	},
-
-	sibling: function( n, elem ) {
-		var matched = [];
-
-		for ( ; n; n = n.nextSibling ) {
-			if ( n.nodeType === 1 && n !== elem ) {
-				matched.push( n );
-			}
-		}
-
-		return matched;
-	}
-});
-
-jQuery.fn.extend({
-	has: function( target ) {
-		var targets = jQuery( target, this ),
-			l = targets.length;
-
-		return this.filter(function() {
-			var i = 0;
-			for ( ; i < l; i++ ) {
-				if ( jQuery.contains( this, targets[i] ) ) {
-					return true;
-				}
-			}
-		});
-	},
-
-	closest: function( selectors, context ) {
-		var cur,
-			i = 0,
-			l = this.length,
-			matched = [],
-			pos = rneedsContext.test( selectors ) || typeof selectors !== "string" ?
-				jQuery( selectors, context || this.context ) :
-				0;
-
-		for ( ; i < l; i++ ) {
-			for ( cur = this[i]; cur && cur !== context; cur = cur.parentNode ) {
-				// Always skip document fragments
-				if ( cur.nodeType < 11 && (pos ?
-					pos.index(cur) > -1 :
-
-					// Don't pass non-elements to Sizzle
-					cur.nodeType === 1 &&
-						jQuery.find.matchesSelector(cur, selectors)) ) {
-
-					matched.push( cur );
-					break;
-				}
-			}
-		}
-
-		return this.pushStack( matched.length > 1 ? jQuery.unique( matched ) : matched );
-	},
-
-	// Determine the position of an element within the set
-	index: function( elem ) {
-
-		// No argument, return index in parent
-		if ( !elem ) {
-			return ( this[ 0 ] && this[ 0 ].parentNode ) ? this.first().prevAll().length : -1;
-		}
-
-		// Index in selector
-		if ( typeof elem === "string" ) {
-			return indexOf.call( jQuery( elem ), this[ 0 ] );
-		}
-
-		// Locate the position of the desired element
-		return indexOf.call( this,
-
-			// If it receives a jQuery object, the first element is used
-			elem.jquery ? elem[ 0 ] : elem
-		);
-	},
-
-	add: function( selector, context ) {
-		return this.pushStack(
-			jQuery.unique(
-				jQuery.merge( this.get(), jQuery( selector, context ) )
-			)
-		);
-	},
-
-	addBack: function( selector ) {
-		return this.add( selector == null ?
-			this.prevObject : this.prevObject.filter(selector)
-		);
-	}
-});
-
-function sibling( cur, dir ) {
-	while ( (cur = cur[dir]) && cur.nodeType !== 1 ) {}
-	return cur;
-}
-
-jQuery.each({
-	parent: function( elem ) {
-		var parent = elem.parentNode;
-		return parent && parent.nodeType !== 11 ? parent : null;
-	},
-	parents: function( elem ) {
-		return jQuery.dir( elem, "parentNode" );
-	},
-	parentsUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "parentNode", until );
-	},
-	next: function( elem ) {
-		return sibling( elem, "nextSibling" );
-	},
-	prev: function( elem ) {
-		return sibling( elem, "previousSibling" );
-	},
-	nextAll: function( elem ) {
-		return jQuery.dir( elem, "nextSibling" );
-	},
-	prevAll: function( elem ) {
-		return jQuery.dir( elem, "previousSibling" );
-	},
-	nextUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "nextSibling", until );
-	},
-	prevUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "previousSibling", until );
-	},
-	siblings: function( elem ) {
-		return jQuery.sibling( ( elem.parentNode || {} ).firstChild, elem );
-	},
-	children: function( elem ) {
-		return jQuery.sibling( elem.firstChild );
-	},
-	contents: function( elem ) {
-		return elem.contentDocument || jQuery.merge( [], elem.childNodes );
-	}
-}, function( name, fn ) {
-	jQuery.fn[ name ] = function( until, selector ) {
-		var matched = jQuery.map( this, fn, until );
-
-		if ( name.slice( -5 ) !== "Until" ) {
-			selector = until;
-		}
-
-		if ( selector && typeof selector === "string" ) {
-			matched = jQuery.filter( selector, matched );
-		}
-
-		if ( this.length > 1 ) {
-			// Remove duplicates
-			if ( !guaranteedUnique[ name ] ) {
-				jQuery.unique( matched );
-			}
-
-			// Reverse order for parents* and prev-derivatives
-			if ( rparentsprev.test( name ) ) {
-				matched.reverse();
-			}
-		}
-
-		return this.pushStack( matched );
-	};
-});
-var rnotwhite = (/\S+/g);
-
-
-
-// String to Object options format cache
-var optionsCache = {};
-
-// Convert String-formatted options into Object-formatted ones and store in cache
-function createOptions( options ) {
-	var object = optionsCache[ options ] = {};
-	jQuery.each( options.match( rnotwhite ) || [], function( _, flag ) {
-		object[ flag ] = true;
-	});
-	return object;
-}
-
-/*
- * Create a callback list using the following parameters:
- *
- *	options: an optional list of space-separated options that will change how
- *			the callback list behaves or a more traditional option object
- *
- * By default a callback list will act like an event callback list and can be
- * "fired" multiple times.
- *
- * Possible options:
- *
- *	once:			will ensure the callback list can only be fired once (like a Deferred)
- *
- *	memory:			will keep track of previous values and will call any callback added
- *					after the list has been fired right away with the latest "memorized"
- *					values (like a Deferred)
- *
- *	unique:			will ensure a callback can only be added once (no duplicate in the list)
- *
- *	stopOnFalse:	interrupt callings when a callback returns false
- *
- */
-jQuery.Callbacks = function( options ) {
-
-	// Convert options from String-formatted to Object-formatted if needed
-	// (we check in cache first)
-	options = typeof options === "string" ?
-		( optionsCache[ options ] || createOptions( options ) ) :
-		jQuery.extend( {}, options );
-
-	var // Last fire value (for non-forgettable lists)
-		memory,
-		// Flag to know if list was already fired
-		fired,
-		// Flag to know if list is currently firing
-		firing,
-		// First callback to fire (used internally by add and fireWith)
-		firingStart,
-		// End of the loop when firing
-		firingLength,
-		// Index of currently firing callback (modified by remove if needed)
-		firingIndex,
-		// Actual callback list
-		list = [],
-		// Stack of fire calls for repeatable lists
-		stack = !options.once && [],
-		// Fire callbacks
-		fire = function( data ) {
-			memory = options.memory && data;
-			fired = true;
-			firingIndex = firingStart || 0;
-			firingStart = 0;
-			firingLength = list.length;
-			firing = true;
-			for ( ; list && firingIndex < firingLength; firingIndex++ ) {
-				if ( list[ firingIndex ].apply( data[ 0 ], data[ 1 ] ) === false && options.stopOnFalse ) {
-					memory = false; // To prevent further calls using add
-					break;
-				}
-			}
-			firing = false;
-			if ( list ) {
-				if ( stack ) {
-					if ( stack.length ) {
-						fire( stack.shift() );
-					}
-				} else if ( memory ) {
-					list = [];
-				} else {
-					self.disable();
-				}
-			}
-		},
-		// Actual Callbacks object
-		self = {
-			// Add a callback or a collection of callbacks to the list
-			add: function() {
-				if ( list ) {
-					// First, we save the current length
-					var start = list.length;
-					(function add( args ) {
-						jQuery.each( args, function( _, arg ) {
-							var type = jQuery.type( arg );
-							if ( type === "function" ) {
-								if ( !options.unique || !self.has( arg ) ) {
-									list.push( arg );
-								}
-							} else if ( arg && arg.length && type !== "string" ) {
-								// Inspect recursively
-								add( arg );
-							}
-						});
-					})( arguments );
-					// Do we need to add the callbacks to the
-					// current firing batch?
-					if ( firing ) {
-						firingLength = list.length;
-					// With memory, if we're not firing then
-					// we should call right away
-					} else if ( memory ) {
-						firingStart = start;
-						fire( memory );
-					}
-				}
-				return this;
-			},
-			// Remove a callback from the list
-			remove: function() {
-				if ( list ) {
-					jQuery.each( arguments, function( _, arg ) {
-						var index;
-						while ( ( index = jQuery.inArray( arg, list, index ) ) > -1 ) {
-							list.splice( index, 1 );
-							// Handle firing indexes
-							if ( firing ) {
-								if ( index <= firingLength ) {
-									firingLength--;
-								}
-								if ( index <= firingIndex ) {
-									firingIndex--;
-								}
-							}
-						}
-					});
-				}
-				return this;
-			},
-			// Check if a given callback is in the list.
-			// If no argument is given, return whether or not list has callbacks attached.
-			has: function( fn ) {
-				return fn ? jQuery.inArray( fn, list ) > -1 : !!( list && list.length );
-			},
-			// Remove all callbacks from the list
-			empty: function() {
-				list = [];
-				firingLength = 0;
-				return this;
-			},
-			// Have the list do nothing anymore
-			disable: function() {
-				list = stack = memory = undefined;
-				return this;
-			},
-			// Is it disabled?
-			disabled: function() {
-				return !list;
-			},
-			// Lock the list in its current state
-			lock: function() {
-				stack = undefined;
-				if ( !memory ) {
-					self.disable();
-				}
-				return this;
-			},
-			// Is it locked?
-			locked: function() {
-				return !stack;
-			},
-			// Call all callbacks with the given context and arguments
-			fireWith: function( context, args ) {
-				if ( list && ( !fired || stack ) ) {
-					args = args || [];
-					args = [ context, args.slice ? args.slice() : args ];
-					if ( firing ) {
-						stack.push( args );
-					} else {
-						fire( args );
-					}
-				}
-				return this;
-			},
-			// Call all the callbacks with the given arguments
-			fire: function() {
-				self.fireWith( this, arguments );
-				return this;
-			},
-			// To know if the callbacks have already been called at least once
-			fired: function() {
-				return !!fired;
-			}
-		};
-
-	return self;
-};
-
-
-jQuery.extend({
-
-	Deferred: function( func ) {
-		var tuples = [
-				// action, add listener, listener list, final state
-				[ "resolve", "done", jQuery.Callbacks("once memory"), "resolved" ],
-				[ "reject", "fail", jQuery.Callbacks("once memory"), "rejected" ],
-				[ "notify", "progress", jQuery.Callbacks("memory") ]
-			],
-			state = "pending",
-			promise = {
-				state: function() {
-					return state;
-				},
-				always: function() {
-					deferred.done( arguments ).fail( arguments );
-					return this;
-				},
-				then: function( /* fnDone, fnFail, fnProgress */ ) {
-					var fns = arguments;
-					return jQuery.Deferred(function( newDefer ) {
-						jQuery.each( tuples, function( i, tuple ) {
-							var fn = jQuery.isFunction( fns[ i ] ) && fns[ i ];
-							// deferred[ done | fail | progress ] for forwarding actions to newDefer
-							deferred[ tuple[1] ](function() {
-								var returned = fn && fn.apply( this, arguments );
-								if ( returned && jQuery.isFunction( returned.promise ) ) {
-									returned.promise()
-										.done( newDefer.resolve )
-										.fail( newDefer.reject )
-										.progress( newDefer.notify );
-								} else {
-									newDefer[ tuple[ 0 ] + "With" ]( this === promise ? newDefer.promise() : this, fn ? [ returned ] : arguments );
-								}
-							});
-						});
-						fns = null;
-					}).promise();
-				},
-				// Get a promise for this deferred
-				// If obj is provided, the promise aspect is added to the object
-				promise: function( obj ) {
-					return obj != null ? jQuery.extend( obj, promise ) : promise;
-				}
-			},
-			deferred = {};
-
-		// Keep pipe for back-compat
-		promise.pipe = promise.then;
-
-		// Add list-specific methods
-		jQuery.each( tuples, function( i, tuple ) {
-			var list = tuple[ 2 ],
-				stateString = tuple[ 3 ];
-
-			// promise[ done | fail | progress ] = list.add
-			promise[ tuple[1] ] = list.add;
-
-			// Handle state
-			if ( stateString ) {
-				list.add(function() {
-					// state = [ resolved | rejected ]
-					state = stateString;
-
-				// [ reject_list | resolve_list ].disable; progress_list.lock
-				}, tuples[ i ^ 1 ][ 2 ].disable, tuples[ 2 ][ 2 ].lock );
-			}
-
-			// deferred[ resolve | reject | notify ]
-			deferred[ tuple[0] ] = function() {
-				deferred[ tuple[0] + "With" ]( this === deferred ? promise : this, arguments );
-				return this;
-			};
-			deferred[ tuple[0] + "With" ] = list.fireWith;
-		});
-
-		// Make the deferred a promise
-		promise.promise( deferred );
-
-		// Call given func if any
-		if ( func ) {
-			func.call( deferred, deferred );
-		}
-
-		// All done!
-		return deferred;
-	},
-
-	// Deferred helper
-	when: function( subordinate /* , ..., subordinateN */ ) {
-		var i = 0,
-			resolveValues = slice.call( arguments ),
-			length = resolveValues.length,
-
-			// the count of uncompleted subordinates
-			remaining = length !== 1 || ( subordinate && jQuery.isFunction( subordinate.promise ) ) ? length : 0,
-
-			// the master Deferred. If resolveValues consist of only a single Deferred, just use that.
-			deferred = remaining === 1 ? subordinate : jQuery.Deferred(),
-
-			// Update function for both resolve and progress values
-			updateFunc = function( i, contexts, values ) {
-				return function( value ) {
-					contexts[ i ] = this;
-					values[ i ] = arguments.length > 1 ? slice.call( arguments ) : value;
-					if ( values === progressValues ) {
-						deferred.notifyWith( contexts, values );
-					} else if ( !( --remaining ) ) {
-						deferred.resolveWith( contexts, values );
-					}
-				};
-			},
-
-			progressValues, progressContexts, resolveContexts;
-
-		// Add listeners to Deferred subordinates; treat others as resolved
-		if ( length > 1 ) {
-			progressValues = new Array( length );
-			progressContexts = new Array( length );
-			resolveContexts = new Array( length );
-			for ( ; i < length; i++ ) {
-				if ( resolveValues[ i ] && jQuery.isFunction( resolveValues[ i ].promise ) ) {
-					resolveValues[ i ].promise()
-						.done( updateFunc( i, resolveContexts, resolveValues ) )
-						.fail( deferred.reject )
-						.progress( updateFunc( i, progressContexts, progressValues ) );
-				} else {
-					--remaining;
-				}
-			}
-		}
-
-		// If we're not waiting on anything, resolve the master
-		if ( !remaining ) {
-			deferred.resolveWith( resolveContexts, resolveValues );
-		}
-
-		return deferred.promise();
-	}
-});
-
-
-// The deferred used on DOM ready
-var readyList;
-
-jQuery.fn.ready = function( fn ) {
-	// Add the callback
-	jQuery.ready.promise().done( fn );
-
-	return this;
-};
-
-jQuery.extend({
-	// Is the DOM ready to be used? Set to true once it occurs.
-	isReady: false,
-
-	// A counter to track how many items to wait for before
-	// the ready event fires. See #6781
-	readyWait: 1,
-
-	// Hold (or release) the ready event
-	holdReady: function( hold ) {
-		if ( hold ) {
-			jQuery.readyWait++;
-		} else {
-			jQuery.ready( true );
-		}
-	},
-
-	// Handle when the DOM is ready
-	ready: function( wait ) {
-
-		// Abort if there are pending holds or we're already ready
-		if ( wait === true ? --jQuery.readyWait : jQuery.isReady ) {
-			return;
-		}
-
-		// Remember that the DOM is ready
-		jQuery.isReady = true;
-
-		// If a normal DOM Ready event fired, decrement, and wait if need be
-		if ( wait !== true && --jQuery.readyWait > 0 ) {
-			return;
-		}
-
-		// If there are functions bound, to execute
-		readyList.resolveWith( document, [ jQuery ] );
-
-		// Trigger any bound ready events
-		if ( jQuery.fn.triggerHandler ) {
-			jQuery( document ).triggerHandler( "ready" );
-			jQuery( document ).off( "ready" );
-		}
-	}
-});
-
-/**
- * The ready event handler and self cleanup method
- */
-function completed() {
-	document.removeEventListener( "DOMContentLoaded", completed, false );
-	window.removeEventListener( "load", completed, false );
-	jQuery.ready();
-}
-
-jQuery.ready.promise = function( obj ) {
-	if ( !readyList ) {
-
-		readyList = jQuery.Deferred();
-
-		// Catch cases where $(document).ready() is called after the browser event has already occurred.
-		// We once tried to use readyState "interactive" here, but it caused issues like the one
-		// discovered by ChrisS here: http://bugs.jquery.com/ticket/12282#comment:15
-		if ( document.readyState === "complete" ) {
-			// Handle it asynchronously to allow scripts the opportunity to delay ready
-			setTimeout( jQuery.ready );
-
-		} else {
-
-			// Use the handy event callback
-			document.addEventListener( "DOMContentLoaded", completed, false );
-
-			// A fallback to window.onload, that will always work
-			window.addEventListener( "load", completed, false );
-		}
-	}
-	return readyList.promise( obj );
-};
-
-// Kick off the DOM ready check even if the user does not
-jQuery.ready.promise();
-
-
-
-
-// Multifunctional method to get and set values of a collection
-// The value/s can optionally be executed if it's a function
-var access = jQuery.access = function( elems, fn, key, value, chainable, emptyGet, raw ) {
-	var i = 0,
-		len = elems.length,
-		bulk = key == null;
-
-	// Sets many values
-	if ( jQuery.type( key ) === "object" ) {
-		chainable = true;
-		for ( i in key ) {
-			jQuery.access( elems, fn, i, key[i], true, emptyGet, raw );
-		}
-
-	// Sets one value
-	} else if ( value !== undefined ) {
-		chainable = true;
-
-		if ( !jQuery.isFunction( value ) ) {
-			raw = true;
-		}
-
-		if ( bulk ) {
-			// Bulk operations run against the entire set
-			if ( raw ) {
-				fn.call( elems, value );
-				fn = null;
-
-			// ...except when executing function values
-			} else {
-				bulk = fn;
-				fn = function( elem, key, value ) {
-					return bulk.call( jQuery( elem ), value );
-				};
-			}
-		}
-
-		if ( fn ) {
-			for ( ; i < len; i++ ) {
-				fn( elems[i], key, raw ? value : value.call( elems[i], i, fn( elems[i], key ) ) );
-			}
-		}
-	}
-
-	return chainable ?
-		elems :
-
-		// Gets
-		bulk ?
-			fn.call( elems ) :
-			len ? fn( elems[0], key ) : emptyGet;
-};
-
-
-/**
- * Determines whether an object can have data
- */
-jQuery.acceptData = function( owner ) {
-	// Accepts only:
-	//  - Node
-	//    - Node.ELEMENT_NODE
-	//    - Node.DOCUMENT_NODE
-	//  - Object
-	//    - Any
-	/* jshint -W018 */
-	return owner.nodeType === 1 || owner.nodeType === 9 || !( +owner.nodeType );
-};
-
-
-function Data() {
-	// Support: Android<4,
-	// Old WebKit does not have Object.preventExtensions/freeze method,
-	// return new empty object instead with no [[set]] accessor
-	Object.defineProperty( this.cache = {}, 0, {
-		get: function() {
-			return {};
-		}
-	});
-
-	this.expando = jQuery.expando + Data.uid++;
-}
-
-Data.uid = 1;
-Data.accepts = jQuery.acceptData;
-
-Data.prototype = {
-	key: function( owner ) {
-		// We can accept data for non-element nodes in modern browsers,
-		// but we should not, see #8335.
-		// Always return the key for a frozen object.
-		if ( !Data.accepts( owner ) ) {
-			return 0;
-		}
-
-		var descriptor = {},
-			// Check if the owner object already has a cache key
-			unlock = owner[ this.expando ];
-
-		// If not, create one
-		if ( !unlock ) {
-			unlock = Data.uid++;
-
-			// Secure it in a non-enumerable, non-writable property
-			try {
-				descriptor[ this.expando ] = { value: unlock };
-				Object.defineProperties( owner, descriptor );
-
-			// Support: Android<4
-			// Fallback to a less secure definition
-			} catch ( e ) {
-				descriptor[ this.expando ] = unlock;
-				jQuery.extend( owner, descriptor );
-			}
-		}
-
-		// Ensure the cache object
-		if ( !this.cache[ unlock ] ) {
-			this.cache[ unlock ] = {};
-		}
-
-		return unlock;
-	},
-	set: function( owner, data, value ) {
-		var prop,
-			// There may be an unlock assigned to this node,
-			// if there is no entry for this "owner", create one inline
-			// and set the unlock as though an owner entry had always existed
-			unlock = this.key( owner ),
-			cache = this.cache[ unlock ];
-
-		// Handle: [ owner, key, value ] args
-		if ( typeof data === "string" ) {
-			cache[ data ] = value;
-
-		// Handle: [ owner, { properties } ] args
-		} else {
-			// Fresh assignments by object are shallow copied
-			if ( jQuery.isEmptyObject( cache ) ) {
-				jQuery.extend( this.cache[ unlock ], data );
-			// Otherwise, copy the properties one-by-one to the cache object
-			} else {
-				for ( prop in data ) {
-					cache[ prop ] = data[ prop ];
-				}
-			}
-		}
-		return cache;
-	},
-	get: function( owner, key ) {
-		// Either a valid cache is found, or will be created.
-		// New caches will be created and the unlock returned,
-		// allowing direct access to the newly created
-		// empty data object. A valid owner object must be provided.
-		var cache = this.cache[ this.key( owner ) ];
-
-		return key === undefined ?
-			cache : cache[ key ];
-	},
-	access: function( owner, key, value ) {
-		var stored;
-		// In cases where either:
-		//
-		//   1. No key was specified
-		//   2. A string key was specified, but no value provided
-		//
-		// Take the "read" path and allow the get method to determine
-		// which value to return, respectively either:
-		//
-		//   1. The entire cache object
-		//   2. The data stored at the key
-		//
-		if ( key === undefined ||
-				((key && typeof key === "string") && value === undefined) ) {
-
-			stored = this.get( owner, key );
-
-			return stored !== undefined ?
-				stored : this.get( owner, jQuery.camelCase(key) );
-		}
-
-		// [*]When the key is not a string, or both a key and value
-		// are specified, set or extend (existing objects) with either:
-		//
-		//   1. An object of properties
-		//   2. A key and value
-		//
-		this.set( owner, key, value );
-
-		// Since the "set" path can have two possible entry points
-		// return the expected data based on which path was taken[*]
-		return value !== undefined ? value : key;
-	},
-	remove: function( owner, key ) {
-		var i, name, camel,
-			unlock = this.key( owner ),
-			cache = this.cache[ unlock ];
-
-		if ( key === undefined ) {
-			this.cache[ unlock ] = {};
-
-		} else {
-			// Support array or space separated string of keys
-			if ( jQuery.isArray( key ) ) {
-				// If "name" is an array of keys...
-				// When data is initially created, via ("key", "val") signature,
-				// keys will be converted to camelCase.
-				// Since there is no way to tell _how_ a key was added, remove
-				// both plain key and camelCase key. #12786
-				// This will only penalize the array argument path.
-				name = key.concat( key.map( jQuery.camelCase ) );
-			} else {
-				camel = jQuery.camelCase( key );
-				// Try the string as a key before any manipulation
-				if ( key in cache ) {
-					name = [ key, camel ];
-				} else {
-					// If a key with the spaces exists, use it.
-					// Otherwise, create an array by matching non-whitespace
-					name = camel;
-					name = name in cache ?
-						[ name ] : ( name.match( rnotwhite ) || [] );
-				}
-			}
-
-			i = name.length;
-			while ( i-- ) {
-				delete cache[ name[ i ] ];
-			}
-		}
-	},
-	hasData: function( owner ) {
-		return !jQuery.isEmptyObject(
-			this.cache[ owner[ this.expando ] ] || {}
-		);
-	},
-	discard: function( owner ) {
-		if ( owner[ this.expando ] ) {
-			delete this.cache[ owner[ this.expando ] ];
-		}
-	}
-};
-var data_priv = new Data();
-
-var data_user = new Data();
-
-
-
-//	Implementation Summary
-//
-//	1. Enforce API surface and semantic compatibility with 1.9.x branch
-//	2. Improve the module's maintainability by reducing the storage
-//		paths to a single mechanism.
-//	3. Use the same single mechanism to support "private" and "user" data.
-//	4. _Never_ expose "private" data to user code (TODO: Drop _data, _removeData)
-//	5. Avoid exposing implementation details on user objects (eg. expando properties)
-//	6. Provide a clear path for implementation upgrade to WeakMap in 2014
-
-var rbrace = /^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,
-	rmultiDash = /([A-Z])/g;
-
-function dataAttr( elem, key, data ) {
-	var name;
-
-	// If nothing was found internally, try to fetch any
-	// data from the HTML5 data-* attribute
-	if ( data === undefined && elem.nodeType === 1 ) {
-		name = "data-" + key.replace( rmultiDash, "-$1" ).toLowerCase();
-		data = elem.getAttribute( name );
-
-		if ( typeof data === "string" ) {
-			try {
-				data = data === "true" ? true :
-					data === "false" ? false :
-					data === "null" ? null :
-					// Only convert to a number if it doesn't change the string
-					+data + "" === data ? +data :
-					rbrace.test( data ) ? jQuery.parseJSON( data ) :
-					data;
-			} catch( e ) {}
-
-			// Make sure we set the data so it isn't changed later
-			data_user.set( elem, key, data );
-		} else {
-			data = undefined;
-		}
-	}
-	return data;
-}
-
-jQuery.extend({
-	hasData: function( elem ) {
-		return data_user.hasData( elem ) || data_priv.hasData( elem );
-	},
-
-	data: function( elem, name, data ) {
-		return data_user.access( elem, name, data );
-	},
-
-	removeData: function( elem, name ) {
-		data_user.remove( elem, name );
-	},
-
-	// TODO: Now that all calls to _data and _removeData have been replaced
-	// with direct calls to data_priv methods, these can be deprecated.
-	_data: function( elem, name, data ) {
-		return data_priv.access( elem, name, data );
-	},
-
-	_removeData: function( elem, name ) {
-		data_priv.remove( elem, name );
-	}
-});
-
-jQuery.fn.extend({
-	data: function( key, value ) {
-		var i, name, data,
-			elem = this[ 0 ],
-			attrs = elem && elem.attributes;
-
-		// Gets all values
-		if ( key === undefined ) {
-			if ( this.length ) {
-				data = data_user.get( elem );
-
-				if ( elem.nodeType === 1 && !data_priv.get( elem, "hasDataAttrs" ) ) {
-					i = attrs.length;
-					while ( i-- ) {
-
-						// Support: IE11+
-						// The attrs elements can be null (#14894)
-						if ( attrs[ i ] ) {
-							name = attrs[ i ].name;
-							if ( name.indexOf( "data-" ) === 0 ) {
-								name = jQuery.camelCase( name.slice(5) );
-								dataAttr( elem, name, data[ name ] );
-							}
-						}
-					}
-					data_priv.set( elem, "hasDataAttrs", true );
-				}
-			}
-
-			return data;
-		}
-
-		// Sets multiple values
-		if ( typeof key === "object" ) {
-			return this.each(function() {
-				data_user.set( this, key );
-			});
-		}
-
-		return access( this, function( value ) {
-			var data,
-				camelKey = jQuery.camelCase( key );
-
-			// The calling jQuery object (element matches) is not empty
-			// (and therefore has an element appears at this[ 0 ]) and the
-			// `value` parameter was not undefined. An empty jQuery object
-			// will result in `undefined` for elem = this[ 0 ] which will
-			// throw an exception if an attempt to read a data cache is made.
-			if ( elem && value === undefined ) {
-				// Attempt to get data from the cache
-				// with the key as-is
-				data = data_user.get( elem, key );
-				if ( data !== undefined ) {
-					return data;
-				}
-
-				// Attempt to get data from the cache
-				// with the key camelized
-				data = data_user.get( elem, camelKey );
-				if ( data !== undefined ) {
-					return data;
-				}
-
-				// Attempt to "discover" the data in
-				// HTML5 custom data-* attrs
-				data = dataAttr( elem, camelKey, undefined );
-				if ( data !== undefined ) {
-					return data;
-				}
-
-				// We tried really hard, but the data doesn't exist.
-				return;
-			}
-
-			// Set the data...
-			this.each(function() {
-				// First, attempt to store a copy or reference of any
-				// data that might've been store with a camelCased key.
-				var data = data_user.get( this, camelKey );
-
-				// For HTML5 data-* attribute interop, we have to
-				// store property names with dashes in a camelCase form.
-				// This might not apply to all properties...*
-				data_user.set( this, camelKey, value );
-
-				// *... In the case of properties that might _actually_
-				// have dashes, we need to also store a copy of that
-				// unchanged property.
-				if ( key.indexOf("-") !== -1 && data !== undefined ) {
-					data_user.set( this, key, value );
-				}
-			});
-		}, null, value, arguments.length > 1, null, true );
-	},
-
-	removeData: function( key ) {
-		return this.each(function() {
-			data_user.remove( this, key );
-		});
-	}
-});
-
-
-jQuery.extend({
-	queue: function( elem, type, data ) {
-		var queue;
-
-		if ( elem ) {
-			type = ( type || "fx" ) + "queue";
-			queue = data_priv.get( elem, type );
-
-			// Speed up dequeue by getting out quickly if this is just a lookup
-			if ( data ) {
-				if ( !queue || jQuery.isArray( data ) ) {
-					queue = data_priv.access( elem, type, jQuery.makeArray(data) );
-				} else {
-					queue.push( data );
-				}
-			}
-			return queue || [];
-		}
-	},
-
-	dequeue: function( elem, type ) {
-		type = type || "fx";
-
-		var queue = jQuery.queue( elem, type ),
-			startLength = queue.length,
-			fn = queue.shift(),
-			hooks = jQuery._queueHooks( elem, type ),
-			next = function() {
-				jQuery.dequeue( elem, type );
-			};
-
-		// If the fx queue is dequeued, always remove the progress sentinel
-		if ( fn === "inprogress" ) {
-			fn = queue.shift();
-			startLength--;
-		}
-
-		if ( fn ) {
-
-			// Add a progress sentinel to prevent the fx queue from being
-			// automatically dequeued
-			if ( type === "fx" ) {
-				queue.unshift( "inprogress" );
-			}
-
-			// Clear up the last queue stop function
-			delete hooks.stop;
-			fn.call( elem, next, hooks );
-		}
-
-		if ( !startLength && hooks ) {
-			hooks.empty.fire();
-		}
-	},
-
-	// Not public - generate a queueHooks object, or return the current one
-	_queueHooks: function( elem, type ) {
-		var key = type + "queueHooks";
-		return data_priv.get( elem, key ) || data_priv.access( elem, key, {
-			empty: jQuery.Callbacks("once memory").add(function() {
-				data_priv.remove( elem, [ type + "queue", key ] );
-			})
-		});
-	}
-});
-
-jQuery.fn.extend({
-	queue: function( type, data ) {
-		var setter = 2;
-
-		if ( typeof type !== "string" ) {
-			data = type;
-			type = "fx";
-			setter--;
-		}
-
-		if ( arguments.length < setter ) {
-			return jQuery.queue( this[0], type );
-		}
-
-		return data === undefined ?
-			this :
-			this.each(function() {
-				var queue = jQuery.queue( this, type, data );
-
-				// Ensure a hooks for this queue
-				jQuery._queueHooks( this, type );
-
-				if ( type === "fx" && queue[0] !== "inprogress" ) {
-					jQuery.dequeue( this, type );
-				}
-			});
-	},
-	dequeue: function( type ) {
-		return this.each(function() {
-			jQuery.dequeue( this, type );
-		});
-	},
-	clearQueue: function( type ) {
-		return this.queue( type || "fx", [] );
-	},
-	// Get a promise resolved when queues of a certain type
-	// are emptied (fx is the type by default)
-	promise: function( type, obj ) {
-		var tmp,
-			count = 1,
-			defer = jQuery.Deferred(),
-			elements = this,
-			i = this.length,
-			resolve = function() {
-				if ( !( --count ) ) {
-					defer.resolveWith( elements, [ elements ] );
-				}
-			};
-
-		if ( typeof type !== "string" ) {
-			obj = type;
-			type = undefined;
-		}
-		type = type || "fx";
-
-		while ( i-- ) {
-			tmp = data_priv.get( elements[ i ], type + "queueHooks" );
-			if ( tmp && tmp.empty ) {
-				count++;
-				tmp.empty.add( resolve );
-			}
-		}
-		resolve();
-		return defer.promise( obj );
-	}
-});
-var pnum = (/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/).source;
-
-var cssExpand = [ "Top", "Right", "Bottom", "Left" ];
-
-var isHidden = function( elem, el ) {
-		// isHidden might be called from jQuery#filter function;
-		// in that case, element will be second argument
-		elem = el || elem;
-		return jQuery.css( elem, "display" ) === "none" || !jQuery.contains( elem.ownerDocument, elem );
-	};
-
-var rcheckableType = (/^(?:checkbox|radio)$/i);
-
-
-
-(function() {
-	var fragment = document.createDocumentFragment(),
-		div = fragment.appendChild( document.createElement( "div" ) ),
-		input = document.createElement( "input" );
-
-	// Support: Safari<=5.1
-	// Check state lost if the name is set (#11217)
-	// Support: Windows Web Apps (WWA)
-	// `name` and `type` must use .setAttribute for WWA (#14901)
-	input.setAttribute( "type", "radio" );
-	input.setAttribute( "checked", "checked" );
-	input.setAttribute( "name", "t" );
-
-	div.appendChild( input );
-
-	// Support: Safari<=5.1, Android<4.2
-	// Older WebKit doesn't clone checked state correctly in fragments
-	support.checkClone = div.cloneNode( true ).cloneNode( true ).lastChild.checked;
-
-	// Support: IE<=11+
-	// Make sure textarea (and checkbox) defaultValue is properly cloned
-	div.innerHTML = "<textarea>x</textarea>";
-	support.noCloneChecked = !!div.cloneNode( true ).lastChild.defaultValue;
-})();
-var strundefined = typeof undefined;
-
-
-
-support.focusinBubbles = "onfocusin" in window;
-
-
-var
-	rkeyEvent = /^key/,
-	rmouseEvent = /^(?:mouse|pointer|contextmenu)|click/,
-	rfocusMorph = /^(?:focusinfocus|focusoutblur)$/,
-	rtypenamespace = /^([^.]*)(?:\.(.+)|)$/;
-
-function returnTrue() {
-	return true;
-}
-
-function returnFalse() {
-	return false;
-}
-
-function safeActiveElement() {
-	try {
-		return document.activeElement;
-	} catch ( err ) { }
-}
-
-/*
- * Helper functions for managing events -- not part of the public interface.
- * Props to Dean Edwards' addEvent library for many of the ideas.
- */
-jQuery.event = {
-
-	global: {},
-
-	add: function( elem, types, handler, data, selector ) {
-
-		var handleObjIn, eventHandle, tmp,
-			events, t, handleObj,
-			special, handlers, type, namespaces, origType,
-			elemData = data_priv.get( elem );
-
-		// Don't attach events to noData or text/comment nodes (but allow plain objects)
-		if ( !elemData ) {
-			return;
-		}
-
-		// Caller can pass in an object of custom data in lieu of the handler
-		if ( handler.handler ) {
-			handleObjIn = handler;
-			handler = handleObjIn.handler;
-			selector = handleObjIn.selector;
-		}
-
-		// Make sure that the handler has a unique ID, used to find/remove it later
-		if ( !handler.guid ) {
-			handler.guid = jQuery.guid++;
-		}
-
-		// Init the element's event structure and main handler, if this is the first
-		if ( !(events = elemData.events) ) {
-			events = elemData.events = {};
-		}
-		if ( !(eventHandle = elemData.handle) ) {
-			eventHandle = elemData.handle = function( e ) {
-				// Discard the second event of a jQuery.event.trigger() and
-				// when an event is called after a page has unloaded
-				return typeof jQuery !== strundefined && jQuery.event.triggered !== e.type ?
-					jQuery.event.dispatch.apply( elem, arguments ) : undefined;
-			};
-		}
-
-		// Handle multiple events separated by a space
-		types = ( types || "" ).match( rnotwhite ) || [ "" ];
-		t = types.length;
-		while ( t-- ) {
-			tmp = rtypenamespace.exec( types[t] ) || [];
-			type = origType = tmp[1];
-			namespaces = ( tmp[2] || "" ).split( "." ).sort();
-
-			// There *must* be a type, no attaching namespace-only handlers
-			if ( !type ) {
-				continue;
-			}
-
-			// If event changes its type, use the special event handlers for the changed type
-			special = jQuery.event.special[ type ] || {};
-
-			// If selector defined, determine special event api type, otherwise given type
-			type = ( selector ? special.delegateType : special.bindType ) || type;
-
-			// Update special based on newly reset type
-			special = jQuery.event.special[ type ] || {};
-
-			// handleObj is passed to all event handlers
-			handleObj = jQuery.extend({
-				type: type,
-				origType: origType,
-				data: data,
-				handler: handler,
-				guid: handler.guid,
-				selector: selector,
-				needsContext: selector && jQuery.expr.match.needsContext.test( selector ),
-				namespace: namespaces.join(".")
-			}, handleObjIn );
-
-			// Init the event handler queue if we're the first
-			if ( !(handlers = events[ type ]) ) {
-				handlers = events[ type ] = [];
-				handlers.delegateCount = 0;
-
-				// Only use addEventListener if the special events handler returns false
-				if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) {
-					if ( elem.addEventListener ) {
-						elem.addEventListener( type, eventHandle, false );
-					}
-				}
-			}
-
-			if ( special.add ) {
-				special.add.call( elem, handleObj );
-
-				if ( !handleObj.handler.guid ) {
-					handleObj.handler.guid = handler.guid;
-				}
-			}
-
-			// Add to the element's handler list, delegates in front
-			if ( selector ) {
-				handlers.splice( handlers.delegateCount++, 0, handleObj );
-			} else {
-				handlers.push( handleObj );
-			}
-
-			// Keep track of which events have ever been used, for event optimization
-			jQuery.event.global[ type ] = true;
-		}
-
-	},
-
-	// Detach an event or set of events from an element
-	remove: function( elem, types, handler, selector, mappedTypes ) {
-
-		var j, origCount, tmp,
-			events, t, handleObj,
-			special, handlers, type, namespaces, origType,
-			elemData = data_priv.hasData( elem ) && data_priv.get( elem );
-
-		if ( !elemData || !(events = elemData.events) ) {
-			return;
-		}
-
-		// Once for each type.namespace in types; type may be omitted
-		types = ( types || "" ).match( rnotwhite ) || [ "" ];
-		t = types.length;
-		while ( t-- ) {
-			tmp = rtypenamespace.exec( types[t] ) || [];
-			type = origType = tmp[1];
-			namespaces = ( tmp[2] || "" ).split( "." ).sort();
-
-			// Unbind all events (on this namespace, if provided) for the element
-			if ( !type ) {
-				for ( type in events ) {
-					jQuery.event.remove( elem, type + types[ t ], handler, selector, true );
-				}
-				continue;
-			}
-
-			special = jQuery.event.special[ type ] || {};
-			type = ( selector ? special.delegateType : special.bindType ) || type;
-			handlers = events[ type ] || [];
-			tmp = tmp[2] && new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" );
-
-			// Remove matching events
-			origCount = j = handlers.length;
-			while ( j-- ) {
-				handleObj = handlers[ j ];
-
-				if ( ( mappedTypes || origType === handleObj.origType ) &&
-					( !handler || handler.guid === handleObj.guid ) &&
-					( !tmp || tmp.test( handleObj.namespace ) ) &&
-					( !selector || selector === handleObj.selector || selector === "**" && handleObj.selector ) ) {
-					handlers.splice( j, 1 );
-
-					if ( handleObj.selector ) {
-						handlers.delegateCount--;
-					}
-					if ( special.remove ) {
-						special.remove.call( elem, handleObj );
-					}
-				}
-			}
-
-			// Remove generic event handler if we removed something and no more handlers exist
-			// (avoids potential for endless recursion during removal of special event handlers)
-			if ( origCount && !handlers.length ) {
-				if ( !special.teardown || special.teardown.call( elem, namespaces, elemData.handle ) === false ) {
-					jQuery.removeEvent( elem, type, elemData.handle );
-				}
-
-				delete events[ type ];
-			}
-		}
-
-		// Remove the expando if it's no longer used
-		if ( jQuery.isEmptyObject( events ) ) {
-			delete elemData.handle;
-			data_priv.remove( elem, "events" );
-		}
-	},
-
-	trigger: function( event, data, elem, onlyHandlers ) {
-
-		var i, cur, tmp, bubbleType, ontype, handle, special,
-			eventPath = [ elem || document ],
-			type = hasOwn.call( event, "type" ) ? event.type : event,
-			namespaces = hasOwn.call( event, "namespace" ) ? event.namespace.split(".") : [];
-
-		cur = tmp = elem = elem || document;
-
-		// Don't do events on text and comment nodes
-		if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
-			return;
-		}
-
-		// focus/blur morphs to focusin/out; ensure we're not firing them right now
-		if ( rfocusMorph.test( type + jQuery.event.triggered ) ) {
-			return;
-		}
-
-		if ( type.indexOf(".") >= 0 ) {
-			// Namespaced trigger; create a regexp to match event type in handle()
-			namespaces = type.split(".");
-			type = namespaces.shift();
-			namespaces.sort();
-		}
-		ontype = type.indexOf(":") < 0 && "on" + type;
-
-		// Caller can pass in a jQuery.Event object, Object, or just an event type string
-		event = event[ jQuery.expando ] ?
-			event :
-			new jQuery.Event( type, typeof event === "object" && event );
-
-		// Trigger bitmask: & 1 for native handlers; & 2 for jQuery (always true)
-		event.isTrigger = onlyHandlers ? 2 : 3;
-		event.namespace = namespaces.join(".");
-		event.namespace_re = event.namespace ?
-			new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" ) :
-			null;
-
-		// Clean up the event in case it is being reused
-		event.result = undefined;
-		if ( !event.target ) {
-			event.target = elem;
-		}
-
-		// Clone any incoming data and prepend the event, creating the handler arg list
-		data = data == null ?
-			[ event ] :
-			jQuery.makeArray( data, [ event ] );
-
-		// Allow special events to draw outside the lines
-		special = jQuery.event.special[ type ] || {};
-		if ( !onlyHandlers && special.trigger && special.trigger.apply( elem, data ) === false ) {
-			return;
-		}
-
-		// Determine event propagation path in advance, per W3C events spec (#9951)
-		// Bubble up to document, then to window; watch for a global ownerDocument var (#9724)
-		if ( !onlyHandlers && !special.noBubble && !jQuery.isWindow( elem ) ) {
-
-			bubbleType = special.delegateType || type;
-			if ( !rfocusMorph.test( bubbleType + type ) ) {
-				cur = cur.parentNode;
-			}
-			for ( ; cur; cur = cur.parentNode ) {
-				eventPath.push( cur );
-				tmp = cur;
-			}
-
-			// Only add window if we got to document (e.g., not plain obj or detached DOM)
-			if ( tmp === (elem.ownerDocument || document) ) {
-				eventPath.push( tmp.defaultView || tmp.parentWindow || window );
-			}
-		}
-
-		// Fire handlers on the event path
-		i = 0;
-		while ( (cur = eventPath[i++]) && !event.isPropagationStopped() ) {
-
-			event.type = i > 1 ?
-				bubbleType :
-				special.bindType || type;
-
-			// jQuery handler
-			handle = ( data_priv.get( cur, "events" ) || {} )[ event.type ] && data_priv.get( cur, "handle" );
-			if ( handle ) {
-				handle.apply( cur, data );
-			}
-
-			// Native handler
-			handle = ontype && cur[ ontype ];
-			if ( handle && handle.apply && jQuery.acceptData( cur ) ) {
-				event.result = handle.apply( cur, data );
-				if ( event.result === false ) {
-					event.preventDefault();
-				}
-			}
-		}
-		event.type = type;
-
-		// If nobody prevented the default action, do it now
-		if ( !onlyHandlers && !event.isDefaultPrevented() ) {
-
-			if ( (!special._default || special._default.apply( eventPath.pop(), data ) === false) &&
-				jQuery.acceptData( elem ) ) {
-
-				// Call a native DOM method on the target with the same name name as the event.
-				// Don't do default actions on window, that's where global variables be (#6170)
-				if ( ontype && jQuery.isFunction( elem[ type ] ) && !jQuery.isWindow( elem ) ) {
-
-					// Don't re-trigger an onFOO event when we call its FOO() method
-					tmp = elem[ ontype ];
-
-					if ( tmp ) {
-						elem[ ontype ] = null;
-					}
-
-					// Prevent re-triggering of the same event, since we already bubbled it above
-					jQuery.event.triggered = type;
-					elem[ type ]();
-					jQuery.event.triggered = undefined;
-
-					if ( tmp ) {
-						elem[ ontype ] = tmp;
-					}
-				}
-			}
-		}
-
-		return event.result;
-	},
-
-	dispatch: function( event ) {
-
-		// Make a writable jQuery.Event from the native event object
-		event = jQuery.event.fix( event );
-
-		var i, j, ret, matched, handleObj,
-			handlerQueue = [],
-			args = slice.call( arguments ),
-			handlers = ( data_priv.get( this, "events" ) || {} )[ event.type ] || [],
-			special = jQuery.event.special[ event.type ] || {};
-
-		// Use the fix-ed jQuery.Event rather than the (read-only) native event
-		args[0] = event;
-		event.delegateTarget = this;
-
-		// Call the preDispatch hook for the mapped type, and let it bail if desired
-		if ( special.preDispatch && special.preDispatch.call( this, event ) === false ) {
-			return;
-		}
-
-		// Determine handlers
-		handlerQueue = jQuery.event.handlers.call( this, event, handlers );
-
-		// Run delegates first; they may want to stop propagation beneath us
-		i = 0;
-		while ( (matched = handlerQueue[ i++ ]) && !event.isPropagationStopped() ) {
-			event.currentTarget = matched.elem;
-
-			j = 0;
-			while ( (handleObj = matched.handlers[ j++ ]) && !event.isImmediatePropagationStopped() ) {
-
-				// Triggered event must either 1) have no namespace, or 2) have namespace(s)
-				// a subset or equal to those in the bound event (both can have no namespace).
-				if ( !event.namespace_re || event.namespace_re.test( handleObj.namespace ) ) {
-
-					event.handleObj = handleObj;
-					event.data = handleObj.data;
-
-					ret = ( (jQuery.event.special[ handleObj.origType ] || {}).handle || handleObj.handler )
-							.apply( matched.elem, args );
-
-					if ( ret !== undefined ) {
-						if ( (event.result = ret) === false ) {
-							event.preventDefault();
-							event.stopPropagation();
-						}
-					}
-				}
-			}
-		}
-
-		// Call the postDispatch hook for the mapped type
-		if ( special.postDispatch ) {
-			special.postDispatch.call( this, event );
-		}
-
-		return event.result;
-	},
-
-	handlers: function( event, handlers ) {
-		var i, matches, sel, handleObj,
-			handlerQueue = [],
-			delegateCount = handlers.delegateCount,
-			cur = event.target;
-
-		// Find delegate handlers
-		// Black-hole SVG <use> instance trees (#13180)
-		// Avoid non-left-click bubbling in Firefox (#3861)
-		if ( delegateCount && cur.nodeType && (!event.button || event.type !== "click") ) {
-
-			for ( ; cur !== this; cur = cur.parentNode || this ) {
-
-				// Don't process clicks on disabled elements (#6911, #8165, #11382, #11764)
-				if ( cur.disabled !== true || event.type !== "click" ) {
-					matches = [];
-					for ( i = 0; i < delegateCount; i++ ) {
-						handleObj = handlers[ i ];
-
-						// Don't conflict with Object.prototype properties (#13203)
-						sel = handleObj.selector + " ";
-
-						if ( matches[ sel ] === undefined ) {
-							matches[ sel ] = handleObj.needsContext ?
-								jQuery( sel, this ).index( cur ) >= 0 :
-								jQuery.find( sel, this, null, [ cur ] ).length;
-						}
-						if ( matches[ sel ] ) {
-							matches.push( handleObj );
-						}
-					}
-					if ( matches.length ) {
-						handlerQueue.push({ elem: cur, handlers: matches });
-					}
-				}
-			}
-		}
-
-		// Add the remaining (directly-bound) handlers
-		if ( delegateCount < handlers.length ) {
-			handlerQueue.push({ elem: this, handlers: handlers.slice( delegateCount ) });
-		}
-
-		return handlerQueue;
-	},
-
-	// Includes some event props shared by KeyEvent and MouseEvent
-	props: "altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),
-
-	fixHooks: {},
-
-	keyHooks: {
-		props: "char charCode key keyCode".split(" "),
-		filter: function( event, original ) {
-
-			// Add which for key events
-			if ( event.which == null ) {
-				event.which = original.charCode != null ? original.charCode : original.keyCode;
-			}
-
-			return event;
-		}
-	},
-
-	mouseHooks: {
-		props: "button buttons clientX clientY offsetX offsetY pageX pageY screenX screenY toElement".split(" "),
-		filter: function( event, original ) {
-			var eventDoc, doc, body,
-				button = original.button;
-
-			// Calculate pageX/Y if missing and clientX/Y available
-			if ( event.pageX == null && original.clientX != null ) {
-				eventDoc = event.target.ownerDocument || document;
-				doc = eventDoc.documentElement;
-				body = eventDoc.body;
-
-				event.pageX = original.clientX + ( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) - ( doc && doc.clientLeft || body && body.clientLeft || 0 );
-				event.pageY = original.clientY + ( doc && doc.scrollTop  || body && body.scrollTop  || 0 ) - ( doc && doc.clientTop  || body && body.clientTop  || 0 );
-			}
-
-			// Add which for click: 1 === left; 2 === middle; 3 === right
-			// Note: button is not normalized, so don't use it
-			if ( !event.which && button !== undefined ) {
-				event.which = ( button & 1 ? 1 : ( button & 2 ? 3 : ( button & 4 ? 2 : 0 ) ) );
-			}
-
-			return event;
-		}
-	},
-
-	fix: function( event ) {
-		if ( event[ jQuery.expando ] ) {
-			return event;
-		}
-
-		// Create a writable copy of the event object and normalize some properties
-		var i, prop, copy,
-			type = event.type,
-			originalEvent = event,
-			fixHook = this.fixHooks[ type ];
-
-		if ( !fixHook ) {
-			this.fixHooks[ type ] = fixHook =
-				rmouseEvent.test( type ) ? this.mouseHooks :
-				rkeyEvent.test( type ) ? this.keyHooks :
-				{};
-		}
-		copy = fixHook.props ? this.props.concat( fixHook.props ) : this.props;
-
-		event = new jQuery.Event( originalEvent );
-
-		i = copy.length;
-		while ( i-- ) {
-			prop = copy[ i ];
-			event[ prop ] = originalEvent[ prop ];
-		}
-
-		// Support: Cordova 2.5 (WebKit) (#13255)
-		// All events should have a target; Cordova deviceready doesn't
-		if ( !event.target ) {
-			event.target = document;
-		}
-
-		// Support: Safari 6.0+, Chrome<28
-		// Target should not be a text node (#504, #13143)
-		if ( event.target.nodeType === 3 ) {
-			event.target = event.target.parentNode;
-		}
-
-		return fixHook.filter ? fixHook.filter( event, originalEvent ) : event;
-	},
-
-	special: {
-		load: {
-			// Prevent triggered image.load events from bubbling to window.load
-			noBubble: true
-		},
-		focus: {
-			// Fire native event if possible so blur/focus sequence is correct
-			trigger: function() {
-				if ( this !== safeActiveElement() && this.focus ) {
-					this.focus();
-					return false;
-				}
-			},
-			delegateType: "focusin"
-		},
-		blur: {
-			trigger: function() {
-				if ( this === safeActiveElement() && this.blur ) {
-					this.blur();
-					return false;
-				}
-			},
-			delegateType: "focusout"
-		},
-		click: {
-			// For checkbox, fire native event so checked state will be right
-			trigger: function() {
-				if ( this.type === "checkbox" && this.click && jQuery.nodeName( this, "input" ) ) {
-					this.click();
-					return false;
-				}
-			},
-
-			// For cross-browser consistency, don't fire native .click() on links
-			_default: function( event ) {
-				return jQuery.nodeName( event.target, "a" );
-			}
-		},
-
-		beforeunload: {
-			postDispatch: function( event ) {
-
-				// Support: Firefox 20+
-				// Firefox doesn't alert if the returnValue field is not set.
-				if ( event.result !== undefined && event.originalEvent ) {
-					event.originalEvent.returnValue = event.result;
-				}
-			}
-		}
-	},
-
-	simulate: function( type, elem, event, bubble ) {
-		// Piggyback on a donor event to simulate a different one.
-		// Fake originalEvent to avoid donor's stopPropagation, but if the
-		// simulated event prevents default then we do the same on the donor.
-		var e = jQuery.extend(
-			new jQuery.Event(),
-			event,
-			{
-				type: type,
-				isSimulated: true,
-				originalEvent: {}
-			}
-		);
-		if ( bubble ) {
-			jQuery.event.trigger( e, null, elem );
-		} else {
-			jQuery.event.dispatch.call( elem, e );
-		}
-		if ( e.isDefaultPrevented() ) {
-			event.preventDefault();
-		}
-	}
-};
-
-jQuery.removeEvent = function( elem, type, handle ) {
-	if ( elem.removeEventListener ) {
-		elem.removeEventListener( type, handle, false );
-	}
-};
-
-jQuery.Event = function( src, props ) {
-	// Allow instantiation without the 'new' keyword
-	if ( !(this instanceof jQuery.Event) ) {
-		return new jQuery.Event( src, props );
-	}
-
-	// Event object
-	if ( src && src.type ) {
-		this.originalEvent = src;
-		this.type = src.type;
-
-		// Events bubbling up the document may have been marked as prevented
-		// by a handler lower down the tree; reflect the correct value.
-		this.isDefaultPrevented = src.defaultPrevented ||
-				src.defaultPrevented === undefined &&
-				// Support: Android<4.0
-				src.returnValue === false ?
-			returnTrue :
-			returnFalse;
-
-	// Event type
-	} else {
-		this.type = src;
-	}
-
-	// Put explicitly provided properties onto the event object
-	if ( props ) {
-		jQuery.extend( this, props );
-	}
-
-	// Create a timestamp if incoming event doesn't have one
-	this.timeStamp = src && src.timeStamp || jQuery.now();
-
-	// Mark it as fixed
-	this[ jQuery.expando ] = true;
-};
-
-// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding
-// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
-jQuery.Event.prototype = {
-	isDefaultPrevented: returnFalse,
-	isPropagationStopped: returnFalse,
-	isImmediatePropagationStopped: returnFalse,
-
-	preventDefault: function() {
-		var e = this.originalEvent;
-
-		this.isDefaultPrevented = returnTrue;
-
-		if ( e && e.preventDefault ) {
-			e.preventDefault();
-		}
-	},
-	stopPropagation: function() {
-		var e = this.originalEvent;
-
-		this.isPropagationStopped = returnTrue;
-
-		if ( e && e.stopPropagation ) {
-			e.stopPropagation();
-		}
-	},
-	stopImmediatePropagation: function() {
-		var e = this.originalEvent;
-
-		this.isImmediatePropagationStopped = returnTrue;
-
-		if ( e && e.stopImmediatePropagation ) {
-			e.stopImmediatePropagation();
-		}
-
-		this.stopPropagation();
-	}
-};
-
-// Create mouseenter/leave events using mouseover/out and event-time checks
-// Support: Chrome 15+
-jQuery.each({
-	mouseenter: "mouseover",
-	mouseleave: "mouseout",
-	pointerenter: "pointerover",
-	pointerleave: "pointerout"
-}, function( orig, fix ) {
-	jQuery.event.special[ orig ] = {
-		delegateType: fix,
-		bindType: fix,
-
-		handle: function( event ) {
-			var ret,
-				target = this,
-				related = event.relatedTarget,
-				handleObj = event.handleObj;
-
-			// For mousenter/leave call the handler if related is outside the target.
-			// NB: No relatedTarget if the mouse left/entered the browser window
-			if ( !related || (related !== target && !jQuery.contains( target, related )) ) {
-				event.type = handleObj.origType;
-				ret = handleObj.handler.apply( this, arguments );
-				event.type = fix;
-			}
-			return ret;
-		}
-	};
-});
-
-// Support: Firefox, Chrome, Safari
-// Create "bubbling" focus and blur events
-if ( !support.focusinBubbles ) {
-	jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) {
-
-		// Attach a single capturing handler on the document while someone wants focusin/focusout
-		var handler = function( event ) {
-				jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ), true );
-			};
-
-		jQuery.event.special[ fix ] = {
-			setup: function() {
-				var doc = this.ownerDocument || this,
-					attaches = data_priv.access( doc, fix );
-
-				if ( !attaches ) {
-					doc.addEventListener( orig, handler, true );
-				}
-				data_priv.access( doc, fix, ( attaches || 0 ) + 1 );
-			},
-			teardown: function() {
-				var doc = this.ownerDocument || this,
-					attaches = data_priv.access( doc, fix ) - 1;
-
-				if ( !attaches ) {
-					doc.removeEventListener( orig, handler, true );
-					data_priv.remove( doc, fix );
-
-				} else {
-					data_priv.access( doc, fix, attaches );
-				}
-			}
-		};
-	});
-}
-
-jQuery.fn.extend({
-
-	on: function( types, selector, data, fn, /*INTERNAL*/ one ) {
-		var origFn, type;
-
-		// Types can be a map of types/handlers
-		if ( typeof types === "object" ) {
-			// ( types-Object, selector, data )
-			if ( typeof selector !== "string" ) {
-				// ( types-Object, data )
-				data = data || selector;
-				selector = undefined;
-			}
-			for ( type in types ) {
-				this.on( type, selector, data, types[ type ], one );
-			}
-			return this;
-		}
-
-		if ( data == null && fn == null ) {
-			// ( types, fn )
-			fn = selector;
-			data = selector = undefined;
-		} else if ( fn == null ) {
-			if ( typeof selector === "string" ) {
-				// ( types, selector, fn )
-				fn = data;
-				data = undefined;
-			} else {
-				// ( types, data, fn )
-				fn = data;
-				data = selector;
-				selector = undefined;
-			}
-		}
-		if ( fn === false ) {
-			fn = returnFalse;
-		} else if ( !fn ) {
-			return this;
-		}
-
-		if ( one === 1 ) {
-			origFn = fn;
-			fn = function( event ) {
-				// Can use an empty set, since event contains the info
-				jQuery().off( event );
-				return origFn.apply( this, arguments );
-			};
-			// Use same guid so caller can remove using origFn
-			fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ );
-		}
-		return this.each( function() {
-			jQuery.event.add( this, types, fn, data, selector );
-		});
-	},
-	one: function( types, selector, data, fn ) {
-		return this.on( types, selector, data, fn, 1 );
-	},
-	off: function( types, selector, fn ) {
-		var handleObj, type;
-		if ( types && types.preventDefault && types.handleObj ) {
-			// ( event )  dispatched jQuery.Event
-			handleObj = types.handleObj;
-			jQuery( types.delegateTarget ).off(
-				handleObj.namespace ? handleObj.origType + "." + handleObj.namespace : handleObj.origType,
-				handleObj.selector,
-				handleObj.handler
-			);
-			return this;
-		}
-		if ( typeof types === "object" ) {
-			// ( types-object [, selector] )
-			for ( type in types ) {
-				this.off( type, selector, types[ type ] );
-			}
-			return this;
-		}
-		if ( selector === false || typeof selector === "function" ) {
-			// ( types [, fn] )
-			fn = selector;
-			selector = undefined;
-		}
-		if ( fn === false ) {
-			fn = returnFalse;
-		}
-		return this.each(function() {
-			jQuery.event.remove( this, types, fn, selector );
-		});
-	},
-
-	trigger: function( type, data ) {
-		return this.each(function() {
-			jQuery.event.trigger( type, data, this );
-		});
-	},
-	triggerHandler: function( type, data ) {
-		var elem = this[0];
-		if ( elem ) {
-			return jQuery.event.trigger( type, data, elem, true );
-		}
-	}
-});
-
-
-var
-	rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,
-	rtagName = /<([\w:]+)/,
-	rhtml = /<|&#?\w+;/,
-	rnoInnerhtml = /<(?:script|style|link)/i,
-	// checked="checked" or checked
-	rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,
-	rscriptType = /^$|\/(?:java|ecma)script/i,
-	rscriptTypeMasked = /^true\/(.*)/,
-	rcleanScript = /^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,
-
-	// We have to close these tags to support XHTML (#13200)
-	wrapMap = {
-
-		// Support: IE9
-		option: [ 1, "<select multiple='multiple'>", "</select>" ],
-
-		thead: [ 1, "<table>", "</table>" ],
-		col: [ 2, "<table><colgroup>", "</colgroup></table>" ],
-		tr: [ 2, "<table><tbody>", "</tbody></table>" ],
-		td: [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ],
-
-		_default: [ 0, "", "" ]
-	};
-
-// Support: IE9
-wrapMap.optgroup = wrapMap.option;
-
-wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
-wrapMap.th = wrapMap.td;
-
-// Support: 1.x compatibility
-// Manipulating tables requires a tbody
-function manipulationTarget( elem, content ) {
-	return jQuery.nodeName( elem, "table" ) &&
-		jQuery.nodeName( content.nodeType !== 11 ? content : content.firstChild, "tr" ) ?
-
-		elem.getElementsByTagName("tbody")[0] ||
-			elem.appendChild( elem.ownerDocument.createElement("tbody") ) :
-		elem;
-}
-
-// Replace/restore the type attribute of script elements for safe DOM manipulation
-function disableScript( elem ) {
-	elem.type = (elem.getAttribute("type") !== null) + "/" + elem.type;
-	return elem;
-}
-function restoreScript( elem ) {
-	var match = rscriptTypeMasked.exec( elem.type );
-
-	if ( match ) {
-		elem.type = match[ 1 ];
-	} else {
-		elem.removeAttribute("type");
-	}
-
-	return elem;
-}
-
-// Mark scripts as having already been evaluated
-function setGlobalEval( elems, refElements ) {
-	var i = 0,
-		l = elems.length;
-
-	for ( ; i < l; i++ ) {
-		data_priv.set(
-			elems[ i ], "globalEval", !refElements || data_priv.get( refElements[ i ], "globalEval" )
-		);
-	}
-}
-
-function cloneCopyEvent( src, dest ) {
-	var i, l, type, pdataOld, pdataCur, udataOld, udataCur, events;
-
-	if ( dest.nodeType !== 1 ) {
-		return;
-	}
-
-	// 1. Copy private data: events, handlers, etc.
-	if ( data_priv.hasData( src ) ) {
-		pdataOld = data_priv.access( src );
-		pdataCur = data_priv.set( dest, pdataOld );
-		events = pdataOld.events;
-
-		if ( events ) {
-			delete pdataCur.handle;
-			pdataCur.events = {};
-
-			for ( type in events ) {
-				for ( i = 0, l = events[ type ].length; i < l; i++ ) {
-					jQuery.event.add( dest, type, events[ type ][ i ] );
-				}
-			}
-		}
-	}
-
-	// 2. Copy user data
-	if ( data_user.hasData( src ) ) {
-		udataOld = data_user.access( src );
-		udataCur = jQuery.extend( {}, udataOld );
-
-		data_user.set( dest, udataCur );
-	}
-}
-
-function getAll( context, tag ) {
-	var ret = context.getElementsByTagName ? context.getElementsByTagName( tag || "*" ) :
-			context.querySelectorAll ? context.querySelectorAll( tag || "*" ) :
-			[];
-
-	return tag === undefined || tag && jQuery.nodeName( context, tag ) ?
-		jQuery.merge( [ context ], ret ) :
-		ret;
-}
-
-// Fix IE bugs, see support tests
-function fixInput( src, dest ) {
-	var nodeName = dest.nodeName.toLowerCase();
-
-	// Fails to persist the checked state of a cloned checkbox or radio button.
-	if ( nodeName === "input" && rcheckableType.test( src.type ) ) {
-		dest.checked = src.checked;
-
-	// Fails to return the selected option to the default selected state when cloning options
-	} else if ( nodeName === "input" || nodeName === "textarea" ) {
-		dest.defaultValue = src.defaultValue;
-	}
-}
-
-jQuery.extend({
-	clone: function( elem, dataAndEvents, deepDataAndEvents ) {
-		var i, l, srcElements, destElements,
-			clone = elem.cloneNode( true ),
-			inPage = jQuery.contains( elem.ownerDocument, elem );
-
-		// Fix IE cloning issues
-		if ( !support.noCloneChecked && ( elem.nodeType === 1 || elem.nodeType === 11 ) &&
-				!jQuery.isXMLDoc( elem ) ) {
-
-			// We eschew Sizzle here for performance reasons: http://jsperf.com/getall-vs-sizzle/2
-			destElements = getAll( clone );
-			srcElements = getAll( elem );
-
-			for ( i = 0, l = srcElements.length; i < l; i++ ) {
-				fixInput( srcElements[ i ], destElements[ i ] );
-			}
-		}
-
-		// Copy the events from the original to the clone
-		if ( dataAndEvents ) {
-			if ( deepDataAndEvents ) {
-				srcElements = srcElements || getAll( elem );
-				destElements = destElements || getAll( clone );
-
-				for ( i = 0, l = srcElements.length; i < l; i++ ) {
-					cloneCopyEvent( srcElements[ i ], destElements[ i ] );
-				}
-			} else {
-				cloneCopyEvent( elem, clone );
-			}
-		}
-
-		// Preserve script evaluation history
-		destElements = getAll( clone, "script" );
-		if ( destElements.length > 0 ) {
-			setGlobalEval( destElements, !inPage && getAll( elem, "script" ) );
-		}
-
-		// Return the cloned set
-		return clone;
-	},
-
-	buildFragment: function( elems, context, scripts, selection ) {
-		var elem, tmp, tag, wrap, contains, j,
-			fragment = context.createDocumentFragment(),
-			nodes = [],
-			i = 0,
-			l = elems.length;
-
-		for ( ; i < l; i++ ) {
-			elem = elems[ i ];
-
-			if ( elem || elem === 0 ) {
-
-				// Add nodes directly
-				if ( jQuery.type( elem ) === "object" ) {
-					// Support: QtWebKit, PhantomJS
-					// push.apply(_, arraylike) throws on ancient WebKit
-					jQuery.merge( nodes, elem.nodeType ? [ elem ] : elem );
-
-				// Convert non-html into a text node
-				} else if ( !rhtml.test( elem ) ) {
-					nodes.push( context.createTextNode( elem ) );
-
-				// Convert html into DOM nodes
-				} else {
-					tmp = tmp || fragment.appendChild( context.createElement("div") );
-
-					// Deserialize a standard representation
-					tag = ( rtagName.exec( elem ) || [ "", "" ] )[ 1 ].toLowerCase();
-					wrap = wrapMap[ tag ] || wrapMap._default;
-					tmp.innerHTML = wrap[ 1 ] + elem.replace( rxhtmlTag, "<$1></$2>" ) + wrap[ 2 ];
-
-					// Descend through wrappers to the right content
-					j = wrap[ 0 ];
-					while ( j-- ) {
-						tmp = tmp.lastChild;
-					}
-
-					// Support: QtWebKit, PhantomJS
-					// push.apply(_, arraylike) throws on ancient WebKit
-					jQuery.merge( nodes, tmp.childNodes );
-
-					// Remember the top-level container
-					tmp = fragment.firstChild;
-
-					// Ensure the created nodes are orphaned (#12392)
-					tmp.textContent = "";
-				}
-			}
-		}
-
-		// Remove wrapper from fragment
-		fragment.textContent = "";
-
-		i = 0;
-		while ( (elem = nodes[ i++ ]) ) {
-
-			// #4087 - If origin and destination elements are the same, and this is
-			// that element, do not do anything
-			if ( selection && jQuery.inArray( elem, selection ) !== -1 ) {
-				continue;
-			}
-
-			contains = jQuery.contains( elem.ownerDocument, elem );
-
-			// Append to fragment
-			tmp = getAll( fragment.appendChild( elem ), "script" );
-
-			// Preserve script evaluation history
-			if ( contains ) {
-				setGlobalEval( tmp );
-			}
-
-			// Capture executables
-			if ( scripts ) {
-				j = 0;
-				while ( (elem = tmp[ j++ ]) ) {
-					if ( rscriptType.test( elem.type || "" ) ) {
-						scripts.push( elem );
-					}
-				}
-			}
-		}
-
-		return fragment;
-	},
-
-	cleanData: function( elems ) {
-		var data, elem, type, key,
-			special = jQuery.event.special,
-			i = 0;
-
-		for ( ; (elem = elems[ i ]) !== undefined; i++ ) {
-			if ( jQuery.acceptData( elem ) ) {
-				key = elem[ data_priv.expando ];
-
-				if ( key && (data = data_priv.cache[ key ]) ) {
-					if ( data.events ) {
-						for ( type in data.events ) {
-							if ( special[ type ] ) {
-								jQuery.event.remove( elem, type );
-
-							// This is a shortcut to avoid jQuery.event.remove's overhead
-							} else {
-								jQuery.removeEvent( elem, type, data.handle );
-							}
-						}
-					}
-					if ( data_priv.cache[ key ] ) {
-						// Discard any remaining `private` data
-						delete data_priv.cache[ key ];
-					}
-				}
-			}
-			// Discard any remaining `user` data
-			delete data_user.cache[ elem[ data_user.expando ] ];
-		}
-	}
-});
-
-jQuery.fn.extend({
-	text: function( value ) {
-		return access( this, function( value ) {
-			return value === undefined ?
-				jQuery.text( this ) :
-				this.empty().each(function() {
-					if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
-						this.textContent = value;
-					}
-				});
-		}, null, value, arguments.length );
-	},
-
-	append: function() {
-		return this.domManip( arguments, function( elem ) {
-			if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
-				var target = manipulationTarget( this, elem );
-				target.appendChild( elem );
-			}
-		});
-	},
-
-	prepend: function() {
-		return this.domManip( arguments, function( elem ) {
-			if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
-				var target = manipulationTarget( this, elem );
-				target.insertBefore( elem, target.firstChild );
-			}
-		});
-	},
-
-	before: function() {
-		return this.domManip( arguments, function( elem ) {
-			if ( this.parentNode ) {
-				this.parentNode.insertBefore( elem, this );
-			}
-		});
-	},
-
-	after: function() {
-		return this.domManip( arguments, function( elem ) {
-			if ( this.parentNode ) {
-				this.parentNode.insertBefore( elem, this.nextSibling );
-			}
-		});
-	},
-
-	remove: function( selector, keepData /* Internal Use Only */ ) {
-		var elem,
-			elems = selector ? jQuery.filter( selector, this ) : this,
-			i = 0;
-
-		for ( ; (elem = elems[i]) != null; i++ ) {
-			if ( !keepData && elem.nodeType === 1 ) {
-				jQuery.cleanData( getAll( elem ) );
-			}
-
-			if ( elem.parentNode ) {
-				if ( keepData && jQuery.contains( elem.ownerDocument, elem ) ) {
-					setGlobalEval( getAll( elem, "script" ) );
-				}
-				elem.parentNode.removeChild( elem );
-			}
-		}
-
-		return this;
-	},
-
-	empty: function() {
-		var elem,
-			i = 0;
-
-		for ( ; (elem = this[i]) != null; i++ ) {
-			if ( elem.nodeType === 1 ) {
-
-				// Prevent memory leaks
-				jQuery.cleanData( getAll( elem, false ) );
-
-				// Remove any remaining nodes
-				elem.textContent = "";
-			}
-		}
-
-		return this;
-	},
-
-	clone: function( dataAndEvents, deepDataAndEvents ) {
-		dataAndEvents = dataAndEvents == null ? false : dataAndEvents;
-		deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents;
-
-		return this.map(function() {
-			return jQuery.clone( this, dataAndEvents, deepDataAndEvents );
-		});
-	},
-
-	html: function( value ) {
-		return access( this, function( value ) {
-			var elem = this[ 0 ] || {},
-				i = 0,
-				l = this.length;
-
-			if ( value === undefined && elem.nodeType === 1 ) {
-				return elem.innerHTML;
-			}
-
-			// See if we can take a shortcut and just use innerHTML
-			if ( typeof value === "string" && !rnoInnerhtml.test( value ) &&
-				!wrapMap[ ( rtagName.exec( value ) || [ "", "" ] )[ 1 ].toLowerCase() ] ) {
-
-				value = value.replace( rxhtmlTag, "<$1></$2>" );
-
-				try {
-					for ( ; i < l; i++ ) {
-						elem = this[ i ] || {};
-
-						// Remove element nodes and prevent memory leaks
-						if ( elem.nodeType === 1 ) {
-							jQuery.cleanData( getAll( elem, false ) );
-							elem.innerHTML = value;
-						}
-					}
-
-					elem = 0;
-
-				// If using innerHTML throws an exception, use the fallback method
-				} catch( e ) {}
-			}
-
-			if ( elem ) {
-				this.empty().append( value );
-			}
-		}, null, value, arguments.length );
-	},
-
-	replaceWith: function() {
-		var arg = arguments[ 0 ];
-
-		// Make the changes, replacing each context element with the new content
-		this.domManip( arguments, function( elem ) {
-			arg = this.parentNode;
-
-			jQuery.cleanData( getAll( this ) );
-
-			if ( arg ) {
-				arg.replaceChild( elem, this );
-			}
-		});
-
-		// Force removal if there was no new content (e.g., from empty arguments)
-		return arg && (arg.length || arg.nodeType) ? this : this.remove();
-	},
-
-	detach: function( selector ) {
-		return this.remove( selector, true );
-	},
-
-	domManip: function( args, callback ) {
-
-		// Flatten any nested arrays
-		args = concat.apply( [], args );
-
-		var fragment, first, scripts, hasScripts, node, doc,
-			i = 0,
-			l = this.length,
-			set = this,
-			iNoClone = l - 1,
-			value = args[ 0 ],
-			isFunction = jQuery.isFunction( value );
-
-		// We can't cloneNode fragments that contain checked, in WebKit
-		if ( isFunction ||
-				( l > 1 && typeof value === "string" &&
-					!support.checkClone && rchecked.test( value ) ) ) {
-			return this.each(function( index ) {
-				var self = set.eq( index );
-				if ( isFunction ) {
-					args[ 0 ] = value.call( this, index, self.html() );
-				}
-				self.domManip( args, callback );
-			});
-		}
-
-		if ( l ) {
-			fragment = jQuery.buildFragment( args, this[ 0 ].ownerDocument, false, this );
-			first = fragment.firstChild;
-
-			if ( fragment.childNodes.length === 1 ) {
-				fragment = first;
-			}
-
-			if ( first ) {
-				scripts = jQuery.map( getAll( fragment, "script" ), disableScript );
-				hasScripts = scripts.length;
-
-				// Use the original fragment for the last item instead of the first because it can end up
-				// being emptied incorrectly in certain situations (#8070).
-				for ( ; i < l; i++ ) {
-					node = fragment;
-
-					if ( i !== iNoClone ) {
-						node = jQuery.clone( node, true, true );
-
-						// Keep references to cloned scripts for later restoration
-						if ( hasScripts ) {
-							// Support: QtWebKit
-							// jQuery.merge because push.apply(_, arraylike) throws
-							jQuery.merge( scripts, getAll( node, "script" ) );
-						}
-					}
-
-					callback.call( this[ i ], node, i );
-				}
-
-				if ( hasScripts ) {
-					doc = scripts[ scripts.length - 1 ].ownerDocument;
-
-					// Reenable scripts
-					jQuery.map( scripts, restoreScript );
-
-					// Evaluate executable scripts on first document insertion
-					for ( i = 0; i < hasScripts; i++ ) {
-						node = scripts[ i ];
-						if ( rscriptType.test( node.type || "" ) &&
-							!data_priv.access( node, "globalEval" ) && jQuery.contains( doc, node ) ) {
-
-							if ( node.src ) {
-								// Optional AJAX dependency, but won't run scripts if not present
-								if ( jQuery._evalUrl ) {
-									jQuery._evalUrl( node.src );
-								}
-							} else {
-								jQuery.globalEval( node.textContent.replace( rcleanScript, "" ) );
-							}
-						}
-					}
-				}
-			}
-		}
-
-		return this;
-	}
-});
-
-jQuery.each({
-	appendTo: "append",
-	prependTo: "prepend",
-	insertBefore: "before",
-	insertAfter: "after",
-	replaceAll: "replaceWith"
-}, function( name, original ) {
-	jQuery.fn[ name ] = function( selector ) {
-		var elems,
-			ret = [],
-			insert = jQuery( selector ),
-			last = insert.length - 1,
-			i = 0;
-
-		for ( ; i <= last; i++ ) {
-			elems = i === last ? this : this.clone( true );
-			jQuery( insert[ i ] )[ original ]( elems );
-
-			// Support: QtWebKit
-			// .get() because push.apply(_, arraylike) throws
-			push.apply( ret, elems.get() );
-		}
-
-		return this.pushStack( ret );
-	};
-});
-
-
-var iframe,
-	elemdisplay = {};
-
-/**
- * Retrieve the actual display of a element
- * @param {String} name nodeName of the element
- * @param {Object} doc Document object
- */
-// Called only from within defaultDisplay
-function actualDisplay( name, doc ) {
-	var style,
-		elem = jQuery( doc.createElement( name ) ).appendTo( doc.body ),
-
-		// getDefaultComputedStyle might be reliably used only on attached element
-		display = window.getDefaultComputedStyle && ( style = window.getDefaultComputedStyle( elem[ 0 ] ) ) ?
-
-			// Use of this method is a temporary fix (more like optimization) until something better comes along,
-			// since it was removed from specification and supported only in FF
-			style.display : jQuery.css( elem[ 0 ], "display" );
-
-	// We don't have any data stored on the element,
-	// so use "detach" method as fast way to get rid of the element
-	elem.detach();
-
-	return display;
-}
-
-/**
- * Try to determine the default display value of an element
- * @param {String} nodeName
- */
-function defaultDisplay( nodeName ) {
-	var doc = document,
-		display = elemdisplay[ nodeName ];
-
-	if ( !display ) {
-		display = actualDisplay( nodeName, doc );
-
-		// If the simple way fails, read from inside an iframe
-		if ( display === "none" || !display ) {
-
-			// Use the already-created iframe if possible
-			iframe = (iframe || jQuery( "<iframe frameborder='0' width='0' height='0'/>" )).appendTo( doc.documentElement );
-
-			// Always write a new HTML skeleton so Webkit and Firefox don't choke on reuse
-			doc = iframe[ 0 ].contentDocument;
-
-			// Support: IE
-			doc.write();
-			doc.close();
-
-			display = actualDisplay( nodeName, doc );
-			iframe.detach();
-		}
-
-		// Store the correct default display
-		elemdisplay[ nodeName ] = display;
-	}
-
-	return display;
-}
-var rmargin = (/^margin/);
-
-var rnumnonpx = new RegExp( "^(" + pnum + ")(?!px)[a-z%]+$", "i" );
-
-var getStyles = function( elem ) {
-		// Support: IE<=11+, Firefox<=30+ (#15098, #14150)
-		// IE throws on elements created in popups
-		// FF meanwhile throws on frame elements through "defaultView.getComputedStyle"
-		if ( elem.ownerDocument.defaultView.opener ) {
-			return elem.ownerDocument.defaultView.getComputedStyle( elem, null );
-		}
-
-		return window.getComputedStyle( elem, null );
-	};
-
-
-
-function curCSS( elem, name, computed ) {
-	var width, minWidth, maxWidth, ret,
-		style = elem.style;
-
-	computed = computed || getStyles( elem );
-
-	// Support: IE9
-	// getPropertyValue is only needed for .css('filter') (#12537)
-	if ( computed ) {
-		ret = computed.getPropertyValue( name ) || computed[ name ];
-	}
-
-	if ( computed ) {
-
-		if ( ret === "" && !jQuery.contains( elem.ownerDocument, elem ) ) {
-			ret = jQuery.style( elem, name );
-		}
-
-		// Support: iOS < 6
-		// A tribute to the "awesome hack by Dean Edwards"
-		// iOS < 6 (at least) returns percentage for a larger set of values, but width seems to be reliably pixels
-		// this is against the CSSOM draft spec: http://dev.w3.org/csswg/cssom/#resolved-values
-		if ( rnumnonpx.test( ret ) && rmargin.test( name ) ) {
-
-			// Remember the original values
-			width = style.width;
-			minWidth = style.minWidth;
-			maxWidth = style.maxWidth;
-
-			// Put in the new values to get a computed value out
-			style.minWidth = style.maxWidth = style.width = ret;
-			ret = computed.width;
-
-			// Revert the changed values
-			style.width = width;
-			style.minWidth = minWidth;
-			style.maxWidth = maxWidth;
-		}
-	}
-
-	return ret !== undefined ?
-		// Support: IE
-		// IE returns zIndex value as an integer.
-		ret + "" :
-		ret;
-}
-
-
-function addGetHookIf( conditionFn, hookFn ) {
-	// Define the hook, we'll check on the first run if it's really needed.
-	return {
-		get: function() {
-			if ( conditionFn() ) {
-				// Hook not needed (or it's not possible to use it due
-				// to missing dependency), remove it.
-				delete this.get;
-				return;
-			}
-
-			// Hook needed; redefine it so that the support test is not executed again.
-			return (this.get = hookFn).apply( this, arguments );
-		}
-	};
-}
-
-
-(function() {
-	var pixelPositionVal, boxSizingReliableVal,
-		docElem = document.documentElement,
-		container = document.createElement( "div" ),
-		div = document.createElement( "div" );
-
-	if ( !div.style ) {
-		return;
-	}
-
-	// Support: IE9-11+
-	// Style of cloned element affects source element cloned (#8908)
-	div.style.backgroundClip = "content-box";
-	div.cloneNode( true ).style.backgroundClip = "";
-	support.clearCloneStyle = div.style.backgroundClip === "content-box";
-
-	container.style.cssText = "border:0;width:0;height:0;top:0;left:-9999px;margin-top:1px;" +
-		"position:absolute";
-	container.appendChild( div );
-
-	// Executing both pixelPosition & boxSizingReliable tests require only one layout
-	// so they're executed at the same time to save the second computation.
-	function computePixelPositionAndBoxSizingReliable() {
-		div.style.cssText =
-			// Support: Firefox<29, Android 2.3
-			// Vendor-prefix box-sizing
-			"-webkit-box-sizing:border-box;-moz-box-sizing:border-box;" +
-			"box-sizing:border-box;display:block;margin-top:1%;top:1%;" +
-			"border:1px;padding:1px;width:4px;position:absolute";
-		div.innerHTML = "";
-		docElem.appendChild( container );
-
-		var divStyle = window.getComputedStyle( div, null );
-		pixelPositionVal = divStyle.top !== "1%";
-		boxSizingReliableVal = divStyle.width === "4px";
-
-		docElem.removeChild( container );
-	}
-
-	// Support: node.js jsdom
-	// Don't assume that getComputedStyle is a property of the global object
-	if ( window.getComputedStyle ) {
-		jQuery.extend( support, {
-			pixelPosition: function() {
-
-				// This test is executed only once but we still do memoizing
-				// since we can use the boxSizingReliable pre-computing.
-				// No need to check if the test was already performed, though.
-				computePixelPositionAndBoxSizingReliable();
-				return pixelPositionVal;
-			},
-			boxSizingReliable: function() {
-				if ( boxSizingReliableVal == null ) {
-					computePixelPositionAndBoxSizingReliable();
-				}
-				return boxSizingReliableVal;
-			},
-			reliableMarginRight: function() {
-
-				// Support: Android 2.3
-				// Check if div with explicit width and no margin-right incorrectly
-				// gets computed margin-right based on width of container. (#3333)
-				// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
-				// This support function is only executed once so no memoizing is needed.
-				var ret,
-					marginDiv = div.appendChild( document.createElement( "div" ) );
-
-				// Reset CSS: box-sizing; display; margin; border; padding
-				marginDiv.style.cssText = div.style.cssText =
-					// Support: Firefox<29, Android 2.3
-					// Vendor-prefix box-sizing
-					"-webkit-box-sizing:content-box;-moz-box-sizing:content-box;" +
-					"box-sizing:content-box;display:block;margin:0;border:0;padding:0";
-				marginDiv.style.marginRight = marginDiv.style.width = "0";
-				div.style.width = "1px";
-				docElem.appendChild( container );
-
-				ret = !parseFloat( window.getComputedStyle( marginDiv, null ).marginRight );
-
-				docElem.removeChild( container );
-				div.removeChild( marginDiv );
-
-				return ret;
-			}
-		});
-	}
-})();
-
-
-// A method for quickly swapping in/out CSS properties to get correct calculations.
-jQuery.swap = function( elem, options, callback, args ) {
-	var ret, name,
-		old = {};
-
-	// Remember the old values, and insert the new ones
-	for ( name in options ) {
-		old[ name ] = elem.style[ name ];
-		elem.style[ name ] = options[ name ];
-	}
-
-	ret = callback.apply( elem, args || [] );
-
-	// Revert the old values
-	for ( name in options ) {
-		elem.style[ name ] = old[ name ];
-	}
-
-	return ret;
-};
-
-
-var
-	// Swappable if display is none or starts with table except "table", "table-cell", or "table-caption"
-	// See here for display values: https://developer.mozilla.org/en-US/docs/CSS/display
-	rdisplayswap = /^(none|table(?!-c[ea]).+)/,
-	rnumsplit = new RegExp( "^(" + pnum + ")(.*)$", "i" ),
-	rrelNum = new RegExp( "^([+-])=(" + pnum + ")", "i" ),
-
-	cssShow = { position: "absolute", visibility: "hidden", display: "block" },
-	cssNormalTransform = {
-		letterSpacing: "0",
-		fontWeight: "400"
-	},
-
-	cssPrefixes = [ "Webkit", "O", "Moz", "ms" ];
-
-// Return a css property mapped to a potentially vendor prefixed property
-function vendorPropName( style, name ) {
-
-	// Shortcut for names that are not vendor prefixed
-	if ( name in style ) {
-		return name;
-	}
-
-	// Check for vendor prefixed names
-	var capName = name[0].toUpperCase() + name.slice(1),
-		origName = name,
-		i = cssPrefixes.length;
-
-	while ( i-- ) {
-		name = cssPrefixes[ i ] + capName;
-		if ( name in style ) {
-			return name;
-		}
-	}
-
-	return origName;
-}
-
-function setPositiveNumber( elem, value, subtract ) {
-	var matches = rnumsplit.exec( value );
-	return matches ?
-		// Guard against undefined "subtract", e.g., when used as in cssHooks
-		Math.max( 0, matches[ 1 ] - ( subtract || 0 ) ) + ( matches[ 2 ] || "px" ) :
-		value;
-}
-
-function augmentWidthOrHeight( elem, name, extra, isBorderBox, styles ) {
-	var i = extra === ( isBorderBox ? "border" : "content" ) ?
-		// If we already have the right measurement, avoid augmentation
-		4 :
-		// Otherwise initialize for horizontal or vertical properties
-		name === "width" ? 1 : 0,
-
-		val = 0;
-
-	for ( ; i < 4; i += 2 ) {
-		// Both box models exclude margin, so add it if we want it
-		if ( extra === "margin" ) {
-			val += jQuery.css( elem, extra + cssExpand[ i ], true, styles );
-		}
-
-		if ( isBorderBox ) {
-			// border-box includes padding, so remove it if we want content
-			if ( extra === "content" ) {
-				val -= jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
-			}
-
-			// At this point, extra isn't border nor margin, so remove border
-			if ( extra !== "margin" ) {
-				val -= jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
-			}
-		} else {
-			// At this point, extra isn't content, so add padding
-			val += jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
-
-			// At this point, extra isn't content nor padding, so add border
-			if ( extra !== "padding" ) {
-				val += jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
-			}
-		}
-	}
-
-	return val;
-}
-
-function getWidthOrHeight( elem, name, extra ) {
-
-	// Start with offset property, which is equivalent to the border-box value
-	var valueIsBorderBox = true,
-		val = name === "width" ? elem.offsetWidth : elem.offsetHeight,
-		styles = getStyles( elem ),
-		isBorderBox = jQuery.css( elem, "boxSizing", false, styles ) === "border-box";
-
-	// Some non-html elements return undefined for offsetWidth, so check for null/undefined
-	// svg - https://bugzilla.mozilla.org/show_bug.cgi?id=649285
-	// MathML - https://bugzilla.mozilla.org/show_bug.cgi?id=491668
-	if ( val <= 0 || val == null ) {
-		// Fall back to computed then uncomputed css if necessary
-		val = curCSS( elem, name, styles );
-		if ( val < 0 || val == null ) {
-			val = elem.style[ name ];
-		}
-
-		// Computed unit is not pixels. Stop here and return.
-		if ( rnumnonpx.test(val) ) {
-			return val;
-		}
-
-		// Check for style in case a browser which returns unreliable values
-		// for getComputedStyle silently falls back to the reliable elem.style
-		valueIsBorderBox = isBorderBox &&
-			( support.boxSizingReliable() || val === elem.style[ name ] );
-
-		// Normalize "", auto, and prepare for extra
-		val = parseFloat( val ) || 0;
-	}
-
-	// Use the active box-sizing model to add/subtract irrelevant styles
-	return ( val +
-		augmentWidthOrHeight(
-			elem,
-			name,
-			extra || ( isBorderBox ? "border" : "content" ),
-			valueIsBorderBox,
-			styles
-		)
-	) + "px";
-}
-
-function showHide( elements, show ) {
-	var display, elem, hidden,
-		values = [],
-		index = 0,
-		length = elements.length;
-
-	for ( ; index < length; index++ ) {
-		elem = elements[ index ];
-		if ( !elem.style ) {
-			continue;
-		}
-
-		values[ index ] = data_priv.get( elem, "olddisplay" );
-		display = elem.style.display;
-		if ( show ) {
-			// Reset the inline display of this element to learn if it is
-			// being hidden by cascaded rules or not
-			if ( !values[ index ] && display === "none" ) {
-				elem.style.display = "";
-			}
-
-			// Set elements which have been overridden with display: none
-			// in a stylesheet to whatever the default browser style is
-			// for such an element
-			if ( elem.style.display === "" && isHidden( elem ) ) {
-				values[ index ] = data_priv.access( elem, "olddisplay", defaultDisplay(elem.nodeName) );
-			}
-		} else {
-			hidden = isHidden( elem );
-
-			if ( display !== "none" || !hidden ) {
-				data_priv.set( elem, "olddisplay", hidden ? display : jQuery.css( elem, "display" ) );
-			}
-		}
-	}
-
-	// Set the display of most of the elements in a second loop
-	// to avoid the constant reflow
-	for ( index = 0; index < length; index++ ) {
-		elem = elements[ index ];
-		if ( !elem.style ) {
-			continue;
-		}
-		if ( !show || elem.style.display === "none" || elem.style.display === "" ) {
-			elem.style.display = show ? values[ index ] || "" : "none";
-		}
-	}
-
-	return elements;
-}
-
-jQuery.extend({
-
-	// Add in style property hooks for overriding the default
-	// behavior of getting and setting a style property
-	cssHooks: {
-		opacity: {
-			get: function( elem, computed ) {
-				if ( computed ) {
-
-					// We should always get a number back from opacity
-					var ret = curCSS( elem, "opacity" );
-					return ret === "" ? "1" : ret;
-				}
-			}
-		}
-	},
-
-	// Don't automatically add "px" to these possibly-unitless properties
-	cssNumber: {
-		"columnCount": true,
-		"fillOpacity": true,
-		"flexGrow": true,
-		"flexShrink": true,
-		"fontWeight": true,
-		"lineHeight": true,
-		"opacity": true,
-		"order": true,
-		"orphans": true,
-		"widows": true,
-		"zIndex": true,
-		"zoom": true
-	},
-
-	// Add in properties whose names you wish to fix before
-	// setting or getting the value
-	cssProps: {
-		"float": "cssFloat"
-	},
-
-	// Get and set the style property on a DOM Node
-	style: function( elem, name, value, extra ) {
-
-		// Don't set styles on text and comment nodes
-		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || !elem.style ) {
-			return;
-		}
-
-		// Make sure that we're working with the right name
-		var ret, type, hooks,
-			origName = jQuery.camelCase( name ),
-			style = elem.style;
-
-		name = jQuery.cssProps[ origName ] || ( jQuery.cssProps[ origName ] = vendorPropName( style, origName ) );
-
-		// Gets hook for the prefixed version, then unprefixed version
-		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
-
-		// Check if we're setting a value
-		if ( value !== undefined ) {
-			type = typeof value;
-
-			// Convert "+=" or "-=" to relative numbers (#7345)
-			if ( type === "string" && (ret = rrelNum.exec( value )) ) {
-				value = ( ret[1] + 1 ) * ret[2] + parseFloat( jQuery.css( elem, name ) );
-				// Fixes bug #9237
-				type = "number";
-			}
-
-			// Make sure that null and NaN values aren't set (#7116)
-			if ( value == null || value !== value ) {
-				return;
-			}
-
-			// If a number, add 'px' to the (except for certain CSS properties)
-			if ( type === "number" && !jQuery.cssNumber[ origName ] ) {
-				value += "px";
-			}
-
-			// Support: IE9-11+
-			// background-* props affect original clone's values
-			if ( !support.clearCloneStyle && value === "" && name.indexOf( "background" ) === 0 ) {
-				style[ name ] = "inherit";
-			}
-
-			// If a hook was provided, use that value, otherwise just set the specified value
-			if ( !hooks || !("set" in hooks) || (value = hooks.set( elem, value, extra )) !== undefined ) {
-				style[ name ] = value;
-			}
-
-		} else {
-			// If a hook was provided get the non-computed value from there
-			if ( hooks && "get" in hooks && (ret = hooks.get( elem, false, extra )) !== undefined ) {
-				return ret;
-			}
-
-			// Otherwise just get the value from the style object
-			return style[ name ];
-		}
-	},
-
-	css: function( elem, name, extra, styles ) {
-		var val, num, hooks,
-			origName = jQuery.camelCase( name );
-
-		// Make sure that we're working with the right name
-		name = jQuery.cssProps[ origName ] || ( jQuery.cssProps[ origName ] = vendorPropName( elem.style, origName ) );
-
-		// Try prefixed name followed by the unprefixed name
-		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
-
-		// If a hook was provided get the computed value from there
-		if ( hooks && "get" in hooks ) {
-			val = hooks.get( elem, true, extra );
-		}
-
-		// Otherwise, if a way to get the computed value exists, use that
-		if ( val === undefined ) {
-			val = curCSS( elem, name, styles );
-		}
-
-		// Convert "normal" to computed value
-		if ( val === "normal" && name in cssNormalTransform ) {
-			val = cssNormalTransform[ name ];
-		}
-
-		// Make numeric if forced or a qualifier was provided and val looks numeric
-		if ( extra === "" || extra ) {
-			num = parseFloat( val );
-			return extra === true || jQuery.isNumeric( num ) ? num || 0 : val;
-		}
-		return val;
-	}
-});
-
-jQuery.each([ "height", "width" ], function( i, name ) {
-	jQuery.cssHooks[ name ] = {
-		get: function( elem, computed, extra ) {
-			if ( computed ) {
-
-				// Certain elements can have dimension info if we invisibly show them
-				// but it must have a current display style that would benefit
-				return rdisplayswap.test( jQuery.css( elem, "display" ) ) && elem.offsetWidth === 0 ?
-					jQuery.swap( elem, cssShow, function() {
-						return getWidthOrHeight( elem, name, extra );
-					}) :
-					getWidthOrHeight( elem, name, extra );
-			}
-		},
-
-		set: function( elem, value, extra ) {
-			var styles = extra && getStyles( elem );
-			return setPositiveNumber( elem, value, extra ?
-				augmentWidthOrHeight(
-					elem,
-					name,
-					extra,
-					jQuery.css( elem, "boxSizing", false, styles ) === "border-box",
-					styles
-				) : 0
-			);
-		}
-	};
-});
-
-// Support: Android 2.3
-jQuery.cssHooks.marginRight = addGetHookIf( support.reliableMarginRight,
-	function( elem, computed ) {
-		if ( computed ) {
-			return jQuery.swap( elem, { "display": "inline-block" },
-				curCSS, [ elem, "marginRight" ] );
-		}
-	}
-);
-
-// These hooks are used by animate to expand properties
-jQuery.each({
-	margin: "",
-	padding: "",
-	border: "Width"
-}, function( prefix, suffix ) {
-	jQuery.cssHooks[ prefix + suffix ] = {
-		expand: function( value ) {
-			var i = 0,
-				expanded = {},
-
-				// Assumes a single number if not a string
-				parts = typeof value === "string" ? value.split(" ") : [ value ];
-
-			for ( ; i < 4; i++ ) {
-				expanded[ prefix + cssExpand[ i ] + suffix ] =
-					parts[ i ] || parts[ i - 2 ] || parts[ 0 ];
-			}
-
-			return expanded;
-		}
-	};
-
-	if ( !rmargin.test( prefix ) ) {
-		jQuery.cssHooks[ prefix + suffix ].set = setPositiveNumber;
-	}
-});
-
-jQuery.fn.extend({
-	css: function( name, value ) {
-		return access( this, function( elem, name, value ) {
-			var styles, len,
-				map = {},
-				i = 0;
-
-			if ( jQuery.isArray( name ) ) {
-				styles = getStyles( elem );
-				len = name.length;
-
-				for ( ; i < len; i++ ) {
-					map[ name[ i ] ] = jQuery.css( elem, name[ i ], false, styles );
-				}
-
-				return map;
-			}
-
-			return value !== undefined ?
-				jQuery.style( elem, name, value ) :
-				jQuery.css( elem, name );
-		}, name, value, arguments.length > 1 );
-	},
-	show: function() {
-		return showHide( this, true );
-	},
-	hide: function() {
-		return showHide( this );
-	},
-	toggle: function( state ) {
-		if ( typeof state === "boolean" ) {
-			return state ? this.show() : this.hide();
-		}
-
-		return this.each(function() {
-			if ( isHidden( this ) ) {
-				jQuery( this ).show();
-			} else {
-				jQuery( this ).hide();
-			}
-		});
-	}
-});
-
-
-function Tween( elem, options, prop, end, easing ) {
-	return new Tween.prototype.init( elem, options, prop, end, easing );
-}
-jQuery.Tween = Tween;
-
-Tween.prototype = {
-	constructor: Tween,
-	init: function( elem, options, prop, end, easing, unit ) {
-		this.elem = elem;
-		this.prop = prop;
-		this.easing = easing || "swing";
-		this.options = options;
-		this.start = this.now = this.cur();
-		this.end = end;
-		this.unit = unit || ( jQuery.cssNumber[ prop ] ? "" : "px" );
-	},
-	cur: function() {
-		var hooks = Tween.propHooks[ this.prop ];
-
-		return hooks && hooks.get ?
-			hooks.get( this ) :
-			Tween.propHooks._default.get( this );
-	},
-	run: function( percent ) {
-		var eased,
-			hooks = Tween.propHooks[ this.prop ];
-
-		if ( this.options.duration ) {
-			this.pos = eased = jQuery.easing[ this.easing ](
-				percent, this.options.duration * percent, 0, 1, this.options.duration
-			);
-		} else {
-			this.pos = eased = percent;
-		}
-		this.now = ( this.end - this.start ) * eased + this.start;
-
-		if ( this.options.step ) {
-			this.options.step.call( this.elem, this.now, this );
-		}
-
-		if ( hooks && hooks.set ) {
-			hooks.set( this );
-		} else {
-			Tween.propHooks._default.set( this );
-		}
-		return this;
-	}
-};
-
-Tween.prototype.init.prototype = Tween.prototype;
-
-Tween.propHooks = {
-	_default: {
-		get: function( tween ) {
-			var result;
-
-			if ( tween.elem[ tween.prop ] != null &&
-				(!tween.elem.style || tween.elem.style[ tween.prop ] == null) ) {
-				return tween.elem[ tween.prop ];
-			}
-
-			// Passing an empty string as a 3rd parameter to .css will automatically
-			// attempt a parseFloat and fallback to a string if the parse fails.
-			// Simple values such as "10px" are parsed to Float;
-			// complex values such as "rotate(1rad)" are returned as-is.
-			result = jQuery.css( tween.elem, tween.prop, "" );
-			// Empty strings, null, undefined and "auto" are converted to 0.
-			return !result || result === "auto" ? 0 : result;
-		},
-		set: function( tween ) {
-			// Use step hook for back compat.
-			// Use cssHook if its there.
-			// Use .style if available and use plain properties where available.
-			if ( jQuery.fx.step[ tween.prop ] ) {
-				jQuery.fx.step[ tween.prop ]( tween );
-			} else if ( tween.elem.style && ( tween.elem.style[ jQuery.cssProps[ tween.prop ] ] != null || jQuery.cssHooks[ tween.prop ] ) ) {
-				jQuery.style( tween.elem, tween.prop, tween.now + tween.unit );
-			} else {
-				tween.elem[ tween.prop ] = tween.now;
-			}
-		}
-	}
-};
-
-// Support: IE9
-// Panic based approach to setting things on disconnected nodes
-Tween.propHooks.scrollTop = Tween.propHooks.scrollLeft = {
-	set: function( tween ) {
-		if ( tween.elem.nodeType && tween.elem.parentNode ) {
-			tween.elem[ tween.prop ] = tween.now;
-		}
-	}
-};
-
-jQuery.easing = {
-	linear: function( p ) {
-		return p;
-	},
-	swing: function( p ) {
-		return 0.5 - Math.cos( p * Math.PI ) / 2;
-	}
-};
-
-jQuery.fx = Tween.prototype.init;
-
-// Back Compat <1.8 extension point
-jQuery.fx.step = {};
-
-
-
-
-var
-	fxNow, timerId,
-	rfxtypes = /^(?:toggle|show|hide)$/,
-	rfxnum = new RegExp( "^(?:([+-])=|)(" + pnum + ")([a-z%]*)$", "i" ),
-	rrun = /queueHooks$/,
-	animationPrefilters = [ defaultPrefilter ],
-	tweeners = {
-		"*": [ function( prop, value ) {
-			var tween = this.createTween( prop, value ),
-				target = tween.cur(),
-				parts = rfxnum.exec( value ),
-				unit = parts && parts[ 3 ] || ( jQuery.cssNumber[ prop ] ? "" : "px" ),
-
-				// Starting value computation is required for potential unit mismatches
-				start = ( jQuery.cssNumber[ prop ] || unit !== "px" && +target ) &&
-					rfxnum.exec( jQuery.css( tween.elem, prop ) ),
-				scale = 1,
-				maxIterations = 20;
-
-			if ( start && start[ 3 ] !== unit ) {
-				// Trust units reported by jQuery.css
-				unit = unit || start[ 3 ];
-
-				// Make sure we update the tween properties later on
-				parts = parts || [];
-
-				// Iteratively approximate from a nonzero starting point
-				start = +target || 1;
-
-				do {
-					// If previous iteration zeroed out, double until we get *something*.
-					// Use string for doubling so we don't accidentally see scale as unchanged below
-					scale = scale || ".5";
-
-					// Adjust and apply
-					start = start / scale;
-					jQuery.style( tween.elem, prop, start + unit );
-
-				// Update scale, tolerating zero or NaN from tween.cur(),
-				// break the loop if scale is unchanged or perfect, or if we've just had enough
-				} while ( scale !== (scale = tween.cur() / target) && scale !== 1 && --maxIterations );
-			}
-
-			// Update tween properties
-			if ( parts ) {
-				start = tween.start = +start || +target || 0;
-				tween.unit = unit;
-				// If a +=/-= token was provided, we're doing a relative animation
-				tween.end = parts[ 1 ] ?
-					start + ( parts[ 1 ] + 1 ) * parts[ 2 ] :
-					+parts[ 2 ];
-			}
-
-			return tween;
-		} ]
-	};
-
-// Animations created synchronously will run synchronously
-function createFxNow() {
-	setTimeout(function() {
-		fxNow = undefined;
-	});
-	return ( fxNow = jQuery.now() );
-}
-
-// Generate parameters to create a standard animation
-function genFx( type, includeWidth ) {
-	var which,
-		i = 0,
-		attrs = { height: type };
-
-	// If we include width, step value is 1 to do all cssExpand values,
-	// otherwise step value is 2 to skip over Left and Right
-	includeWidth = includeWidth ? 1 : 0;
-	for ( ; i < 4 ; i += 2 - includeWidth ) {
-		which = cssExpand[ i ];
-		attrs[ "margin" + which ] = attrs[ "padding" + which ] = type;
-	}
-
-	if ( includeWidth ) {
-		attrs.opacity = attrs.width = type;
-	}
-
-	return attrs;
-}
-
-function createTween( value, prop, animation ) {
-	var tween,
-		collection = ( tweeners[ prop ] || [] ).concat( tweeners[ "*" ] ),
-		index = 0,
-		length = collection.length;
-	for ( ; index < length; index++ ) {
-		if ( (tween = collection[ index ].call( animation, prop, value )) ) {
-
-			// We're done with this property
-			return tween;
-		}
-	}
-}
-
-function defaultPrefilter( elem, props, opts ) {
-	/* jshint validthis: true */
-	var prop, value, toggle, tween, hooks, oldfire, display, checkDisplay,
-		anim = this,
-		orig = {},
-		style = elem.style,
-		hidden = elem.nodeType && isHidden( elem ),
-		dataShow = data_priv.get( elem, "fxshow" );
-
-	// Handle queue: false promises
-	if ( !opts.queue ) {
-		hooks = jQuery._queueHooks( elem, "fx" );
-		if ( hooks.unqueued == null ) {
-			hooks.unqueued = 0;
-			oldfire = hooks.empty.fire;
-			hooks.empty.fire = function() {
-				if ( !hooks.unqueued ) {
-					oldfire();
-				}
-			};
-		}
-		hooks.unqueued++;
-
-		anim.always(function() {
-			// Ensure the complete handler is called before this completes
-			anim.always(function() {
-				hooks.unqueued--;
-				if ( !jQuery.queue( elem, "fx" ).length ) {
-					hooks.empty.fire();
-				}
-			});
-		});
-	}
-
-	// Height/width overflow pass
-	if ( elem.nodeType === 1 && ( "height" in props || "width" in props ) ) {
-		// Make sure that nothing sneaks out
-		// Record all 3 overflow attributes because IE9-10 do not
-		// change the overflow attribute when overflowX and
-		// overflowY are set to the same value
-		opts.overflow = [ style.overflow, style.overflowX, style.overflowY ];
-
-		// Set display property to inline-block for height/width
-		// animations on inline elements that are having width/height animated
-		display = jQuery.css( elem, "display" );
-
-		// Test default display if display is currently "none"
-		checkDisplay = display === "none" ?
-			data_priv.get( elem, "olddisplay" ) || defaultDisplay( elem.nodeName ) : display;
-
-		if ( checkDisplay === "inline" && jQuery.css( elem, "float" ) === "none" ) {
-			style.display = "inline-block";
-		}
-	}
-
-	if ( opts.overflow ) {
-		style.overflow = "hidden";
-		anim.always(function() {
-			style.overflow = opts.overflow[ 0 ];
-			style.overflowX = opts.overflow[ 1 ];
-			style.overflowY = opts.overflow[ 2 ];
-		});
-	}
-
-	// show/hide pass
-	for ( prop in props ) {
-		value = props[ prop ];
-		if ( rfxtypes.exec( value ) ) {
-			delete props[ prop ];
-			toggle = toggle || value === "toggle";
-			if ( value === ( hidden ? "hide" : "show" ) ) {
-
-				// If there is dataShow left over from a stopped hide or show and we are going to proceed with show, we should pretend to be hidden
-				if ( value === "show" && dataShow && dataShow[ prop ] !== undefined ) {
-					hidden = true;
-				} else {
-					continue;
-				}
-			}
-			orig[ prop ] = dataShow && dataShow[ prop ] || jQuery.style( elem, prop );
-
-		// Any non-fx value stops us from restoring the original display value
-		} else {
-			display = undefined;
-		}
-	}
-
-	if ( !jQuery.isEmptyObject( orig ) ) {
-		if ( dataShow ) {
-			if ( "hidden" in dataShow ) {
-				hidden = dataShow.hidden;
-			}
-		} else {
-			dataShow = data_priv.access( elem, "fxshow", {} );
-		}
-
-		// Store state if its toggle - enables .stop().toggle() to "reverse"
-		if ( toggle ) {
-			dataShow.hidden = !hidden;
-		}
-		if ( hidden ) {
-			jQuery( elem ).show();
-		} else {
-			anim.done(function() {
-				jQuery( elem ).hide();
-			});
-		}
-		anim.done(function() {
-			var prop;
-
-			data_priv.remove( elem, "fxshow" );
-			for ( prop in orig ) {
-				jQuery.style( elem, prop, orig[ prop ] );
-			}
-		});
-		for ( prop in orig ) {
-			tween = createTween( hidden ? dataShow[ prop ] : 0, prop, anim );
-
-			if ( !( prop in dataShow ) ) {
-				dataShow[ prop ] = tween.start;
-				if ( hidden ) {
-					tween.end = tween.start;
-					tween.start = prop === "width" || prop === "height" ? 1 : 0;
-				}
-			}
-		}
-
-	// If this is a noop like .hide().hide(), restore an overwritten display value
-	} else if ( (display === "none" ? defaultDisplay( elem.nodeName ) : display) === "inline" ) {
-		style.display = display;
-	}
-}
-
-function propFilter( props, specialEasing ) {
-	var index, name, easing, value, hooks;
-
-	// camelCase, specialEasing and expand cssHook pass
-	for ( index in props ) {
-		name = jQuery.camelCase( index );
-		easing = specialEasing[ name ];
-		value = props[ index ];
-		if ( jQuery.isArray( value ) ) {
-			easing = value[ 1 ];
-			value = props[ index ] = value[ 0 ];
-		}
-
-		if ( index !== name ) {
-			props[ name ] = value;
-			delete props[ index ];
-		}
-
-		hooks = jQuery.cssHooks[ name ];
-		if ( hooks && "expand" in hooks ) {
-			value = hooks.expand( value );
-			delete props[ name ];
-
-			// Not quite $.extend, this won't overwrite existing keys.
-			// Reusing 'index' because we have the correct "name"
-			for ( index in value ) {
-				if ( !( index in props ) ) {
-					props[ index ] = value[ index ];
-					specialEasing[ index ] = easing;
-				}
-			}
-		} else {
-			specialEasing[ name ] = easing;
-		}
-	}
-}
-
-function Animation( elem, properties, options ) {
-	var result,
-		stopped,
-		index = 0,
-		length = animationPrefilters.length,
-		deferred = jQuery.Deferred().always( function() {
-			// Don't match elem in the :animated selector
-			delete tick.elem;
-		}),
-		tick = function() {
-			if ( stopped ) {
-				return false;
-			}
-			var currentTime = fxNow || createFxNow(),
-				remaining = Math.max( 0, animation.startTime + animation.duration - currentTime ),
-				// Support: Android 2.3
-				// Archaic crash bug won't allow us to use `1 - ( 0.5 || 0 )` (#12497)
-				temp = remaining / animation.duration || 0,
-				percent = 1 - temp,
-				index = 0,
-				length = animation.tweens.length;
-
-			for ( ; index < length ; index++ ) {
-				animation.tweens[ index ].run( percent );
-			}
-
-			deferred.notifyWith( elem, [ animation, percent, remaining ]);
-
-			if ( percent < 1 && length ) {
-				return remaining;
-			} else {
-				deferred.resolveWith( elem, [ animation ] );
-				return false;
-			}
-		},
-		animation = deferred.promise({
-			elem: elem,
-			props: jQuery.extend( {}, properties ),
-			opts: jQuery.extend( true, { specialEasing: {} }, options ),
-			originalProperties: properties,
-			originalOptions: options,
-			startTime: fxNow || createFxNow(),
-			duration: options.duration,
-			tweens: [],
-			createTween: function( prop, end ) {
-				var tween = jQuery.Tween( elem, animation.opts, prop, end,
-						animation.opts.specialEasing[ prop ] || animation.opts.easing );
-				animation.tweens.push( tween );
-				return tween;
-			},
-			stop: function( gotoEnd ) {
-				var index = 0,
-					// If we are going to the end, we want to run all the tweens
-					// otherwise we skip this part
-					length = gotoEnd ? animation.tweens.length : 0;
-				if ( stopped ) {
-					return this;
-				}
-				stopped = true;
-				for ( ; index < length ; index++ ) {
-					animation.tweens[ index ].run( 1 );
-				}
-
-				// Resolve when we played the last frame; otherwise, reject
-				if ( gotoEnd ) {
-					deferred.resolveWith( elem, [ animation, gotoEnd ] );
-				} else {
-					deferred.rejectWith( elem, [ animation, gotoEnd ] );
-				}
-				return this;
-			}
-		}),
-		props = animation.props;
-
-	propFilter( props, animation.opts.specialEasing );
-
-	for ( ; index < length ; index++ ) {
-		result = animationPrefilters[ index ].call( animation, elem, props, animation.opts );
-		if ( result ) {
-			return result;
-		}
-	}
-
-	jQuery.map( props, createTween, animation );
-
-	if ( jQuery.isFunction( animation.opts.start ) ) {
-		animation.opts.start.call( elem, animation );
-	}
-
-	jQuery.fx.timer(
-		jQuery.extend( tick, {
-			elem: elem,
-			anim: animation,
-			queue: animation.opts.queue
-		})
-	);
-
-	// attach callbacks from options
-	return animation.progress( animation.opts.progress )
-		.done( animation.opts.done, animation.opts.complete )
-		.fail( animation.opts.fail )
-		.always( animation.opts.always );
-}
-
-jQuery.Animation = jQuery.extend( Animation, {
-
-	tweener: function( props, callback ) {
-		if ( jQuery.isFunction( props ) ) {
-			callback = props;
-			props = [ "*" ];
-		} else {
-			props = props.split(" ");
-		}
-
-		var prop,
-			index = 0,
-			length = props.length;
-
-		for ( ; index < length ; index++ ) {
-			prop = props[ index ];
-			tweeners[ prop ] = tweeners[ prop ] || [];
-			tweeners[ prop ].unshift( callback );
-		}
-	},
-
-	prefilter: function( callback, prepend ) {
-		if ( prepend ) {
-			animationPrefilters.unshift( callback );
-		} else {
-			animationPrefilters.push( callback );
-		}
-	}
-});
-
-jQuery.speed = function( speed, easing, fn ) {
-	var opt = speed && typeof speed === "object" ? jQuery.extend( {}, speed ) : {
-		complete: fn || !fn && easing ||
-			jQuery.isFunction( speed ) && speed,
-		duration: speed,
-		easing: fn && easing || easing && !jQuery.isFunction( easing ) && easing
-	};
-
-	opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration :
-		opt.duration in jQuery.fx.speeds ? jQuery.fx.speeds[ opt.duration ] : jQuery.fx.speeds._default;
-
-	// Normalize opt.queue - true/undefined/null -> "fx"
-	if ( opt.queue == null || opt.queue === true ) {
-		opt.queue = "fx";
-	}
-
-	// Queueing
-	opt.old = opt.complete;
-
-	opt.complete = function() {
-		if ( jQuery.isFunction( opt.old ) ) {
-			opt.old.call( this );
-		}
-
-		if ( opt.queue ) {
-			jQuery.dequeue( this, opt.queue );
-		}
-	};
-
-	return opt;
-};
-
-jQuery.fn.extend({
-	fadeTo: function( speed, to, easing, callback ) {
-
-		// Show any hidden elements after setting opacity to 0
-		return this.filter( isHidden ).css( "opacity", 0 ).show()
-
-			// Animate to the value specified
-			.end().animate({ opacity: to }, speed, easing, callback );
-	},
-	animate: function( prop, speed, easing, callback ) {
-		var empty = jQuery.isEmptyObject( prop ),
-			optall = jQuery.speed( speed, easing, callback ),
-			doAnimation = function() {
-				// Operate on a copy of prop so per-property easing won't be lost
-				var anim = Animation( this, jQuery.extend( {}, prop ), optall );
-
-				// Empty animations, or finishing resolves immediately
-				if ( empty || data_priv.get( this, "finish" ) ) {
-					anim.stop( true );
-				}
-			};
-			doAnimation.finish = doAnimation;
-
-		return empty || optall.queue === false ?
-			this.each( doAnimation ) :
-			this.queue( optall.queue, doAnimation );
-	},
-	stop: function( type, clearQueue, gotoEnd ) {
-		var stopQueue = function( hooks ) {
-			var stop = hooks.stop;
-			delete hooks.stop;
-			stop( gotoEnd );
-		};
-
-		if ( typeof type !== "string" ) {
-			gotoEnd = clearQueue;
-			clearQueue = type;
-			type = undefined;
-		}
-		if ( clearQueue && type !== false ) {
-			this.queue( type || "fx", [] );
-		}
-
-		return this.each(function() {
-			var dequeue = true,
-				index = type != null && type + "queueHooks",
-				timers = jQuery.timers,
-				data = data_priv.get( this );
-
-			if ( index ) {
-				if ( data[ index ] && data[ index ].stop ) {
-					stopQueue( data[ index ] );
-				}
-			} else {
-				for ( index in data ) {
-					if ( data[ index ] && data[ index ].stop && rrun.test( index ) ) {
-						stopQueue( data[ index ] );
-					}
-				}
-			}
-
-			for ( index = timers.length; index--; ) {
-				if ( timers[ index ].elem === this && (type == null || timers[ index ].queue === type) ) {
-					timers[ index ].anim.stop( gotoEnd );
-					dequeue = false;
-					timers.splice( index, 1 );
-				}
-			}
-
-			// Start the next in the queue if the last step wasn't forced.
-			// Timers currently will call their complete callbacks, which
-			// will dequeue but only if they were gotoEnd.
-			if ( dequeue || !gotoEnd ) {
-				jQuery.dequeue( this, type );
-			}
-		});
-	},
-	finish: function( type ) {
-		if ( type !== false ) {
-			type = type || "fx";
-		}
-		return this.each(function() {
-			var index,
-				data = data_priv.get( this ),
-				queue = data[ type + "queue" ],
-				hooks = data[ type + "queueHooks" ],
-				timers = jQuery.timers,
-				length = queue ? queue.length : 0;
-
-			// Enable finishing flag on private data
-			data.finish = true;
-
-			// Empty the queue first
-			jQuery.queue( this, type, [] );
-
-			if ( hooks && hooks.stop ) {
-				hooks.stop.call( this, true );
-			}
-
-			// Look for any active animations, and finish them
-			for ( index = timers.length; index--; ) {
-				if ( timers[ index ].elem === this && timers[ index ].queue === type ) {
-					timers[ index ].anim.stop( true );
-					timers.splice( index, 1 );
-				}
-			}
-
-			// Look for any animations in the old queue and finish them
-			for ( index = 0; index < length; index++ ) {
-				if ( queue[ index ] && queue[ index ].finish ) {
-					queue[ index ].finish.call( this );
-				}
-			}
-
-			// Turn off finishing flag
-			delete data.finish;
-		});
-	}
-});
-
-jQuery.each([ "toggle", "show", "hide" ], function( i, name ) {
-	var cssFn = jQuery.fn[ name ];
-	jQuery.fn[ name ] = function( speed, easing, callback ) {
-		return speed == null || typeof speed === "boolean" ?
-			cssFn.apply( this, arguments ) :
-			this.animate( genFx( name, true ), speed, easing, callback );
-	};
-});
-
-// Generate shortcuts for custom animations
-jQuery.each({
-	slideDown: genFx("show"),
-	slideUp: genFx("hide"),
-	slideToggle: genFx("toggle"),
-	fadeIn: { opacity: "show" },
-	fadeOut: { opacity: "hide" },
-	fadeToggle: { opacity: "toggle" }
-}, function( name, props ) {
-	jQuery.fn[ name ] = function( speed, easing, callback ) {
-		return this.animate( props, speed, easing, callback );
-	};
-});
-
-jQuery.timers = [];
-jQuery.fx.tick = function() {
-	var timer,
-		i = 0,
-		timers = jQuery.timers;
-
-	fxNow = jQuery.now();
-
-	for ( ; i < timers.length; i++ ) {
-		timer = timers[ i ];
-		// Checks the timer has not already been removed
-		if ( !timer() && timers[ i ] === timer ) {
-			timers.splice( i--, 1 );
-		}
-	}
-
-	if ( !timers.length ) {
-		jQuery.fx.stop();
-	}
-	fxNow = undefined;
-};
-
-jQuery.fx.timer = function( timer ) {
-	jQuery.timers.push( timer );
-	if ( timer() ) {
-		jQuery.fx.start();
-	} else {
-		jQuery.timers.pop();
-	}
-};
-
-jQuery.fx.interval = 13;
-
-jQuery.fx.start = function() {
-	if ( !timerId ) {
-		timerId = setInterval( jQuery.fx.tick, jQuery.fx.interval );
-	}
-};
-
-jQuery.fx.stop = function() {
-	clearInterval( timerId );
-	timerId = null;
-};
-
-jQuery.fx.speeds = {
-	slow: 600,
-	fast: 200,
-	// Default speed
-	_default: 400
-};
-
-
-// Based off of the plugin by Clint Helfers, with permission.
-// http://blindsignals.com/index.php/2009/07/jquery-delay/
-jQuery.fn.delay = function( time, type ) {
-	time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time;
-	type = type || "fx";
-
-	return this.queue( type, function( next, hooks ) {
-		var timeout = setTimeout( next, time );
-		hooks.stop = function() {
-			clearTimeout( timeout );
-		};
-	});
-};
-
-
-(function() {
-	var input = document.createElement( "input" ),
-		select = document.createElement( "select" ),
-		opt = select.appendChild( document.createElement( "option" ) );
-
-	input.type = "checkbox";
-
-	// Support: iOS<=5.1, Android<=4.2+
-	// Default value for a checkbox should be "on"
-	support.checkOn = input.value !== "";
-
-	// Support: IE<=11+
-	// Must access selectedIndex to make default options select
-	support.optSelected = opt.selected;
-
-	// Support: Android<=2.3
-	// Options inside disabled selects are incorrectly marked as disabled
-	select.disabled = true;
-	support.optDisabled = !opt.disabled;
-
-	// Support: IE<=11+
-	// An input loses its value after becoming a radio
-	input = document.createElement( "input" );
-	input.value = "t";
-	input.type = "radio";
-	support.radioValue = input.value === "t";
-})();
-
-
-var nodeHook, boolHook,
-	attrHandle = jQuery.expr.attrHandle;
-
-jQuery.fn.extend({
-	attr: function( name, value ) {
-		return access( this, jQuery.attr, name, value, arguments.length > 1 );
-	},
-
-	removeAttr: function( name ) {
-		return this.each(function() {
-			jQuery.removeAttr( this, name );
-		});
-	}
-});
-
-jQuery.extend({
-	attr: function( elem, name, value ) {
-		var hooks, ret,
-			nType = elem.nodeType;
-
-		// don't get/set attributes on text, comment and attribute nodes
-		if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
-			return;
-		}
-
-		// Fallback to prop when attributes are not supported
-		if ( typeof elem.getAttribute === strundefined ) {
-			return jQuery.prop( elem, name, value );
-		}
-
-		// All attributes are lowercase
-		// Grab necessary hook if one is defined
-		if ( nType !== 1 || !jQuery.isXMLDoc( elem ) ) {
-			name = name.toLowerCase();
-			hooks = jQuery.attrHooks[ name ] ||
-				( jQuery.expr.match.bool.test( name ) ? boolHook : nodeHook );
-		}
-
-		if ( value !== undefined ) {
-
-			if ( value === null ) {
-				jQuery.removeAttr( elem, name );
-
-			} else if ( hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ) {
-				return ret;
-
-			} else {
-				elem.setAttribute( name, value + "" );
-				return value;
-			}
-
-		} else if ( hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ) {
-			return ret;
-
-		} else {
-			ret = jQuery.find.attr( elem, name );
-
-			// Non-existent attributes return null, we normalize to undefined
-			return ret == null ?
-				undefined :
-				ret;
-		}
-	},
-
-	removeAttr: function( elem, value ) {
-		var name, propName,
-			i = 0,
-			attrNames = value && value.match( rnotwhite );
-
-		if ( attrNames && elem.nodeType === 1 ) {
-			while ( (name = attrNames[i++]) ) {
-				propName = jQuery.propFix[ name ] || name;
-
-				// Boolean attributes get special treatment (#10870)
-				if ( jQuery.expr.match.bool.test( name ) ) {
-					// Set corresponding property to false
-					elem[ propName ] = false;
-				}
-
-				elem.removeAttribute( name );
-			}
-		}
-	},
-
-	attrHooks: {
-		type: {
-			set: function( elem, value ) {
-				if ( !support.radioValue && value === "radio" &&
-					jQuery.nodeName( elem, "input" ) ) {
-					var val = elem.value;
-					elem.setAttribute( "type", value );
-					if ( val ) {
-						elem.value = val;
-					}
-					return value;
-				}
-			}
-		}
-	}
-});
-
-// Hooks for boolean attributes
-boolHook = {
-	set: function( elem, value, name ) {
-		if ( value === false ) {
-			// Remove boolean attributes when set to false
-			jQuery.removeAttr( elem, name );
-		} else {
-			elem.setAttribute( name, name );
-		}
-		return name;
-	}
-};
-jQuery.each( jQuery.expr.match.bool.source.match( /\w+/g ), function( i, name ) {
-	var getter = attrHandle[ name ] || jQuery.find.attr;
-
-	attrHandle[ name ] = function( elem, name, isXML ) {
-		var ret, handle;
-		if ( !isXML ) {
-			// Avoid an infinite loop by temporarily removing this function from the getter
-			handle = attrHandle[ name ];
-			attrHandle[ name ] = ret;
-			ret = getter( elem, name, isXML ) != null ?
-				name.toLowerCase() :
-				null;
-			attrHandle[ name ] = handle;
-		}
-		return ret;
-	};
-});
-
-
-
-
-var rfocusable = /^(?:input|select|textarea|button)$/i;
-
-jQuery.fn.extend({
-	prop: function( name, value ) {
-		return access( this, jQuery.prop, name, value, arguments.length > 1 );
-	},
-
-	removeProp: function( name ) {
-		return this.each(function() {
-			delete this[ jQuery.propFix[ name ] || name ];
-		});
-	}
-});
-
-jQuery.extend({
-	propFix: {
-		"for": "htmlFor",
-		"class": "className"
-	},
-
-	prop: function( elem, name, value ) {
-		var ret, hooks, notxml,
-			nType = elem.nodeType;
-
-		// Don't get/set properties on text, comment and attribute nodes
-		if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
-			return;
-		}
-
-		notxml = nType !== 1 || !jQuery.isXMLDoc( elem );
-
-		if ( notxml ) {
-			// Fix name and attach hooks
-			name = jQuery.propFix[ name ] || name;
-			hooks = jQuery.propHooks[ name ];
-		}
-
-		if ( value !== undefined ) {
-			return hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ?
-				ret :
-				( elem[ name ] = value );
-
-		} else {
-			return hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ?
-				ret :
-				elem[ name ];
-		}
-	},
-
-	propHooks: {
-		tabIndex: {
-			get: function( elem ) {
-				return elem.hasAttribute( "tabindex" ) || rfocusable.test( elem.nodeName ) || elem.href ?
-					elem.tabIndex :
-					-1;
-			}
-		}
-	}
-});
-
-if ( !support.optSelected ) {
-	jQuery.propHooks.selected = {
-		get: function( elem ) {
-			var parent = elem.parentNode;
-			if ( parent && parent.parentNode ) {
-				parent.parentNode.selectedIndex;
-			}
-			return null;
-		}
-	};
-}
-
-jQuery.each([
-	"tabIndex",
-	"readOnly",
-	"maxLength",
-	"cellSpacing",
-	"cellPadding",
-	"rowSpan",
-	"colSpan",
-	"useMap",
-	"frameBorder",
-	"contentEditable"
-], function() {
-	jQuery.propFix[ this.toLowerCase() ] = this;
-});
-
-
-
-
-var rclass = /[\t\r\n\f]/g;
-
-jQuery.fn.extend({
-	addClass: function( value ) {
-		var classes, elem, cur, clazz, j, finalValue,
-			proceed = typeof value === "string" && value,
-			i = 0,
-			len = this.length;
-
-		if ( jQuery.isFunction( value ) ) {
-			return this.each(function( j ) {
-				jQuery( this ).addClass( value.call( this, j, this.className ) );
-			});
-		}
-
-		if ( proceed ) {
-			// The disjunction here is for better compressibility (see removeClass)
-			classes = ( value || "" ).match( rnotwhite ) || [];
-
-			for ( ; i < len; i++ ) {
-				elem = this[ i ];
-				cur = elem.nodeType === 1 && ( elem.className ?
-					( " " + elem.className + " " ).replace( rclass, " " ) :
-					" "
-				);
-
-				if ( cur ) {
-					j = 0;
-					while ( (clazz = classes[j++]) ) {
-						if ( cur.indexOf( " " + clazz + " " ) < 0 ) {
-							cur += clazz + " ";
-						}
-					}
-
-					// only assign if different to avoid unneeded rendering.
-					finalValue = jQuery.trim( cur );
-					if ( elem.className !== finalValue ) {
-						elem.className = finalValue;
-					}
-				}
-			}
-		}
-
-		return this;
-	},
-
-	removeClass: function( value ) {
-		var classes, elem, cur, clazz, j, finalValue,
-			proceed = arguments.length === 0 || typeof value === "string" && value,
-			i = 0,
-			len = this.length;
-
-		if ( jQuery.isFunction( value ) ) {
-			return this.each(function( j ) {
-				jQuery( this ).removeClass( value.call( this, j, this.className ) );
-			});
-		}
-		if ( proceed ) {
-			classes = ( value || "" ).match( rnotwhite ) || [];
-
-			for ( ; i < len; i++ ) {
-				elem = this[ i ];
-				// This expression is here for better compressibility (see addClass)
-				cur = elem.nodeType === 1 && ( elem.className ?
-					( " " + elem.className + " " ).replace( rclass, " " ) :
-					""
-				);
-
-				if ( cur ) {
-					j = 0;
-					while ( (clazz = classes[j++]) ) {
-						// Remove *all* instances
-						while ( cur.indexOf( " " + clazz + " " ) >= 0 ) {
-							cur = cur.replace( " " + clazz + " ", " " );
-						}
-					}
-
-					// Only assign if different to avoid unneeded rendering.
-					finalValue = value ? jQuery.trim( cur ) : "";
-					if ( elem.className !== finalValue ) {
-						elem.className = finalValue;
-					}
-				}
-			}
-		}
-
-		return this;
-	},
-
-	toggleClass: function( value, stateVal ) {
-		var type = typeof value;
-
-		if ( typeof stateVal === "boolean" && type === "string" ) {
-			return stateVal ? this.addClass( value ) : this.removeClass( value );
-		}
-
-		if ( jQuery.isFunction( value ) ) {
-			return this.each(function( i ) {
-				jQuery( this ).toggleClass( value.call(this, i, this.className, stateVal), stateVal );
-			});
-		}
-
-		return this.each(function() {
-			if ( type === "string" ) {
-				// Toggle individual class names
-				var className,
-					i = 0,
-					self = jQuery( this ),
-					classNames = value.match( rnotwhite ) || [];
-
-				while ( (className = classNames[ i++ ]) ) {
-					// Check each className given, space separated list
-					if ( self.hasClass( className ) ) {
-						self.removeClass( className );
-					} else {
-						self.addClass( className );
-					}
-				}
-
-			// Toggle whole class name
-			} else if ( type === strundefined || type === "boolean" ) {
-				if ( this.className ) {
-					// store className if set
-					data_priv.set( this, "__className__", this.className );
-				}
-
-				// If the element has a class name or if we're passed `false`,
-				// then remove the whole classname (if there was one, the above saved it).
-				// Otherwise bring back whatever was previously saved (if anything),
-				// falling back to the empty string if nothing was stored.
-				this.className = this.className || value === false ? "" : data_priv.get( this, "__className__" ) || "";
-			}
-		});
-	},
-
-	hasClass: function( selector ) {
-		var className = " " + selector + " ",
-			i = 0,
-			l = this.length;
-		for ( ; i < l; i++ ) {
-			if ( this[i].nodeType === 1 && (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) >= 0 ) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-});
-
-
-
-
-var rreturn = /\r/g;
-
-jQuery.fn.extend({
-	val: function( value ) {
-		var hooks, ret, isFunction,
-			elem = this[0];
-
-		if ( !arguments.length ) {
-			if ( elem ) {
-				hooks = jQuery.valHooks[ elem.type ] || jQuery.valHooks[ elem.nodeName.toLowerCase() ];
-
-				if ( hooks && "get" in hooks && (ret = hooks.get( elem, "value" )) !== undefined ) {
-					return ret;
-				}
-
-				ret = elem.value;
-
-				return typeof ret === "string" ?
-					// Handle most common string cases
-					ret.replace(rreturn, "") :
-					// Handle cases where value is null/undef or number
-					ret == null ? "" : ret;
-			}
-
-			return;
-		}
-
-		isFunction = jQuery.isFunction( value );
-
-		return this.each(function( i ) {
-			var val;
-
-			if ( this.nodeType !== 1 ) {
-				return;
-			}
-
-			if ( isFunction ) {
-				val = value.call( this, i, jQuery( this ).val() );
-			} else {
-				val = value;
-			}
-
-			// Treat null/undefined as ""; convert numbers to string
-			if ( val == null ) {
-				val = "";
-
-			} else if ( typeof val === "number" ) {
-				val += "";
-
-			} else if ( jQuery.isArray( val ) ) {
-				val = jQuery.map( val, function( value ) {
-					return value == null ? "" : value + "";
-				});
-			}
-
-			hooks = jQuery.valHooks[ this.type ] || jQuery.valHooks[ this.nodeName.toLowerCase() ];
-
-			// If set returns undefined, fall back to normal setting
-			if ( !hooks || !("set" in hooks) || hooks.set( this, val, "value" ) === undefined ) {
-				this.value = val;
-			}
-		});
-	}
-});
-
-jQuery.extend({
-	valHooks: {
-		option: {
-			get: function( elem ) {
-				var val = jQuery.find.attr( elem, "value" );
-				return val != null ?
-					val :
-					// Support: IE10-11+
-					// option.text throws exceptions (#14686, #14858)
-					jQuery.trim( jQuery.text( elem ) );
-			}
-		},
-		select: {
-			get: function( elem ) {
-				var value, option,
-					options = elem.options,
-					index = elem.selectedIndex,
-					one = elem.type === "select-one" || index < 0,
-					values = one ? null : [],
-					max = one ? index + 1 : options.length,
-					i = index < 0 ?
-						max :
-						one ? index : 0;
-
-				// Loop through all the selected options
-				for ( ; i < max; i++ ) {
-					option = options[ i ];
-
-					// IE6-9 doesn't update selected after form reset (#2551)
-					if ( ( option.selected || i === index ) &&
-							// Don't return options that are disabled or in a disabled optgroup
-							( support.optDisabled ? !option.disabled : option.getAttribute( "disabled" ) === null ) &&
-							( !option.parentNode.disabled || !jQuery.nodeName( option.parentNode, "optgroup" ) ) ) {
-
-						// Get the specific value for the option
-						value = jQuery( option ).val();
-
-						// We don't need an array for one selects
-						if ( one ) {
-							return value;
-						}
-
-						// Multi-Selects return an array
-						values.push( value );
-					}
-				}
-
-				return values;
-			},
-
-			set: function( elem, value ) {
-				var optionSet, option,
-					options = elem.options,
-					values = jQuery.makeArray( value ),
-					i = options.length;
-
-				while ( i-- ) {
-					option = options[ i ];
-					if ( (option.selected = jQuery.inArray( option.value, values ) >= 0) ) {
-						optionSet = true;
-					}
-				}
-
-				// Force browsers to behave consistently when non-matching value is set
-				if ( !optionSet ) {
-					elem.selectedIndex = -1;
-				}
-				return values;
-			}
-		}
-	}
-});
-
-// Radios and checkboxes getter/setter
-jQuery.each([ "radio", "checkbox" ], function() {
-	jQuery.valHooks[ this ] = {
-		set: function( elem, value ) {
-			if ( jQuery.isArray( value ) ) {
-				return ( elem.checked = jQuery.inArray( jQuery(elem).val(), value ) >= 0 );
-			}
-		}
-	};
-	if ( !support.checkOn ) {
-		jQuery.valHooks[ this ].get = function( elem ) {
-			return elem.getAttribute("value") === null ? "on" : elem.value;
-		};
-	}
-});
-
-
-
-
-// Return jQuery for attributes-only inclusion
-
-
-jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblclick " +
-	"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
-	"change select submit keydown keypress keyup error contextmenu").split(" "), function( i, name ) {
-
-	// Handle event binding
-	jQuery.fn[ name ] = function( data, fn ) {
-		return arguments.length > 0 ?
-			this.on( name, null, data, fn ) :
-			this.trigger( name );
-	};
-});
-
-jQuery.fn.extend({
-	hover: function( fnOver, fnOut ) {
-		return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
-	},
-
-	bind: function( types, data, fn ) {
-		return this.on( types, null, data, fn );
-	},
-	unbind: function( types, fn ) {
-		return this.off( types, null, fn );
-	},
-
-	delegate: function( selector, types, data, fn ) {
-		return this.on( types, selector, data, fn );
-	},
-	undelegate: function( selector, types, fn ) {
-		// ( namespace ) or ( selector, types [, fn] )
-		return arguments.length === 1 ? this.off( selector, "**" ) : this.off( types, selector || "**", fn );
-	}
-});
-
-
-var nonce = jQuery.now();
-
-var rquery = (/\?/);
-
-
-
-// Support: Android 2.3
-// Workaround failure to string-cast null input
-jQuery.parseJSON = function( data ) {
-	return JSON.parse( data + "" );
-};
-
-
-// Cross-browser xml parsing
-jQuery.parseXML = function( data ) {
-	var xml, tmp;
-	if ( !data || typeof data !== "string" ) {
-		return null;
-	}
-
-	// Support: IE9
-	try {
-		tmp = new DOMParser();
-		xml = tmp.parseFromString( data, "text/xml" );
-	} catch ( e ) {
-		xml = undefined;
-	}
-
-	if ( !xml || xml.getElementsByTagName( "parsererror" ).length ) {
-		jQuery.error( "Invalid XML: " + data );
-	}
-	return xml;
-};
-
-
-var
-	rhash = /#.*$/,
-	rts = /([?&])_=[^&]*/,
-	rheaders = /^(.*?):[ \t]*([^\r\n]*)$/mg,
-	// #7653, #8125, #8152: local protocol detection
-	rlocalProtocol = /^(?:about|app|app-storage|.+-extension|file|res|widget):$/,
-	rnoContent = /^(?:GET|HEAD)$/,
-	rprotocol = /^\/\//,
-	rurl = /^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,
-
-	/* Prefilters
-	 * 1) They are useful to introduce custom dataTypes (see ajax/jsonp.js for an example)
-	 * 2) These are called:
-	 *    - BEFORE asking for a transport
-	 *    - AFTER param serialization (s.data is a string if s.processData is true)
-	 * 3) key is the dataType
-	 * 4) the catchall symbol "*" can be used
-	 * 5) execution will start with transport dataType and THEN continue down to "*" if needed
-	 */
-	prefilters = {},
-
-	/* Transports bindings
-	 * 1) key is the dataType
-	 * 2) the catchall symbol "*" can be used
-	 * 3) selection will start with transport dataType and THEN go to "*" if needed
-	 */
-	transports = {},
-
-	// Avoid comment-prolog char sequence (#10098); must appease lint and evade compression
-	allTypes = "*/".concat( "*" ),
-
-	// Document location
-	ajaxLocation = window.location.href,
-
-	// Segment location into parts
-	ajaxLocParts = rurl.exec( ajaxLocation.toLowerCase() ) || [];
-
-// Base "constructor" for jQuery.ajaxPrefilter and jQuery.ajaxTransport
-function addToPrefiltersOrTransports( structure ) {
-
-	// dataTypeExpression is optional and defaults to "*"
-	return function( dataTypeExpression, func ) {
-
-		if ( typeof dataTypeExpression !== "string" ) {
-			func = dataTypeExpression;
-			dataTypeExpression = "*";
-		}
-
-		var dataType,
-			i = 0,
-			dataTypes = dataTypeExpression.toLowerCase().match( rnotwhite ) || [];
-
-		if ( jQuery.isFunction( func ) ) {
-			// For each dataType in the dataTypeExpression
-			while ( (dataType = dataTypes[i++]) ) {
-				// Prepend if requested
-				if ( dataType[0] === "+" ) {
-					dataType = dataType.slice( 1 ) || "*";
-					(structure[ dataType ] = structure[ dataType ] || []).unshift( func );
-
-				// Otherwise append
-				} else {
-					(structure[ dataType ] = structure[ dataType ] || []).push( func );
-				}
-			}
-		}
-	};
-}
-
-// Base inspection function for prefilters and transports
-function inspectPrefiltersOrTransports( structure, options, originalOptions, jqXHR ) {
-
-	var inspected = {},
-		seekingTransport = ( structure === transports );
-
-	function inspect( dataType ) {
-		var selected;
-		inspected[ dataType ] = true;
-		jQuery.each( structure[ dataType ] || [], function( _, prefilterOrFactory ) {
-			var dataTypeOrTransport = prefilterOrFactory( options, originalOptions, jqXHR );
-			if ( typeof dataTypeOrTransport === "string" && !seekingTransport && !inspected[ dataTypeOrTransport ] ) {
-				options.dataTypes.unshift( dataTypeOrTransport );
-				inspect( dataTypeOrTransport );
-				return false;
-			} else if ( seekingTransport ) {
-				return !( selected = dataTypeOrTransport );
-			}
-		});
-		return selected;
-	}
-
-	return inspect( options.dataTypes[ 0 ] ) || !inspected[ "*" ] && inspect( "*" );
-}
-
-// A special extend for ajax options
-// that takes "flat" options (not to be deep extended)
-// Fixes #9887
-function ajaxExtend( target, src ) {
-	var key, deep,
-		flatOptions = jQuery.ajaxSettings.flatOptions || {};
-
-	for ( key in src ) {
-		if ( src[ key ] !== undefined ) {
-			( flatOptions[ key ] ? target : ( deep || (deep = {}) ) )[ key ] = src[ key ];
-		}
-	}
-	if ( deep ) {
-		jQuery.extend( true, target, deep );
-	}
-
-	return target;
-}
-
-/* Handles responses to an ajax request:
- * - finds the right dataType (mediates between content-type and expected dataType)
- * - returns the corresponding response
- */
-function ajaxHandleResponses( s, jqXHR, responses ) {
-
-	var ct, type, finalDataType, firstDataType,
-		contents = s.contents,
-		dataTypes = s.dataTypes;
-
-	// Remove auto dataType and get content-type in the process
-	while ( dataTypes[ 0 ] === "*" ) {
-		dataTypes.shift();
-		if ( ct === undefined ) {
-			ct = s.mimeType || jqXHR.getResponseHeader("Content-Type");
-		}
-	}
-
-	// Check if we're dealing with a known content-type
-	if ( ct ) {
-		for ( type in contents ) {
-			if ( contents[ type ] && contents[ type ].test( ct ) ) {
-				dataTypes.unshift( type );
-				break;
-			}
-		}
-	}
-
-	// Check to see if we have a response for the expected dataType
-	if ( dataTypes[ 0 ] in responses ) {
-		finalDataType = dataTypes[ 0 ];
-	} else {
-		// Try convertible dataTypes
-		for ( type in responses ) {
-			if ( !dataTypes[ 0 ] || s.converters[ type + " " + dataTypes[0] ] ) {
-				finalDataType = type;
-				break;
-			}
-			if ( !firstDataType ) {
-				firstDataType = type;
-			}
-		}
-		// Or just use first one
-		finalDataType = finalDataType || firstDataType;
-	}
-
-	// If we found a dataType
-	// We add the dataType to the list if needed
-	// and return the corresponding response
-	if ( finalDataType ) {
-		if ( finalDataType !== dataTypes[ 0 ] ) {
-			dataTypes.unshift( finalDataType );
-		}
-		return responses[ finalDataType ];
-	}
-}
-
-/* Chain conversions given the request and the original response
- * Also sets the responseXXX fields on the jqXHR instance
- */
-function ajaxConvert( s, response, jqXHR, isSuccess ) {
-	var conv2, current, conv, tmp, prev,
-		converters = {},
-		// Work with a copy of dataTypes in case we need to modify it for conversion
-		dataTypes = s.dataTypes.slice();
-
-	// Create converters map with lowercased keys
-	if ( dataTypes[ 1 ] ) {
-		for ( conv in s.converters ) {
-			converters[ conv.toLowerCase() ] = s.converters[ conv ];
-		}
-	}
-
-	current = dataTypes.shift();
-
-	// Convert to each sequential dataType
-	while ( current ) {
-
-		if ( s.responseFields[ current ] ) {
-			jqXHR[ s.responseFields[ current ] ] = response;
-		}
-
-		// Apply the dataFilter if provided
-		if ( !prev && isSuccess && s.dataFilter ) {
-			response = s.dataFilter( response, s.dataType );
-		}
-
-		prev = current;
-		current = dataTypes.shift();
-
-		if ( current ) {
-
-		// There's only work to do if current dataType is non-auto
-			if ( current === "*" ) {
-
-				current = prev;
-
-			// Convert response if prev dataType is non-auto and differs from current
-			} else if ( prev !== "*" && prev !== current ) {
-
-				// Seek a direct converter
-				conv = converters[ prev + " " + current ] || converters[ "* " + current ];
-
-				// If none found, seek a pair
-				if ( !conv ) {
-					for ( conv2 in converters ) {
-
-						// If conv2 outputs current
-						tmp = conv2.split( " " );
-						if ( tmp[ 1 ] === current ) {
-
-							// If prev can be converted to accepted input
-							conv = converters[ prev + " " + tmp[ 0 ] ] ||
-								converters[ "* " + tmp[ 0 ] ];
-							if ( conv ) {
-								// Condense equivalence converters
-								if ( conv === true ) {
-									conv = converters[ conv2 ];
-
-								// Otherwise, insert the intermediate dataType
-								} else if ( converters[ conv2 ] !== true ) {
-									current = tmp[ 0 ];
-									dataTypes.unshift( tmp[ 1 ] );
-								}
-								break;
-							}
-						}
-					}
-				}
-
-				// Apply converter (if not an equivalence)
-				if ( conv !== true ) {
-
-					// Unless errors are allowed to bubble, catch and return them
-					if ( conv && s[ "throws" ] ) {
-						response = conv( response );
-					} else {
-						try {
-							response = conv( response );
-						} catch ( e ) {
-							return { state: "parsererror", error: conv ? e : "No conversion from " + prev + " to " + current };
-						}
-					}
-				}
-			}
-		}
-	}
-
-	return { state: "success", data: response };
-}
-
-jQuery.extend({
-
-	// Counter for holding the number of active queries
-	active: 0,
-
-	// Last-Modified header cache for next request
-	lastModified: {},
-	etag: {},
-
-	ajaxSettings: {
-		url: ajaxLocation,
-		type: "GET",
-		isLocal: rlocalProtocol.test( ajaxLocParts[ 1 ] ),
-		global: true,
-		processData: true,
-		async: true,
-		contentType: "application/x-www-form-urlencoded; charset=UTF-8",
-		/*
-		timeout: 0,
-		data: null,
-		dataType: null,
-		username: null,
-		password: null,
-		cache: null,
-		throws: false,
-		traditional: false,
-		headers: {},
-		*/
-
-		accepts: {
-			"*": allTypes,
-			text: "text/plain",
-			html: "text/html",
-			xml: "application/xml, text/xml",
-			json: "application/json, text/javascript"
-		},
-
-		contents: {
-			xml: /xml/,
-			html: /html/,
-			json: /json/
-		},
-
-		responseFields: {
-			xml: "responseXML",
-			text: "responseText",
-			json: "responseJSON"
-		},
-
-		// Data converters
-		// Keys separate source (or catchall "*") and destination types with a single space
-		converters: {
-
-			// Convert anything to text
-			"* text": String,
-
-			// Text to html (true = no transformation)
-			"text html": true,
-
-			// Evaluate text as a json expression
-			"text json": jQuery.parseJSON,
-
-			// Parse text as xml
-			"text xml": jQuery.parseXML
-		},
-
-		// For options that shouldn't be deep extended:
-		// you can add your own custom options here if
-		// and when you create one that shouldn't be
-		// deep extended (see ajaxExtend)
-		flatOptions: {
-			url: true,
-			context: true
-		}
-	},
-
-	// Creates a full fledged settings object into target
-	// with both ajaxSettings and settings fields.
-	// If target is omitted, writes into ajaxSettings.
-	ajaxSetup: function( target, settings ) {
-		return settings ?
-
-			// Building a settings object
-			ajaxExtend( ajaxExtend( target, jQuery.ajaxSettings ), settings ) :
-
-			// Extending ajaxSettings
-			ajaxExtend( jQuery.ajaxSettings, target );
-	},
-
-	ajaxPrefilter: addToPrefiltersOrTransports( prefilters ),
-	ajaxTransport: addToPrefiltersOrTransports( transports ),
-
-	// Main method
-	ajax: function( url, options ) {
-
-		// If url is an object, simulate pre-1.5 signature
-		if ( typeof url === "object" ) {
-			options = url;
-			url = undefined;
-		}
-
-		// Force options to be an object
-		options = options || {};
-
-		var transport,
-			// URL without anti-cache param
-			cacheURL,
-			// Response headers
-			responseHeadersString,
-			responseHeaders,
-			// timeout handle
-			timeoutTimer,
-			// Cross-domain detection vars
-			parts,
-			// To know if global events are to be dispatched
-			fireGlobals,
-			// Loop variable
-			i,
-			// Create the final options object
-			s = jQuery.ajaxSetup( {}, options ),
-			// Callbacks context
-			callbackContext = s.context || s,
-			// Context for global events is callbackContext if it is a DOM node or jQuery collection
-			globalEventContext = s.context && ( callbackContext.nodeType || callbackContext.jquery ) ?
-				jQuery( callbackContext ) :
-				jQuery.event,
-			// Deferreds
-			deferred = jQuery.Deferred(),
-			completeDeferred = jQuery.Callbacks("once memory"),
-			// Status-dependent callbacks
-			statusCode = s.statusCode || {},
-			// Headers (they are sent all at once)
-			requestHeaders = {},
-			requestHeadersNames = {},
-			// The jqXHR state
-			state = 0,
-			// Default abort message
-			strAbort = "canceled",
-			// Fake xhr
-			jqXHR = {
-				readyState: 0,
-
-				// Builds headers hashtable if needed
-				getResponseHeader: function( key ) {
-					var match;
-					if ( state === 2 ) {
-						if ( !responseHeaders ) {
-							responseHeaders = {};
-							while ( (match = rheaders.exec( responseHeadersString )) ) {
-								responseHeaders[ match[1].toLowerCase() ] = match[ 2 ];
-							}
-						}
-						match = responseHeaders[ key.toLowerCase() ];
-					}
-					return match == null ? null : match;
-				},
-
-				// Raw string
-				getAllResponseHeaders: function() {
-					return state === 2 ? responseHeadersString : null;
-				},
-
-				// Caches the header
-				setRequestHeader: function( name, value ) {
-					var lname = name.toLowerCase();
-					if ( !state ) {
-						name = requestHeadersNames[ lname ] = requestHeadersNames[ lname ] || name;
-						requestHeaders[ name ] = value;
-					}
-					return this;
-				},
-
-				// Overrides response content-type header
-				overrideMimeType: function( type ) {
-					if ( !state ) {
-						s.mimeType = type;
-					}
-					return this;
-				},
-
-				// Status-dependent callbacks
-				statusCode: function( map ) {
-					var code;
-					if ( map ) {
-						if ( state < 2 ) {
-							for ( code in map ) {
-								// Lazy-add the new callback in a way that preserves old ones
-								statusCode[ code ] = [ statusCode[ code ], map[ code ] ];
-							}
-						} else {
-							// Execute the appropriate callbacks
-							jqXHR.always( map[ jqXHR.status ] );
-						}
-					}
-					return this;
-				},
-
-				// Cancel the request
-				abort: function( statusText ) {
-					var finalText = statusText || strAbort;
-					if ( transport ) {
-						transport.abort( finalText );
-					}
-					done( 0, finalText );
-					return this;
-				}
-			};
-
-		// Attach deferreds
-		deferred.promise( jqXHR ).complete = completeDeferred.add;
-		jqXHR.success = jqXHR.done;
-		jqXHR.error = jqXHR.fail;
-
-		// Remove hash character (#7531: and string promotion)
-		// Add protocol if not provided (prefilters might expect it)
-		// Handle falsy url in the settings object (#10093: consistency with old signature)
-		// We also use the url parameter if available
-		s.url = ( ( url || s.url || ajaxLocation ) + "" ).replace( rhash, "" )
-			.replace( rprotocol, ajaxLocParts[ 1 ] + "//" );
-
-		// Alias method option to type as per ticket #12004
-		s.type = options.method || options.type || s.method || s.type;
-
-		// Extract dataTypes list
-		s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().match( rnotwhite ) || [ "" ];
-
-		// A cross-domain request is in order when we have a protocol:host:port mismatch
-		if ( s.crossDomain == null ) {
-			parts = rurl.exec( s.url.toLowerCase() );
-			s.crossDomain = !!( parts &&
-				( parts[ 1 ] !== ajaxLocParts[ 1 ] || parts[ 2 ] !== ajaxLocParts[ 2 ] ||
-					( parts[ 3 ] || ( parts[ 1 ] === "http:" ? "80" : "443" ) ) !==
-						( ajaxLocParts[ 3 ] || ( ajaxLocParts[ 1 ] === "http:" ? "80" : "443" ) ) )
-			);
-		}
-
-		// Convert data if not already a string
-		if ( s.data && s.processData && typeof s.data !== "string" ) {
-			s.data = jQuery.param( s.data, s.traditional );
-		}
-
-		// Apply prefilters
-		inspectPrefiltersOrTransports( prefilters, s, options, jqXHR );
-
-		// If request was aborted inside a prefilter, stop there
-		if ( state === 2 ) {
-			return jqXHR;
-		}
-
-		// We can fire global events as of now if asked to
-		// Don't fire events if jQuery.event is undefined in an AMD-usage scenario (#15118)
-		fireGlobals = jQuery.event && s.global;
-
-		// Watch for a new set of requests
-		if ( fireGlobals && jQuery.active++ === 0 ) {
-			jQuery.event.trigger("ajaxStart");
-		}
-
-		// Uppercase the type
-		s.type = s.type.toUpperCase();
-
-		// Determine if request has content
-		s.hasContent = !rnoContent.test( s.type );
-
-		// Save the URL in case we're toying with the If-Modified-Since
-		// and/or If-None-Match header later on
-		cacheURL = s.url;
-
-		// More options handling for requests with no content
-		if ( !s.hasContent ) {
-
-			// If data is available, append data to url
-			if ( s.data ) {
-				cacheURL = ( s.url += ( rquery.test( cacheURL ) ? "&" : "?" ) + s.data );
-				// #9682: remove data so that it's not used in an eventual retry
-				delete s.data;
-			}
-
-			// Add anti-cache in url if needed
-			if ( s.cache === false ) {
-				s.url = rts.test( cacheURL ) ?
-
-					// If there is already a '_' parameter, set its value
-					cacheURL.replace( rts, "$1_=" + nonce++ ) :
-
-					// Otherwise add one to the end
-					cacheURL + ( rquery.test( cacheURL ) ? "&" : "?" ) + "_=" + nonce++;
-			}
-		}
-
-		// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
-		if ( s.ifModified ) {
-			if ( jQuery.lastModified[ cacheURL ] ) {
-				jqXHR.setRequestHeader( "If-Modified-Since", jQuery.lastModified[ cacheURL ] );
-			}
-			if ( jQuery.etag[ cacheURL ] ) {
-				jqXHR.setRequestHeader( "If-None-Match", jQuery.etag[ cacheURL ] );
-			}
-		}
-
-		// Set the correct header, if data is being sent
-		if ( s.data && s.hasContent && s.contentType !== false || options.contentType ) {
-			jqXHR.setRequestHeader( "Content-Type", s.contentType );
-		}
-
-		// Set the Accepts header for the server, depending on the dataType
-		jqXHR.setRequestHeader(
-			"Accept",
-			s.dataTypes[ 0 ] && s.accepts[ s.dataTypes[0] ] ?
-				s.accepts[ s.dataTypes[0] ] + ( s.dataTypes[ 0 ] !== "*" ? ", " + allTypes + "; q=0.01" : "" ) :
-				s.accepts[ "*" ]
-		);
-
-		// Check for headers option
-		for ( i in s.headers ) {
-			jqXHR.setRequestHeader( i, s.headers[ i ] );
-		}
-
-		// Allow custom headers/mimetypes and early abort
-		if ( s.beforeSend && ( s.beforeSend.call( callbackContext, jqXHR, s ) === false || state === 2 ) ) {
-			// Abort if not done already and return
-			return jqXHR.abort();
-		}
-
-		// Aborting is no longer a cancellation
-		strAbort = "abort";
-
-		// Install callbacks on deferreds
-		for ( i in { success: 1, error: 1, complete: 1 } ) {
-			jqXHR[ i ]( s[ i ] );
-		}
-
-		// Get transport
-		transport = inspectPrefiltersOrTransports( transports, s, options, jqXHR );
-
-		// If no transport, we auto-abort
-		if ( !transport ) {
-			done( -1, "No Transport" );
-		} else {
-			jqXHR.readyState = 1;
-
-			// Send global event
-			if ( fireGlobals ) {
-				globalEventContext.trigger( "ajaxSend", [ jqXHR, s ] );
-			}
-			// Timeout
-			if ( s.async && s.timeout > 0 ) {
-				timeoutTimer = setTimeout(function() {
-					jqXHR.abort("timeout");
-				}, s.timeout );
-			}
-
-			try {
-				state = 1;
-				transport.send( requestHeaders, done );
-			} catch ( e ) {
-				// Propagate exception as error if not done
-				if ( state < 2 ) {
-					done( -1, e );
-				// Simply rethrow otherwise
-				} else {
-					throw e;
-				}
-			}
-		}
-
-		// Callback for when everything is done
-		function done( status, nativeStatusText, responses, headers ) {
-			var isSuccess, success, error, response, modified,
-				statusText = nativeStatusText;
-
-			// Called once
-			if ( state === 2 ) {
-				return;
-			}
-
-			// State is "done" now
-			state = 2;
-
-			// Clear timeout if it exists
-			if ( timeoutTimer ) {
-				clearTimeout( timeoutTimer );
-			}
-
-			// Dereference transport for early garbage collection
-			// (no matter how long the jqXHR object will be used)
-			transport = undefined;
-
-			// Cache response headers
-			responseHeadersString = headers || "";
-
-			// Set readyState
-			jqXHR.readyState = status > 0 ? 4 : 0;
-
-			// Determine if successful
-			isSuccess = status >= 200 && status < 300 || status === 304;
-
-			// Get response data
-			if ( responses ) {
-				response = ajaxHandleResponses( s, jqXHR, responses );
-			}
-
-			// Convert no matter what (that way responseXXX fields are always set)
-			response = ajaxConvert( s, response, jqXHR, isSuccess );
-
-			// If successful, handle type chaining
-			if ( isSuccess ) {
-
-				// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
-				if ( s.ifModified ) {
-					modified = jqXHR.getResponseHeader("Last-Modified");
-					if ( modified ) {
-						jQuery.lastModified[ cacheURL ] = modified;
-					}
-					modified = jqXHR.getResponseHeader("etag");
-					if ( modified ) {
-						jQuery.etag[ cacheURL ] = modified;
-					}
-				}
-
-				// if no content
-				if ( status === 204 || s.type === "HEAD" ) {
-					statusText = "nocontent";
-
-				// if not modified
-				} else if ( status === 304 ) {
-					statusText = "notmodified";
-
-				// If we have data, let's convert it
-				} else {
-					statusText = response.state;
-					success = response.data;
-					error = response.error;
-					isSuccess = !error;
-				}
-			} else {
-				// Extract error from statusText and normalize for non-aborts
-				error = statusText;
-				if ( status || !statusText ) {
-					statusText = "error";
-					if ( status < 0 ) {
-						status = 0;
-					}
-				}
-			}
-
-			// Set data for the fake xhr object
-			jqXHR.status = status;
-			jqXHR.statusText = ( nativeStatusText || statusText ) + "";
-
-			// Success/Error
-			if ( isSuccess ) {
-				deferred.resolveWith( callbackContext, [ success, statusText, jqXHR ] );
-			} else {
-				deferred.rejectWith( callbackContext, [ jqXHR, statusText, error ] );
-			}
-
-			// Status-dependent callbacks
-			jqXHR.statusCode( statusCode );
-			statusCode = undefined;
-
-			if ( fireGlobals ) {
-				globalEventContext.trigger( isSuccess ? "ajaxSuccess" : "ajaxError",
-					[ jqXHR, s, isSuccess ? success : error ] );
-			}
-
-			// Complete
-			completeDeferred.fireWith( callbackContext, [ jqXHR, statusText ] );
-
-			if ( fireGlobals ) {
-				globalEventContext.trigger( "ajaxComplete", [ jqXHR, s ] );
-				// Handle the global AJAX counter
-				if ( !( --jQuery.active ) ) {
-					jQuery.event.trigger("ajaxStop");
-				}
-			}
-		}
-
-		return jqXHR;
-	},
-
-	getJSON: function( url, data, callback ) {
-		return jQuery.get( url, data, callback, "json" );
-	},
-
-	getScript: function( url, callback ) {
-		return jQuery.get( url, undefined, callback, "script" );
-	}
-});
-
-jQuery.each( [ "get", "post" ], function( i, method ) {
-	jQuery[ method ] = function( url, data, callback, type ) {
-		// Shift arguments if data argument was omitted
-		if ( jQuery.isFunction( data ) ) {
-			type = type || callback;
-			callback = data;
-			data = undefined;
-		}
-
-		return jQuery.ajax({
-			url: url,
-			type: method,
-			dataType: type,
-			data: data,
-			success: callback
-		});
-	};
-});
-
-
-jQuery._evalUrl = function( url ) {
-	return jQuery.ajax({
-		url: url,
-		type: "GET",
-		dataType: "script",
-		async: false,
-		global: false,
-		"throws": true
-	});
-};
-
-
-jQuery.fn.extend({
-	wrapAll: function( html ) {
-		var wrap;
-
-		if ( jQuery.isFunction( html ) ) {
-			return this.each(function( i ) {
-				jQuery( this ).wrapAll( html.call(this, i) );
-			});
-		}
-
-		if ( this[ 0 ] ) {
-
-			// The elements to wrap the target around
-			wrap = jQuery( html, this[ 0 ].ownerDocument ).eq( 0 ).clone( true );
-
-			if ( this[ 0 ].parentNode ) {
-				wrap.insertBefore( this[ 0 ] );
-			}
-
-			wrap.map(function() {
-				var elem = this;
-
-				while ( elem.firstElementChild ) {
-					elem = elem.firstElementChild;
-				}
-
-				return elem;
-			}).append( this );
-		}
-
-		return this;
-	},
-
-	wrapInner: function( html ) {
-		if ( jQuery.isFunction( html ) ) {
-			return this.each(function( i ) {
-				jQuery( this ).wrapInner( html.call(this, i) );
-			});
-		}
-
-		return this.each(function() {
-			var self = jQuery( this ),
-				contents = self.contents();
-
-			if ( contents.length ) {
-				contents.wrapAll( html );
-
-			} else {
-				self.append( html );
-			}
-		});
-	},
-
-	wrap: function( html ) {
-		var isFunction = jQuery.isFunction( html );
-
-		return this.each(function( i ) {
-			jQuery( this ).wrapAll( isFunction ? html.call(this, i) : html );
-		});
-	},
-
-	unwrap: function() {
-		return this.parent().each(function() {
-			if ( !jQuery.nodeName( this, "body" ) ) {
-				jQuery( this ).replaceWith( this.childNodes );
-			}
-		}).end();
-	}
-});
-
-
-jQuery.expr.filters.hidden = function( elem ) {
-	// Support: Opera <= 12.12
-	// Opera reports offsetWidths and offsetHeights less than zero on some elements
-	return elem.offsetWidth <= 0 && elem.offsetHeight <= 0;
-};
-jQuery.expr.filters.visible = function( elem ) {
-	return !jQuery.expr.filters.hidden( elem );
-};
-
-
-
-
-var r20 = /%20/g,
-	rbracket = /\[\]$/,
-	rCRLF = /\r?\n/g,
-	rsubmitterTypes = /^(?:submit|button|image|reset|file)$/i,
-	rsubmittable = /^(?:input|select|textarea|keygen)/i;
-
-function buildParams( prefix, obj, traditional, add ) {
-	var name;
-
-	if ( jQuery.isArray( obj ) ) {
-		// Serialize array item.
-		jQuery.each( obj, function( i, v ) {
-			if ( traditional || rbracket.test( prefix ) ) {
-				// Treat each array item as a scalar.
-				add( prefix, v );
-
-			} else {
-				// Item is non-scalar (array or object), encode its numeric index.
-				buildParams( prefix + "[" + ( typeof v === "object" ? i : "" ) + "]", v, traditional, add );
-			}
-		});
-
-	} else if ( !traditional && jQuery.type( obj ) === "object" ) {
-		// Serialize object item.
-		for ( name in obj ) {
-			buildParams( prefix + "[" + name + "]", obj[ name ], traditional, add );
-		}
-
-	} else {
-		// Serialize scalar item.
-		add( prefix, obj );
-	}
-}
-
-// Serialize an array of form elements or a set of
-// key/values into a query string
-jQuery.param = function( a, traditional ) {
-	var prefix,
-		s = [],
-		add = function( key, value ) {
-			// If value is a function, invoke it and return its value
-			value = jQuery.isFunction( value ) ? value() : ( value == null ? "" : value );
-			s[ s.length ] = encodeURIComponent( key ) + "=" + encodeURIComponent( value );
-		};
-
-	// Set traditional to true for jQuery <= 1.3.2 behavior.
-	if ( traditional === undefined ) {
-		traditional = jQuery.ajaxSettings && jQuery.ajaxSettings.traditional;
-	}
-
-	// If an array was passed in, assume that it is an array of form elements.
-	if ( jQuery.isArray( a ) || ( a.jquery && !jQuery.isPlainObject( a ) ) ) {
-		// Serialize the form elements
-		jQuery.each( a, function() {
-			add( this.name, this.value );
-		});
-
-	} else {
-		// If traditional, encode the "old" way (the way 1.3.2 or older
-		// did it), otherwise encode params recursively.
-		for ( prefix in a ) {
-			buildParams( prefix, a[ prefix ], traditional, add );
-		}
-	}
-
-	// Return the resulting serialization
-	return s.join( "&" ).replace( r20, "+" );
-};
-
-jQuery.fn.extend({
-	serialize: function() {
-		return jQuery.param( this.serializeArray() );
-	},
-	serializeArray: function() {
-		return this.map(function() {
-			// Can add propHook for "elements" to filter or add form elements
-			var elements = jQuery.prop( this, "elements" );
-			return elements ? jQuery.makeArray( elements ) : this;
-		})
-		.filter(function() {
-			var type = this.type;
-
-			// Use .is( ":disabled" ) so that fieldset[disabled] works
-			return this.name && !jQuery( this ).is( ":disabled" ) &&
-				rsubmittable.test( this.nodeName ) && !rsubmitterTypes.test( type ) &&
-				( this.checked || !rcheckableType.test( type ) );
-		})
-		.map(function( i, elem ) {
-			var val = jQuery( this ).val();
-
-			return val == null ?
-				null :
-				jQuery.isArray( val ) ?
-					jQuery.map( val, function( val ) {
-						return { name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
-					}) :
-					{ name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
-		}).get();
-	}
-});
-
-
-jQuery.ajaxSettings.xhr = function() {
-	try {
-		return new XMLHttpRequest();
-	} catch( e ) {}
-};
-
-var xhrId = 0,
-	xhrCallbacks = {},
-	xhrSuccessStatus = {
-		// file protocol always yields status code 0, assume 200
-		0: 200,
-		// Support: IE9
-		// #1450: sometimes IE returns 1223 when it should be 204
-		1223: 204
-	},
-	xhrSupported = jQuery.ajaxSettings.xhr();
-
-// Support: IE9
-// Open requests must be manually aborted on unload (#5280)
-// See https://support.microsoft.com/kb/2856746 for more info
-if ( window.attachEvent ) {
-	window.attachEvent( "onunload", function() {
-		for ( var key in xhrCallbacks ) {
-			xhrCallbacks[ key ]();
-		}
-	});
-}
-
-support.cors = !!xhrSupported && ( "withCredentials" in xhrSupported );
-support.ajax = xhrSupported = !!xhrSupported;
-
-jQuery.ajaxTransport(function( options ) {
-	var callback;
-
-	// Cross domain only allowed if supported through XMLHttpRequest
-	if ( support.cors || xhrSupported && !options.crossDomain ) {
-		return {
-			send: function( headers, complete ) {
-				var i,
-					xhr = options.xhr(),
-					id = ++xhrId;
-
-				xhr.open( options.type, options.url, options.async, options.username, options.password );
-
-				// Apply custom fields if provided
-				if ( options.xhrFields ) {
-					for ( i in options.xhrFields ) {
-						xhr[ i ] = options.xhrFields[ i ];
-					}
-				}
-
-				// Override mime type if needed
-				if ( options.mimeType && xhr.overrideMimeType ) {
-					xhr.overrideMimeType( options.mimeType );
-				}
-
-				// X-Requested-With header
-				// For cross-domain requests, seeing as conditions for a preflight are
-				// akin to a jigsaw puzzle, we simply never set it to be sure.
-				// (it can always be set on a per-request basis or even using ajaxSetup)
-				// For same-domain requests, won't change header if already provided.
-				if ( !options.crossDomain && !headers["X-Requested-With"] ) {
-					headers["X-Requested-With"] = "XMLHttpRequest";
-				}
-
-				// Set headers
-				for ( i in headers ) {
-					xhr.setRequestHeader( i, headers[ i ] );
-				}
-
-				// Callback
-				callback = function( type ) {
-					return function() {
-						if ( callback ) {
-							delete xhrCallbacks[ id ];
-							callback = xhr.onload = xhr.onerror = null;
-
-							if ( type === "abort" ) {
-								xhr.abort();
-							} else if ( type === "error" ) {
-								complete(
-									// file: protocol always yields status 0; see #8605, #14207
-									xhr.status,
-									xhr.statusText
-								);
-							} else {
-								complete(
-									xhrSuccessStatus[ xhr.status ] || xhr.status,
-									xhr.statusText,
-									// Support: IE9
-									// Accessing binary-data responseText throws an exception
-									// (#11426)
-									typeof xhr.responseText === "string" ? {
-										text: xhr.responseText
-									} : undefined,
-									xhr.getAllResponseHeaders()
-								);
-							}
-						}
-					};
-				};
-
-				// Listen to events
-				xhr.onload = callback();
-				xhr.onerror = callback("error");
-
-				// Create the abort callback
-				callback = xhrCallbacks[ id ] = callback("abort");
-
-				try {
-					// Do send the request (this may raise an exception)
-					xhr.send( options.hasContent && options.data || null );
-				} catch ( e ) {
-					// #14683: Only rethrow if this hasn't been notified as an error yet
-					if ( callback ) {
-						throw e;
-					}
-				}
-			},
-
-			abort: function() {
-				if ( callback ) {
-					callback();
-				}
-			}
-		};
-	}
-});
-
-
-
-
-// Install script dataType
-jQuery.ajaxSetup({
-	accepts: {
-		script: "text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"
-	},
-	contents: {
-		script: /(?:java|ecma)script/
-	},
-	converters: {
-		"text script": function( text ) {
-			jQuery.globalEval( text );
-			return text;
-		}
-	}
-});
-
-// Handle cache's special case and crossDomain
-jQuery.ajaxPrefilter( "script", function( s ) {
-	if ( s.cache === undefined ) {
-		s.cache = false;
-	}
-	if ( s.crossDomain ) {
-		s.type = "GET";
-	}
-});
-
-// Bind script tag hack transport
-jQuery.ajaxTransport( "script", function( s ) {
-	// This transport only deals with cross domain requests
-	if ( s.crossDomain ) {
-		var script, callback;
-		return {
-			send: function( _, complete ) {
-				script = jQuery("<script>").prop({
-					async: true,
-					charset: s.scriptCharset,
-					src: s.url
-				}).on(
-					"load error",
-					callback = function( evt ) {
-						script.remove();
-						callback = null;
-						if ( evt ) {
-							complete( evt.type === "error" ? 404 : 200, evt.type );
-						}
-					}
-				);
-				document.head.appendChild( script[ 0 ] );
-			},
-			abort: function() {
-				if ( callback ) {
-					callback();
-				}
-			}
-		};
-	}
-});
-
-
-
-
-var oldCallbacks = [],
-	rjsonp = /(=)\?(?=&|$)|\?\?/;
-
-// Default jsonp settings
-jQuery.ajaxSetup({
-	jsonp: "callback",
-	jsonpCallback: function() {
-		var callback = oldCallbacks.pop() || ( jQuery.expando + "_" + ( nonce++ ) );
-		this[ callback ] = true;
-		return callback;
-	}
-});
-
-// Detect, normalize options and install callbacks for jsonp requests
-jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
-
-	var callbackName, overwritten, responseContainer,
-		jsonProp = s.jsonp !== false && ( rjsonp.test( s.url ) ?
-			"url" :
-			typeof s.data === "string" && !( s.contentType || "" ).indexOf("application/x-www-form-urlencoded") && rjsonp.test( s.data ) && "data"
-		);
-
-	// Handle iff the expected data type is "jsonp" or we have a parameter to set
-	if ( jsonProp || s.dataTypes[ 0 ] === "jsonp" ) {
-
-		// Get callback name, remembering preexisting value associated with it
-		callbackName = s.jsonpCallback = jQuery.isFunction( s.jsonpCallback ) ?
-			s.jsonpCallback() :
-			s.jsonpCallback;
-
-		// Insert callback into url or form data
-		if ( jsonProp ) {
-			s[ jsonProp ] = s[ jsonProp ].replace( rjsonp, "$1" + callbackName );
-		} else if ( s.jsonp !== false ) {
-			s.url += ( rquery.test( s.url ) ? "&" : "?" ) + s.jsonp + "=" + callbackName;
-		}
-
-		// Use data converter to retrieve json after script execution
-		s.converters["script json"] = function() {
-			if ( !responseContainer ) {
-				jQuery.error( callbackName + " was not called" );
-			}
-			return responseContainer[ 0 ];
-		};
-
-		// force json dataType
-		s.dataTypes[ 0 ] = "json";
-
-		// Install callback
-		overwritten = window[ callbackName ];
-		window[ callbackName ] = function() {
-			responseContainer = arguments;
-		};
-
-		// Clean-up function (fires after converters)
-		jqXHR.always(function() {
-			// Restore preexisting value
-			window[ callbackName ] = overwritten;
-
-			// Save back as free
-			if ( s[ callbackName ] ) {
-				// make sure that re-using the options doesn't screw things around
-				s.jsonpCallback = originalSettings.jsonpCallback;
-
-				// save the callback name for future use
-				oldCallbacks.push( callbackName );
-			}
-
-			// Call if it was a function and we have a response
-			if ( responseContainer && jQuery.isFunction( overwritten ) ) {
-				overwritten( responseContainer[ 0 ] );
-			}
-
-			responseContainer = overwritten = undefined;
-		});
-
-		// Delegate to script
-		return "script";
-	}
-});
-
-
-
-
-// data: string of html
-// context (optional): If specified, the fragment will be created in this context, defaults to document
-// keepScripts (optional): If true, will include scripts passed in the html string
-jQuery.parseHTML = function( data, context, keepScripts ) {
-	if ( !data || typeof data !== "string" ) {
-		return null;
-	}
-	if ( typeof context === "boolean" ) {
-		keepScripts = context;
-		context = false;
-	}
-	context = context || document;
-
-	var parsed = rsingleTag.exec( data ),
-		scripts = !keepScripts && [];
-
-	// Single tag
-	if ( parsed ) {
-		return [ context.createElement( parsed[1] ) ];
-	}
-
-	parsed = jQuery.buildFragment( [ data ], context, scripts );
-
-	if ( scripts && scripts.length ) {
-		jQuery( scripts ).remove();
-	}
-
-	return jQuery.merge( [], parsed.childNodes );
-};
-
-
-// Keep a copy of the old load method
-var _load = jQuery.fn.load;
-
-/**
- * Load a url into a page
- */
-jQuery.fn.load = function( url, params, callback ) {
-	if ( typeof url !== "string" && _load ) {
-		return _load.apply( this, arguments );
-	}
-
-	var selector, type, response,
-		self = this,
-		off = url.indexOf(" ");
-
-	if ( off >= 0 ) {
-		selector = jQuery.trim( url.slice( off ) );
-		url = url.slice( 0, off );
-	}
-
-	// If it's a function
-	if ( jQuery.isFunction( params ) ) {
-
-		// We assume that it's the callback
-		callback = params;
-		params = undefined;
-
-	// Otherwise, build a param string
-	} else if ( params && typeof params === "object" ) {
-		type = "POST";
-	}
-
-	// If we have elements to modify, make the request
-	if ( self.length > 0 ) {
-		jQuery.ajax({
-			url: url,
-
-			// if "type" variable is undefined, then "GET" method will be used
-			type: type,
-			dataType: "html",
-			data: params
-		}).done(function( responseText ) {
-
-			// Save response for use in complete callback
-			response = arguments;
-
-			self.html( selector ?
-
-				// If a selector was specified, locate the right elements in a dummy div
-				// Exclude scripts to avoid IE 'Permission Denied' errors
-				jQuery("<div>").append( jQuery.parseHTML( responseText ) ).find( selector ) :
-
-				// Otherwise use the full result
-				responseText );
-
-		}).complete( callback && function( jqXHR, status ) {
-			self.each( callback, response || [ jqXHR.responseText, status, jqXHR ] );
-		});
-	}
-
-	return this;
-};
-
-
-
-
-// Attach a bunch of functions for handling common AJAX events
-jQuery.each( [ "ajaxStart", "ajaxStop", "ajaxComplete", "ajaxError", "ajaxSuccess", "ajaxSend" ], function( i, type ) {
-	jQuery.fn[ type ] = function( fn ) {
-		return this.on( type, fn );
-	};
-});
-
-
-
-
-jQuery.expr.filters.animated = function( elem ) {
-	return jQuery.grep(jQuery.timers, function( fn ) {
-		return elem === fn.elem;
-	}).length;
-};
-
-
-
-
-var docElem = window.document.documentElement;
-
-/**
- * Gets a window from an element
- */
-function getWindow( elem ) {
-	return jQuery.isWindow( elem ) ? elem : elem.nodeType === 9 && elem.defaultView;
-}
-
-jQuery.offset = {
-	setOffset: function( elem, options, i ) {
-		var curPosition, curLeft, curCSSTop, curTop, curOffset, curCSSLeft, calculatePosition,
-			position = jQuery.css( elem, "position" ),
-			curElem = jQuery( elem ),
-			props = {};
-
-		// Set position first, in-case top/left are set even on static elem
-		if ( position === "static" ) {
-			elem.style.position = "relative";
-		}
-
-		curOffset = curElem.offset();
-		curCSSTop = jQuery.css( elem, "top" );
-		curCSSLeft = jQuery.css( elem, "left" );
-		calculatePosition = ( position === "absolute" || position === "fixed" ) &&
-			( curCSSTop + curCSSLeft ).indexOf("auto") > -1;
-
-		// Need to be able to calculate position if either
-		// top or left is auto and position is either absolute or fixed
-		if ( calculatePosition ) {
-			curPosition = curElem.position();
-			curTop = curPosition.top;
-			curLeft = curPosition.left;
-
-		} else {
-			curTop = parseFloat( curCSSTop ) || 0;
-			curLeft = parseFloat( curCSSLeft ) || 0;
-		}
-
-		if ( jQuery.isFunction( options ) ) {
-			options = options.call( elem, i, curOffset );
-		}
-
-		if ( options.top != null ) {
-			props.top = ( options.top - curOffset.top ) + curTop;
-		}
-		if ( options.left != null ) {
-			props.left = ( options.left - curOffset.left ) + curLeft;
-		}
-
-		if ( "using" in options ) {
-			options.using.call( elem, props );
-
-		} else {
-			curElem.css( props );
-		}
-	}
-};
-
-jQuery.fn.extend({
-	offset: function( options ) {
-		if ( arguments.length ) {
-			return options === undefined ?
-				this :
-				this.each(function( i ) {
-					jQuery.offset.setOffset( this, options, i );
-				});
-		}
-
-		var docElem, win,
-			elem = this[ 0 ],
-			box = { top: 0, left: 0 },
-			doc = elem && elem.ownerDocument;
-
-		if ( !doc ) {
-			return;
-		}
-
-		docElem = doc.documentElement;
-
-		// Make sure it's not a disconnected DOM node
-		if ( !jQuery.contains( docElem, elem ) ) {
-			return box;
-		}
-
-		// Support: BlackBerry 5, iOS 3 (original iPhone)
-		// If we don't have gBCR, just use 0,0 rather than error
-		if ( typeof elem.getBoundingClientRect !== strundefined ) {
-			box = elem.getBoundingClientRect();
-		}
-		win = getWindow( doc );
-		return {
-			top: box.top + win.pageYOffset - docElem.clientTop,
-			left: box.left + win.pageXOffset - docElem.clientLeft
-		};
-	},
-
-	position: function() {
-		if ( !this[ 0 ] ) {
-			return;
-		}
-
-		var offsetParent, offset,
-			elem = this[ 0 ],
-			parentOffset = { top: 0, left: 0 };
-
-		// Fixed elements are offset from window (parentOffset = {top:0, left: 0}, because it is its only offset parent
-		if ( jQuery.css( elem, "position" ) === "fixed" ) {
-			// Assume getBoundingClientRect is there when computed position is fixed
-			offset = elem.getBoundingClientRect();
-
-		} else {
-			// Get *real* offsetParent
-			offsetParent = this.offsetParent();
-
-			// Get correct offsets
-			offset = this.offset();
-			if ( !jQuery.nodeName( offsetParent[ 0 ], "html" ) ) {
-				parentOffset = offsetParent.offset();
-			}
-
-			// Add offsetParent borders
-			parentOffset.top += jQuery.css( offsetParent[ 0 ], "borderTopWidth", true );
-			parentOffset.left += jQuery.css( offsetParent[ 0 ], "borderLeftWidth", true );
-		}
-
-		// Subtract parent offsets and element margins
-		return {
-			top: offset.top - parentOffset.top - jQuery.css( elem, "marginTop", true ),
-			left: offset.left - parentOffset.left - jQuery.css( elem, "marginLeft", true )
-		};
-	},
-
-	offsetParent: function() {
-		return this.map(function() {
-			var offsetParent = this.offsetParent || docElem;
-
-			while ( offsetParent && ( !jQuery.nodeName( offsetParent, "html" ) && jQuery.css( offsetParent, "position" ) === "static" ) ) {
-				offsetParent = offsetParent.offsetParent;
-			}
-
-			return offsetParent || docElem;
-		});
-	}
-});
-
-// Create scrollLeft and scrollTop methods
-jQuery.each( { scrollLeft: "pageXOffset", scrollTop: "pageYOffset" }, function( method, prop ) {
-	var top = "pageYOffset" === prop;
-
-	jQuery.fn[ method ] = function( val ) {
-		return access( this, function( elem, method, val ) {
-			var win = getWindow( elem );
-
-			if ( val === undefined ) {
-				return win ? win[ prop ] : elem[ method ];
-			}
-
-			if ( win ) {
-				win.scrollTo(
-					!top ? val : window.pageXOffset,
-					top ? val : window.pageYOffset
-				);
-
-			} else {
-				elem[ method ] = val;
-			}
-		}, method, val, arguments.length, null );
-	};
-});
-
-// Support: Safari<7+, Chrome<37+
-// Add the top/left cssHooks using jQuery.fn.position
-// Webkit bug: https://bugs.webkit.org/show_bug.cgi?id=29084
-// Blink bug: https://code.google.com/p/chromium/issues/detail?id=229280
-// getComputedStyle returns percent when specified for top/left/bottom/right;
-// rather than make the css module depend on the offset module, just check for it here
-jQuery.each( [ "top", "left" ], function( i, prop ) {
-	jQuery.cssHooks[ prop ] = addGetHookIf( support.pixelPosition,
-		function( elem, computed ) {
-			if ( computed ) {
-				computed = curCSS( elem, prop );
-				// If curCSS returns percentage, fallback to offset
-				return rnumnonpx.test( computed ) ?
-					jQuery( elem ).position()[ prop ] + "px" :
-					computed;
-			}
-		}
-	);
-});
-
-
-// Create innerHeight, innerWidth, height, width, outerHeight and outerWidth methods
-jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
-	jQuery.each( { padding: "inner" + name, content: type, "": "outer" + name }, function( defaultExtra, funcName ) {
-		// Margin is only for outerHeight, outerWidth
-		jQuery.fn[ funcName ] = function( margin, value ) {
-			var chainable = arguments.length && ( defaultExtra || typeof margin !== "boolean" ),
-				extra = defaultExtra || ( margin === true || value === true ? "margin" : "border" );
-
-			return access( this, function( elem, type, value ) {
-				var doc;
-
-				if ( jQuery.isWindow( elem ) ) {
-					// As of 5/8/2012 this will yield incorrect results for Mobile Safari, but there
-					// isn't a whole lot we can do. See pull request at this URL for discussion:
-					// https://github.com/jquery/jquery/pull/764
-					return elem.document.documentElement[ "client" + name ];
-				}
-
-				// Get document width or height
-				if ( elem.nodeType === 9 ) {
-					doc = elem.documentElement;
-
-					// Either scroll[Width/Height] or offset[Width/Height] or client[Width/Height],
-					// whichever is greatest
-					return Math.max(
-						elem.body[ "scroll" + name ], doc[ "scroll" + name ],
-						elem.body[ "offset" + name ], doc[ "offset" + name ],
-						doc[ "client" + name ]
-					);
-				}
-
-				return value === undefined ?
-					// Get width or height on the element, requesting but not forcing parseFloat
-					jQuery.css( elem, type, extra ) :
-
-					// Set width or height on the element
-					jQuery.style( elem, type, value, extra );
-			}, type, chainable ? margin : undefined, chainable, null );
-		};
-	});
-});
-
-
-// The number of elements contained in the matched element set
-jQuery.fn.size = function() {
-	return this.length;
-};
-
-jQuery.fn.andSelf = jQuery.fn.addBack;
-
-
-
-
-// Register as a named AMD module, since jQuery can be concatenated with other
-// files that may use define, but not via a proper concatenation script that
-// understands anonymous AMD modules. A named AMD is safest and most robust
-// way to register. Lowercase jquery is used because AMD module names are
-// derived from file names, and jQuery is normally delivered in a lowercase
-// file name. Do this after creating the global so that if an AMD module wants
-// to call noConflict to hide this version of jQuery, it will work.
-
-// Note that for maximum portability, libraries that are not jQuery should
-// declare themselves as anonymous modules, and avoid setting a global if an
-// AMD loader is present. jQuery is a special case. For more information, see
-// https://github.com/jrburke/requirejs/wiki/Updating-existing-libraries#wiki-anon
-
-if ( typeof define === "function" && define.amd ) {
-	define( "jquery", [], function() {
-		return jQuery;
-	});
-}
-
-
-
-
-var
-	// Map over jQuery in case of overwrite
-	_jQuery = window.jQuery,
-
-	// Map over the $ in case of overwrite
-	_$ = window.$;
-
-jQuery.noConflict = function( deep ) {
-	if ( window.$ === jQuery ) {
-		window.$ = _$;
-	}
-
-	if ( deep && window.jQuery === jQuery ) {
-		window.jQuery = _jQuery;
-	}
-
-	return jQuery;
-};
-
-// Expose jQuery and $ identifiers, even in AMD
-// (#7102#comment:10, https://github.com/jquery/jquery/pull/557)
-// and CommonJS for browser emulators (#13566)
-if ( typeof noGlobal === strundefined ) {
-	window.jQuery = window.$ = jQuery;
-}
-
-
-
-
-return jQuery;
-
-}));
diff --git a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2.js b/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2.js
deleted file mode 100644
index 195ccee5b..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2.js
+++ /dev/null
@@ -1,3729 +0,0 @@
-/*
-Copyright 2012 Igor Vaynberg
-
-Version: 3.5.4 Timestamp: Sun Aug 30 13:30:32 EDT 2015
-
-This software is licensed under the Apache License, Version 2.0 (the "Apache License") or the GNU
-General Public License version 2 (the "GPL License"). You may choose either license to govern your
-use of this software only upon the condition that you accept all of the terms of either the Apache
-License or the GPL License.
-
-You may obtain a copy of the Apache License and the GPL License at:
-
-    http://www.apache.org/licenses/LICENSE-2.0
-    http://www.gnu.org/licenses/gpl-2.0.html
-
-Unless required by applicable law or agreed to in writing, software distributed under the
-Apache License or the GPL License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-CONDITIONS OF ANY KIND, either express or implied. See the Apache License and the GPL License for
-the specific language governing permissions and limitations under the Apache License and the GPL License.
-*/
-(function ($) {
-    if(typeof $.fn.each2 == "undefined") {
-        $.extend($.fn, {
-            /*
-            * 4-10 times faster .each replacement
-            * use it carefully, as it overrides jQuery context of element on each iteration
-            */
-            each2 : function (c) {
-                var j = $([0]), i = -1, l = this.length;
-                while (
-                    ++i < l
-                    && (j.context = j[0] = this[i])
-                    && c.call(j[0], i, j) !== false //"this"=DOM, i=index, j=jQuery object
-                );
-                return this;
-            }
-        });
-    }
-})(jQuery);
-
-(function ($, undefined) {
-    "use strict";
-    /*global document, window, jQuery, console */
-
-    if (window.Select2 !== undefined) {
-        return;
-    }
-
-    var AbstractSelect2, SingleSelect2, MultiSelect2, nextUid, sizer,
-        lastMousePosition={x:0,y:0}, $document, scrollBarDimensions,
-
-    KEY = {
-        TAB: 9,
-        ENTER: 13,
-        ESC: 27,
-        SPACE: 32,
-        LEFT: 37,
-        UP: 38,
-        RIGHT: 39,
-        DOWN: 40,
-        SHIFT: 16,
-        CTRL: 17,
-        ALT: 18,
-        PAGE_UP: 33,
-        PAGE_DOWN: 34,
-        HOME: 36,
-        END: 35,
-        BACKSPACE: 8,
-        DELETE: 46,
-        isArrow: function (k) {
-            k = k.which ? k.which : k;
-            switch (k) {
-            case KEY.LEFT:
-            case KEY.RIGHT:
-            case KEY.UP:
-            case KEY.DOWN:
-                return true;
-            }
-            return false;
-        },
-        isControl: function (e) {
-            var k = e.which;
-            switch (k) {
-            case KEY.SHIFT:
-            case KEY.CTRL:
-            case KEY.ALT:
-                return true;
-            }
-
-            if (e.metaKey) return true;
-
-            return false;
-        },
-        isFunctionKey: function (k) {
-            k = k.which ? k.which : k;
-            return k >= 112 && k <= 123;
-        }
-    },
-    MEASURE_SCROLLBAR_TEMPLATE = "<div class='select2-measure-scrollbar'></div>",
-
-    DIACRITICS = {"\u24B6":"A","\uFF21":"A","\u00C0":"A","\u00C1":"A","\u00C2":"A","\u1EA6":"A","\u1EA4":"A","\u1EAA":"A","\u1EA8":"A","\u00C3":"A","\u0100":"A","\u0102":"A","\u1EB0":"A","\u1EAE":"A","\u1EB4":"A","\u1EB2":"A","\u0226":"A","\u01E0":"A","\u00C4":"A","\u01DE":"A","\u1EA2":"A","\u00C5":"A","\u01FA":"A","\u01CD":"A","\u0200":"A","\u0202":"A","\u1EA0":"A","\u1EAC":"A","\u1EB6":"A","\u1E00":"A","\u0104":"A","\u023A":"A","\u2C6F":"A","\uA732":"AA","\u00C6":"AE","\u01FC":"AE","\u01E2":"AE","\uA734":"AO","\uA736":"AU","\uA738":"AV","\uA73A":"AV","\uA73C":"AY","\u24B7":"B","\uFF22":"B","\u1E02":"B","\u1E04":"B","\u1E06":"B","\u0243":"B","\u0182":"B","\u0181":"B","\u24B8":"C","\uFF23":"C","\u0106":"C","\u0108":"C","\u010A":"C","\u010C":"C","\u00C7":"C","\u1E08":"C","\u0187":"C","\u023B":"C","\uA73E":"C","\u24B9":"D","\uFF24":"D","\u1E0A":"D","\u010E":"D","\u1E0C":"D","\u1E10":"D","\u1E12":"D","\u1E0E":"D","\u0110":"D","\u018B":"D","\u018A":"D","\u0189":"D","\uA779":"D","\u01F1":"DZ","\u01C4":"DZ","\u01F2":"Dz","\u01C5":"Dz","\u24BA":"E","\uFF25":"E","\u00C8":"E","\u00C9":"E","\u00CA":"E","\u1EC0":"E","\u1EBE":"E","\u1EC4":"E","\u1EC2":"E","\u1EBC":"E","\u0112":"E","\u1E14":"E","\u1E16":"E","\u0114":"E","\u0116":"E","\u00CB":"E","\u1EBA":"E","\u011A":"E","\u0204":"E","\u0206":"E","\u1EB8":"E","\u1EC6":"E","\u0228":"E","\u1E1C":"E","\u0118":"E","\u1E18":"E","\u1E1A":"E","\u0190":"E","\u018E":"E","\u24BB":"F","\uFF26":"F","\u1E1E":"F","\u0191":"F","\uA77B":"F","\u24BC":"G","\uFF27":"G","\u01F4":"G","\u011C":"G","\u1E20":"G","\u011E":"G","\u0120":"G","\u01E6":"G","\u0122":"G","\u01E4":"G","\u0193":"G","\uA7A0":"G","\uA77D":"G","\uA77E":"G","\u24BD":"H","\uFF28":"H","\u0124":"H","\u1E22":"H","\u1E26":"H","\u021E":"H","\u1E24":"H","\u1E28":"H","\u1E2A":"H","\u0126":"H","\u2C67":"H","\u2C75":"H","\uA78D":"H","\u24BE":"I","\uFF29":"I","\u00CC":"I","\u00CD":"I","\u00CE":"I","\u0128":"I","\u012A":"I","\u012C":"I","\u0130":"I","\u00CF":"I","\u1E2E":"I","\u1EC8":"I","\u01CF":"I","\u0208":"I","\u020A":"I","\u1ECA":"I","\u012E":"I","\u1E2C":"I","\u0197":"I","\u24BF":"J","\uFF2A":"J","\u0134":"J","\u0248":"J","\u24C0":"K","\uFF2B":"K","\u1E30":"K","\u01E8":"K","\u1E32":"K","\u0136":"K","\u1E34":"K","\u0198":"K","\u2C69":"K","\uA740":"K","\uA742":"K","\uA744":"K","\uA7A2":"K","\u24C1":"L","\uFF2C":"L","\u013F":"L","\u0139":"L","\u013D":"L","\u1E36":"L","\u1E38":"L","\u013B":"L","\u1E3C":"L","\u1E3A":"L","\u0141":"L","\u023D":"L","\u2C62":"L","\u2C60":"L","\uA748":"L","\uA746":"L","\uA780":"L","\u01C7":"LJ","\u01C8":"Lj","\u24C2":"M","\uFF2D":"M","\u1E3E":"M","\u1E40":"M","\u1E42":"M","\u2C6E":"M","\u019C":"M","\u24C3":"N","\uFF2E":"N","\u01F8":"N","\u0143":"N","\u00D1":"N","\u1E44":"N","\u0147":"N","\u1E46":"N","\u0145":"N","\u1E4A":"N","\u1E48":"N","\u0220":"N","\u019D":"N","\uA790":"N","\uA7A4":"N","\u01CA":"NJ","\u01CB":"Nj","\u24C4":"O","\uFF2F":"O","\u00D2":"O","\u00D3":"O","\u00D4":"O","\u1ED2":"O","\u1ED0":"O","\u1ED6":"O","\u1ED4":"O","\u00D5":"O","\u1E4C":"O","\u022C":"O","\u1E4E":"O","\u014C":"O","\u1E50":"O","\u1E52":"O","\u014E":"O","\u022E":"O","\u0230":"O","\u00D6":"O","\u022A":"O","\u1ECE":"O","\u0150":"O","\u01D1":"O","\u020C":"O","\u020E":"O","\u01A0":"O","\u1EDC":"O","\u1EDA":"O","\u1EE0":"O","\u1EDE":"O","\u1EE2":"O","\u1ECC":"O","\u1ED8":"O","\u01EA":"O","\u01EC":"O","\u00D8":"O","\u01FE":"O","\u0186":"O","\u019F":"O","\uA74A":"O","\uA74C":"O","\u01A2":"OI","\uA74E":"OO","\u0222":"OU","\u24C5":"P","\uFF30":"P","\u1E54":"P","\u1E56":"P","\u01A4":"P","\u2C63":"P","\uA750":"P","\uA752":"P","\uA754":"P","\u24C6":"Q","\uFF31":"Q","\uA756":"Q","\uA758":"Q","\u024A":"Q","\u24C7":"R","\uFF32":"R","\u0154":"R","\u1E58":"R","\u0158":"R","\u0210":"R","\u0212":"R","\u1E5A":"R","\u1E5C":"R","\u0156":"R","\u1E5E":"R","\u024C":"R","\u2C64":"R","\uA75A":"R","\uA7A6":"R","\uA782":"R","\u24C8":"S","\uFF33":"S","\u1E9E":"S","\u015A":"S","\u1E64":"S","\u015C":"S","\u1E60":"S","\u0160":"S","\u1E66":"S","\u1E62":"S","\u1E68":"S","\u0218":"S","\u015E":"S","\u2C7E":"S","\uA7A8":"S","\uA784":"S","\u24C9":"T","\uFF34":"T","\u1E6A":"T","\u0164":"T","\u1E6C":"T","\u021A":"T","\u0162":"T","\u1E70":"T","\u1E6E":"T","\u0166":"T","\u01AC":"T","\u01AE":"T","\u023E":"T","\uA786":"T","\uA728":"TZ","\u24CA":"U","\uFF35":"U","\u00D9":"U","\u00DA":"U","\u00DB":"U","\u0168":"U","\u1E78":"U","\u016A":"U","\u1E7A":"U","\u016C":"U","\u00DC":"U","\u01DB":"U","\u01D7":"U","\u01D5":"U","\u01D9":"U","\u1EE6":"U","\u016E":"U","\u0170":"U","\u01D3":"U","\u0214":"U","\u0216":"U","\u01AF":"U","\u1EEA":"U","\u1EE8":"U","\u1EEE":"U","\u1EEC":"U","\u1EF0":"U","\u1EE4":"U","\u1E72":"U","\u0172":"U","\u1E76":"U","\u1E74":"U","\u0244":"U","\u24CB":"V","\uFF36":"V","\u1E7C":"V","\u1E7E":"V","\u01B2":"V","\uA75E":"V","\u0245":"V","\uA760":"VY","\u24CC":"W","\uFF37":"W","\u1E80":"W","\u1E82":"W","\u0174":"W","\u1E86":"W","\u1E84":"W","\u1E88":"W","\u2C72":"W","\u24CD":"X","\uFF38":"X","\u1E8A":"X","\u1E8C":"X","\u24CE":"Y","\uFF39":"Y","\u1EF2":"Y","\u00DD":"Y","\u0176":"Y","\u1EF8":"Y","\u0232":"Y","\u1E8E":"Y","\u0178":"Y","\u1EF6":"Y","\u1EF4":"Y","\u01B3":"Y","\u024E":"Y","\u1EFE":"Y","\u24CF":"Z","\uFF3A":"Z","\u0179":"Z","\u1E90":"Z","\u017B":"Z","\u017D":"Z","\u1E92":"Z","\u1E94":"Z","\u01B5":"Z","\u0224":"Z","\u2C7F":"Z","\u2C6B":"Z","\uA762":"Z","\u24D0":"a","\uFF41":"a","\u1E9A":"a","\u00E0":"a","\u00E1":"a","\u00E2":"a","\u1EA7":"a","\u1EA5":"a","\u1EAB":"a","\u1EA9":"a","\u00E3":"a","\u0101":"a","\u0103":"a","\u1EB1":"a","\u1EAF":"a","\u1EB5":"a","\u1EB3":"a","\u0227":"a","\u01E1":"a","\u00E4":"a","\u01DF":"a","\u1EA3":"a","\u00E5":"a","\u01FB":"a","\u01CE":"a","\u0201":"a","\u0203":"a","\u1EA1":"a","\u1EAD":"a","\u1EB7":"a","\u1E01":"a","\u0105":"a","\u2C65":"a","\u0250":"a","\uA733":"aa","\u00E6":"ae","\u01FD":"ae","\u01E3":"ae","\uA735":"ao","\uA737":"au","\uA739":"av","\uA73B":"av","\uA73D":"ay","\u24D1":"b","\uFF42":"b","\u1E03":"b","\u1E05":"b","\u1E07":"b","\u0180":"b","\u0183":"b","\u0253":"b","\u24D2":"c","\uFF43":"c","\u0107":"c","\u0109":"c","\u010B":"c","\u010D":"c","\u00E7":"c","\u1E09":"c","\u0188":"c","\u023C":"c","\uA73F":"c","\u2184":"c","\u24D3":"d","\uFF44":"d","\u1E0B":"d","\u010F":"d","\u1E0D":"d","\u1E11":"d","\u1E13":"d","\u1E0F":"d","\u0111":"d","\u018C":"d","\u0256":"d","\u0257":"d","\uA77A":"d","\u01F3":"dz","\u01C6":"dz","\u24D4":"e","\uFF45":"e","\u00E8":"e","\u00E9":"e","\u00EA":"e","\u1EC1":"e","\u1EBF":"e","\u1EC5":"e","\u1EC3":"e","\u1EBD":"e","\u0113":"e","\u1E15":"e","\u1E17":"e","\u0115":"e","\u0117":"e","\u00EB":"e","\u1EBB":"e","\u011B":"e","\u0205":"e","\u0207":"e","\u1EB9":"e","\u1EC7":"e","\u0229":"e","\u1E1D":"e","\u0119":"e","\u1E19":"e","\u1E1B":"e","\u0247":"e","\u025B":"e","\u01DD":"e","\u24D5":"f","\uFF46":"f","\u1E1F":"f","\u0192":"f","\uA77C":"f","\u24D6":"g","\uFF47":"g","\u01F5":"g","\u011D":"g","\u1E21":"g","\u011F":"g","\u0121":"g","\u01E7":"g","\u0123":"g","\u01E5":"g","\u0260":"g","\uA7A1":"g","\u1D79":"g","\uA77F":"g","\u24D7":"h","\uFF48":"h","\u0125":"h","\u1E23":"h","\u1E27":"h","\u021F":"h","\u1E25":"h","\u1E29":"h","\u1E2B":"h","\u1E96":"h","\u0127":"h","\u2C68":"h","\u2C76":"h","\u0265":"h","\u0195":"hv","\u24D8":"i","\uFF49":"i","\u00EC":"i","\u00ED":"i","\u00EE":"i","\u0129":"i","\u012B":"i","\u012D":"i","\u00EF":"i","\u1E2F":"i","\u1EC9":"i","\u01D0":"i","\u0209":"i","\u020B":"i","\u1ECB":"i","\u012F":"i","\u1E2D":"i","\u0268":"i","\u0131":"i","\u24D9":"j","\uFF4A":"j","\u0135":"j","\u01F0":"j","\u0249":"j","\u24DA":"k","\uFF4B":"k","\u1E31":"k","\u01E9":"k","\u1E33":"k","\u0137":"k","\u1E35":"k","\u0199":"k","\u2C6A":"k","\uA741":"k","\uA743":"k","\uA745":"k","\uA7A3":"k","\u24DB":"l","\uFF4C":"l","\u0140":"l","\u013A":"l","\u013E":"l","\u1E37":"l","\u1E39":"l","\u013C":"l","\u1E3D":"l","\u1E3B":"l","\u017F":"l","\u0142":"l","\u019A":"l","\u026B":"l","\u2C61":"l","\uA749":"l","\uA781":"l","\uA747":"l","\u01C9":"lj","\u24DC":"m","\uFF4D":"m","\u1E3F":"m","\u1E41":"m","\u1E43":"m","\u0271":"m","\u026F":"m","\u24DD":"n","\uFF4E":"n","\u01F9":"n","\u0144":"n","\u00F1":"n","\u1E45":"n","\u0148":"n","\u1E47":"n","\u0146":"n","\u1E4B":"n","\u1E49":"n","\u019E":"n","\u0272":"n","\u0149":"n","\uA791":"n","\uA7A5":"n","\u01CC":"nj","\u24DE":"o","\uFF4F":"o","\u00F2":"o","\u00F3":"o","\u00F4":"o","\u1ED3":"o","\u1ED1":"o","\u1ED7":"o","\u1ED5":"o","\u00F5":"o","\u1E4D":"o","\u022D":"o","\u1E4F":"o","\u014D":"o","\u1E51":"o","\u1E53":"o","\u014F":"o","\u022F":"o","\u0231":"o","\u00F6":"o","\u022B":"o","\u1ECF":"o","\u0151":"o","\u01D2":"o","\u020D":"o","\u020F":"o","\u01A1":"o","\u1EDD":"o","\u1EDB":"o","\u1EE1":"o","\u1EDF":"o","\u1EE3":"o","\u1ECD":"o","\u1ED9":"o","\u01EB":"o","\u01ED":"o","\u00F8":"o","\u01FF":"o","\u0254":"o","\uA74B":"o","\uA74D":"o","\u0275":"o","\u01A3":"oi","\u0223":"ou","\uA74F":"oo","\u24DF":"p","\uFF50":"p","\u1E55":"p","\u1E57":"p","\u01A5":"p","\u1D7D":"p","\uA751":"p","\uA753":"p","\uA755":"p","\u24E0":"q","\uFF51":"q","\u024B":"q","\uA757":"q","\uA759":"q","\u24E1":"r","\uFF52":"r","\u0155":"r","\u1E59":"r","\u0159":"r","\u0211":"r","\u0213":"r","\u1E5B":"r","\u1E5D":"r","\u0157":"r","\u1E5F":"r","\u024D":"r","\u027D":"r","\uA75B":"r","\uA7A7":"r","\uA783":"r","\u24E2":"s","\uFF53":"s","\u00DF":"s","\u015B":"s","\u1E65":"s","\u015D":"s","\u1E61":"s","\u0161":"s","\u1E67":"s","\u1E63":"s","\u1E69":"s","\u0219":"s","\u015F":"s","\u023F":"s","\uA7A9":"s","\uA785":"s","\u1E9B":"s","\u24E3":"t","\uFF54":"t","\u1E6B":"t","\u1E97":"t","\u0165":"t","\u1E6D":"t","\u021B":"t","\u0163":"t","\u1E71":"t","\u1E6F":"t","\u0167":"t","\u01AD":"t","\u0288":"t","\u2C66":"t","\uA787":"t","\uA729":"tz","\u24E4":"u","\uFF55":"u","\u00F9":"u","\u00FA":"u","\u00FB":"u","\u0169":"u","\u1E79":"u","\u016B":"u","\u1E7B":"u","\u016D":"u","\u00FC":"u","\u01DC":"u","\u01D8":"u","\u01D6":"u","\u01DA":"u","\u1EE7":"u","\u016F":"u","\u0171":"u","\u01D4":"u","\u0215":"u","\u0217":"u","\u01B0":"u","\u1EEB":"u","\u1EE9":"u","\u1EEF":"u","\u1EED":"u","\u1EF1":"u","\u1EE5":"u","\u1E73":"u","\u0173":"u","\u1E77":"u","\u1E75":"u","\u0289":"u","\u24E5":"v","\uFF56":"v","\u1E7D":"v","\u1E7F":"v","\u028B":"v","\uA75F":"v","\u028C":"v","\uA761":"vy","\u24E6":"w","\uFF57":"w","\u1E81":"w","\u1E83":"w","\u0175":"w","\u1E87":"w","\u1E85":"w","\u1E98":"w","\u1E89":"w","\u2C73":"w","\u24E7":"x","\uFF58":"x","\u1E8B":"x","\u1E8D":"x","\u24E8":"y","\uFF59":"y","\u1EF3":"y","\u00FD":"y","\u0177":"y","\u1EF9":"y","\u0233":"y","\u1E8F":"y","\u00FF":"y","\u1EF7":"y","\u1E99":"y","\u1EF5":"y","\u01B4":"y","\u024F":"y","\u1EFF":"y","\u24E9":"z","\uFF5A":"z","\u017A":"z","\u1E91":"z","\u017C":"z","\u017E":"z","\u1E93":"z","\u1E95":"z","\u01B6":"z","\u0225":"z","\u0240":"z","\u2C6C":"z","\uA763":"z","\u0386":"\u0391","\u0388":"\u0395","\u0389":"\u0397","\u038A":"\u0399","\u03AA":"\u0399","\u038C":"\u039F","\u038E":"\u03A5","\u03AB":"\u03A5","\u038F":"\u03A9","\u03AC":"\u03B1","\u03AD":"\u03B5","\u03AE":"\u03B7","\u03AF":"\u03B9","\u03CA":"\u03B9","\u0390":"\u03B9","\u03CC":"\u03BF","\u03CD":"\u03C5","\u03CB":"\u03C5","\u03B0":"\u03C5","\u03C9":"\u03C9","\u03C2":"\u03C3"};
-
-    $document = $(document);
-
-    nextUid=(function() { var counter=1; return function() { return counter++; }; }());
-
-
-    function reinsertElement(element) {
-        var placeholder = $(document.createTextNode(''));
-
-        element.before(placeholder);
-        placeholder.before(element);
-        placeholder.remove();
-    }
-
-    function stripDiacritics(str) {
-        // Used 'uni range + named function' from http://jsperf.com/diacritics/18
-        function match(a) {
-            return DIACRITICS[a] || a;
-        }
-
-        return str.replace(/[^\u0000-\u007E]/g, match);
-    }
-
-    function indexOf(value, array) {
-        var i = 0, l = array.length;
-        for (; i < l; i = i + 1) {
-            if (equal(value, array[i])) return i;
-        }
-        return -1;
-    }
-
-    function measureScrollbar () {
-        var $template = $( MEASURE_SCROLLBAR_TEMPLATE );
-        $template.appendTo(document.body);
-
-        var dim = {
-            width: $template.width() - $template[0].clientWidth,
-            height: $template.height() - $template[0].clientHeight
-        };
-        $template.remove();
-
-        return dim;
-    }
-
-    /**
-     * Compares equality of a and b
-     * @param a
-     * @param b
-     */
-    function equal(a, b) {
-        if (a === b) return true;
-        if (a === undefined || b === undefined) return false;
-        if (a === null || b === null) return false;
-        // Check whether 'a' or 'b' is a string (primitive or object).
-        // The concatenation of an empty string (+'') converts its argument to a string's primitive.
-        if (a.constructor === String) return a+'' === b+''; // a+'' - in case 'a' is a String object
-        if (b.constructor === String) return b+'' === a+''; // b+'' - in case 'b' is a String object
-        return false;
-    }
-
-    /**
-     * Splits the string into an array of values, transforming each value. An empty array is returned for nulls or empty
-     * strings
-     * @param string
-     * @param separator
-     */
-    function splitVal(string, separator, transform) {
-        var val, i, l;
-        if (string === null || string.length < 1) return [];
-        val = string.split(separator);
-        for (i = 0, l = val.length; i < l; i = i + 1) val[i] = transform(val[i]);
-        return val;
-    }
-
-    function getSideBorderPadding(element) {
-        return element.outerWidth(false) - element.width();
-    }
-
-    function installKeyUpChangeEvent(element) {
-        var key="keyup-change-value";
-        element.on("keydown", function () {
-            if ($.data(element, key) === undefined) {
-                $.data(element, key, element.val());
-            }
-        });
-        element.on("keyup", function () {
-            var val= $.data(element, key);
-            if (val !== undefined && element.val() !== val) {
-                $.removeData(element, key);
-                element.trigger("keyup-change");
-            }
-        });
-    }
-
-
-    /**
-     * filters mouse events so an event is fired only if the mouse moved.
-     *
-     * filters out mouse events that occur when mouse is stationary but
-     * the elements under the pointer are scrolled.
-     */
-    function installFilteredMouseMove(element) {
-        element.on("mousemove", function (e) {
-            var lastpos = lastMousePosition;
-            if (lastpos === undefined || lastpos.x !== e.pageX || lastpos.y !== e.pageY) {
-                $(e.target).trigger("mousemove-filtered", e);
-            }
-        });
-    }
-
-    /**
-     * Debounces a function. Returns a function that calls the original fn function only if no invocations have been made
-     * within the last quietMillis milliseconds.
-     *
-     * @param quietMillis number of milliseconds to wait before invoking fn
-     * @param fn function to be debounced
-     * @param ctx object to be used as this reference within fn
-     * @return debounced version of fn
-     */
-    function debounce(quietMillis, fn, ctx) {
-        ctx = ctx || undefined;
-        var timeout;
-        return function () {
-            var args = arguments;
-            window.clearTimeout(timeout);
-            timeout = window.setTimeout(function() {
-                fn.apply(ctx, args);
-            }, quietMillis);
-        };
-    }
-
-    function installDebouncedScroll(threshold, element) {
-        var notify = debounce(threshold, function (e) { element.trigger("scroll-debounced", e);});
-        element.on("scroll", function (e) {
-            if (indexOf(e.target, element.get()) >= 0) notify(e);
-        });
-    }
-
-    function focus($el) {
-        if ($el[0] === document.activeElement) return;
-
-        /* set the focus in a 0 timeout - that way the focus is set after the processing
-            of the current event has finished - which seems like the only reliable way
-            to set focus */
-        window.setTimeout(function() {
-            var el=$el[0], pos=$el.val().length, range;
-
-            $el.focus();
-
-            /* make sure el received focus so we do not error out when trying to manipulate the caret.
-                sometimes modals or others listeners may steal it after its set */
-            var isVisible = (el.offsetWidth > 0 || el.offsetHeight > 0);
-            if (isVisible && el === document.activeElement) {
-
-                /* after the focus is set move the caret to the end, necessary when we val()
-                    just before setting focus */
-                if(el.setSelectionRange)
-                {
-                    el.setSelectionRange(pos, pos);
-                }
-                else if (el.createTextRange) {
-                    range = el.createTextRange();
-                    range.collapse(false);
-                    range.select();
-                }
-            }
-        }, 0);
-    }
-
-    function getCursorInfo(el) {
-        el = $(el)[0];
-        var offset = 0;
-        var length = 0;
-        if ('selectionStart' in el) {
-            offset = el.selectionStart;
-            length = el.selectionEnd - offset;
-        } else if ('selection' in document) {
-            el.focus();
-            var sel = document.selection.createRange();
-            length = document.selection.createRange().text.length;
-            sel.moveStart('character', -el.value.length);
-            offset = sel.text.length - length;
-        }
-        return { offset: offset, length: length };
-    }
-
-    function killEvent(event) {
-        event.preventDefault();
-        event.stopPropagation();
-    }
-    function killEventImmediately(event) {
-        event.preventDefault();
-        event.stopImmediatePropagation();
-    }
-
-    function measureTextWidth(e) {
-        if (!sizer){
-            var style = e[0].currentStyle || window.getComputedStyle(e[0], null);
-            sizer = $(document.createElement("div")).css({
-                position: "absolute",
-                left: "-10000px",
-                top: "-10000px",
-                display: "none",
-                fontSize: style.fontSize,
-                fontFamily: style.fontFamily,
-                fontStyle: style.fontStyle,
-                fontWeight: style.fontWeight,
-                letterSpacing: style.letterSpacing,
-                textTransform: style.textTransform,
-                whiteSpace: "nowrap"
-            });
-            sizer.attr("class","select2-sizer");
-            $(document.body).append(sizer);
-        }
-        sizer.text(e.val());
-        return sizer.width();
-    }
-
-    function syncCssClasses(dest, src, adapter) {
-        var classes, replacements = [], adapted;
-
-        classes = $.trim(dest.attr("class"));
-
-        if (classes) {
-            classes = '' + classes; // for IE which returns object
-
-            $(classes.split(/\s+/)).each2(function() {
-                if (this.indexOf("select2-") === 0) {
-                    replacements.push(this);
-                }
-            });
-        }
-
-        classes = $.trim(src.attr("class"));
-
-        if (classes) {
-            classes = '' + classes; // for IE which returns object
-
-            $(classes.split(/\s+/)).each2(function() {
-                if (this.indexOf("select2-") !== 0) {
-                    adapted = adapter(this);
-
-                    if (adapted) {
-                        replacements.push(adapted);
-                    }
-                }
-            });
-        }
-
-        dest.attr("class", replacements.join(" "));
-    }
-
-
-    function markMatch(text, term, markup, escapeMarkup) {
-        var match=stripDiacritics(text.toUpperCase()).indexOf(stripDiacritics(term.toUpperCase())),
-            tl=term.length;
-
-        if (match<0) {
-            markup.push(escapeMarkup(text));
-            return;
-        }
-
-        markup.push(escapeMarkup(text.substring(0, match)));
-        markup.push("<span class='select2-match'>");
-        markup.push(escapeMarkup(text.substring(match, match + tl)));
-        markup.push("</span>");
-        markup.push(escapeMarkup(text.substring(match + tl, text.length)));
-    }
-
-    function defaultEscapeMarkup(markup) {
-        var replace_map = {
-            '\\': '&#92;',
-            '&': '&amp;',
-            '<': '&lt;',
-            '>': '&gt;',
-            '"': '&quot;',
-            "'": '&#39;',
-            "/": '&#47;'
-        };
-
-        return String(markup).replace(/[&<>"'\/\\]/g, function (match) {
-            return replace_map[match];
-        });
-    }
-
-    /**
-     * Produces an ajax-based query function
-     *
-     * @param options object containing configuration parameters
-     * @param options.params parameter map for the transport ajax call, can contain such options as cache, jsonpCallback, etc. see $.ajax
-     * @param options.transport function that will be used to execute the ajax request. must be compatible with parameters supported by $.ajax
-     * @param options.url url for the data
-     * @param options.data a function(searchTerm, pageNumber, context) that should return an object containing query string parameters for the above url.
-     * @param options.dataType request data type: ajax, jsonp, other datatypes supported by jQuery's $.ajax function or the transport function if specified
-     * @param options.quietMillis (optional) milliseconds to wait before making the ajaxRequest, helps debounce the ajax function if invoked too often
-     * @param options.results a function(remoteData, pageNumber, query) that converts data returned form the remote request to the format expected by Select2.
-     *      The expected format is an object containing the following keys:
-     *      results array of objects that will be used as choices
-     *      more (optional) boolean indicating whether there are more results available
-     *      Example: {results:[{id:1, text:'Red'},{id:2, text:'Blue'}], more:true}
-     */
-    function ajax(options) {
-        var timeout, // current scheduled but not yet executed request
-            handler = null,
-            quietMillis = options.quietMillis || 100,
-            ajaxUrl = options.url,
-            self = this;
-
-        return function (query) {
-            window.clearTimeout(timeout);
-            timeout = window.setTimeout(function () {
-                var data = options.data, // ajax data function
-                    url = ajaxUrl, // ajax url string or function
-                    transport = options.transport || $.fn.select2.ajaxDefaults.transport,
-                    // deprecated - to be removed in 4.0  - use params instead
-                    deprecated = {
-                        type: options.type || 'GET', // set type of request (GET or POST)
-                        cache: options.cache || false,
-                        jsonpCallback: options.jsonpCallback||undefined,
-                        dataType: options.dataType||"json"
-                    },
-                    params = $.extend({}, $.fn.select2.ajaxDefaults.params, deprecated);
-
-                data = data ? data.call(self, query.term, query.page, query.context) : null;
-                url = (typeof url === 'function') ? url.call(self, query.term, query.page, query.context) : url;
-
-                if (handler && typeof handler.abort === "function") { handler.abort(); }
-
-                if (options.params) {
-                    if ($.isFunction(options.params)) {
-                        $.extend(params, options.params.call(self));
-                    } else {
-                        $.extend(params, options.params);
-                    }
-                }
-
-                $.extend(params, {
-                    url: url,
-                    dataType: options.dataType,
-                    data: data,
-                    success: function (data) {
-                        // TODO - replace query.page with query so users have access to term, page, etc.
-                        // added query as third paramter to keep backwards compatibility
-                        var results = options.results(data, query.page, query);
-                        query.callback(results);
-                    },
-                    error: function(jqXHR, textStatus, errorThrown){
-                        var results = {
-                            hasError: true,
-                            jqXHR: jqXHR,
-                            textStatus: textStatus,
-                            errorThrown: errorThrown
-                        };
-
-                        query.callback(results);
-                    }
-                });
-                handler = transport.call(self, params);
-            }, quietMillis);
-        };
-    }
-
-    /**
-     * Produces a query function that works with a local array
-     *
-     * @param options object containing configuration parameters. The options parameter can either be an array or an
-     * object.
-     *
-     * If the array form is used it is assumed that it contains objects with 'id' and 'text' keys.
-     *
-     * If the object form is used it is assumed that it contains 'data' and 'text' keys. The 'data' key should contain
-     * an array of objects that will be used as choices. These objects must contain at least an 'id' key. The 'text'
-     * key can either be a String in which case it is expected that each element in the 'data' array has a key with the
-     * value of 'text' which will be used to match choices. Alternatively, text can be a function(item) that can extract
-     * the text.
-     */
-    function local(options) {
-        var data = options, // data elements
-            dataText,
-            tmp,
-            text = function (item) { return ""+item.text; }; // function used to retrieve the text portion of a data item that is matched against the search
-
-         if ($.isArray(data)) {
-            tmp = data;
-            data = { results: tmp };
-        }
-
-         if ($.isFunction(data) === false) {
-            tmp = data;
-            data = function() { return tmp; };
-        }
-
-        var dataItem = data();
-        if (dataItem.text) {
-            text = dataItem.text;
-            // if text is not a function we assume it to be a key name
-            if (!$.isFunction(text)) {
-                dataText = dataItem.text; // we need to store this in a separate variable because in the next step data gets reset and data.text is no longer available
-                text = function (item) { return item[dataText]; };
-            }
-        }
-
-        return function (query) {
-            var t = query.term, filtered = { results: [] }, process;
-            if (t === "") {
-                query.callback(data());
-                return;
-            }
-
-            process = function(datum, collection) {
-                var group, attr;
-                datum = datum[0];
-                if (datum.children) {
-                    group = {};
-                    for (attr in datum) {
-                        if (datum.hasOwnProperty(attr)) group[attr]=datum[attr];
-                    }
-                    group.children=[];
-                    $(datum.children).each2(function(i, childDatum) { process(childDatum, group.children); });
-                    if (group.children.length || query.matcher(t, text(group), datum)) {
-                        collection.push(group);
-                    }
-                } else {
-                    if (query.matcher(t, text(datum), datum)) {
-                        collection.push(datum);
-                    }
-                }
-            };
-
-            $(data().results).each2(function(i, datum) { process(datum, filtered.results); });
-            query.callback(filtered);
-        };
-    }
-
-    // TODO javadoc
-    function tags(data) {
-        var isFunc = $.isFunction(data);
-        return function (query) {
-            var t = query.term, filtered = {results: []};
-            var result = isFunc ? data(query) : data;
-            if ($.isArray(result)) {
-                $(result).each(function () {
-                    var isObject = this.text !== undefined,
-                        text = isObject ? this.text : this;
-                    if (t === "" || query.matcher(t, text)) {
-                        filtered.results.push(isObject ? this : {id: this, text: this});
-                    }
-                });
-                query.callback(filtered);
-            }
-        };
-    }
-
-    /**
-     * Checks if the formatter function should be used.
-     *
-     * Throws an error if it is not a function. Returns true if it should be used,
-     * false if no formatting should be performed.
-     *
-     * @param formatter
-     */
-    function checkFormatter(formatter, formatterName) {
-        if ($.isFunction(formatter)) return true;
-        if (!formatter) return false;
-        if (typeof(formatter) === 'string') return true;
-        throw new Error(formatterName +" must be a string, function, or falsy value");
-    }
-
-  /**
-   * Returns a given value
-   * If given a function, returns its output
-   *
-   * @param val string|function
-   * @param context value of "this" to be passed to function
-   * @returns {*}
-   */
-    function evaluate(val, context) {
-        if ($.isFunction(val)) {
-            var args = Array.prototype.slice.call(arguments, 2);
-            return val.apply(context, args);
-        }
-        return val;
-    }
-
-    function countResults(results) {
-        var count = 0;
-        $.each(results, function(i, item) {
-            if (item.children) {
-                count += countResults(item.children);
-            } else {
-                count++;
-            }
-        });
-        return count;
-    }
-
-    /**
-     * Default tokenizer. This function uses breaks the input on substring match of any string from the
-     * opts.tokenSeparators array and uses opts.createSearchChoice to create the choice object. Both of those
-     * two options have to be defined in order for the tokenizer to work.
-     *
-     * @param input text user has typed so far or pasted into the search field
-     * @param selection currently selected choices
-     * @param selectCallback function(choice) callback tho add the choice to selection
-     * @param opts select2's opts
-     * @return undefined/null to leave the current input unchanged, or a string to change the input to the returned value
-     */
-    function defaultTokenizer(input, selection, selectCallback, opts) {
-        var original = input, // store the original so we can compare and know if we need to tell the search to update its text
-            dupe = false, // check for whether a token we extracted represents a duplicate selected choice
-            token, // token
-            index, // position at which the separator was found
-            i, l, // looping variables
-            separator; // the matched separator
-
-        if (!opts.createSearchChoice || !opts.tokenSeparators || opts.tokenSeparators.length < 1) return undefined;
-
-        while (true) {
-            index = -1;
-
-            for (i = 0, l = opts.tokenSeparators.length; i < l; i++) {
-                separator = opts.tokenSeparators[i];
-                index = input.indexOf(separator);
-                if (index >= 0) break;
-            }
-
-            if (index < 0) break; // did not find any token separator in the input string, bail
-
-            token = input.substring(0, index);
-            input = input.substring(index + separator.length);
-
-            if (token.length > 0) {
-                token = opts.createSearchChoice.call(this, token, selection);
-                if (token !== undefined && token !== null && opts.id(token) !== undefined && opts.id(token) !== null) {
-                    dupe = false;
-                    for (i = 0, l = selection.length; i < l; i++) {
-                        if (equal(opts.id(token), opts.id(selection[i]))) {
-                            dupe = true; break;
-                        }
-                    }
-
-                    if (!dupe) selectCallback(token);
-                }
-            }
-        }
-
-        if (original!==input) return input;
-    }
-
-    function cleanupJQueryElements() {
-        var self = this;
-
-        $.each(arguments, function (i, element) {
-            self[element].remove();
-            self[element] = null;
-        });
-    }
-
-    /**
-     * Creates a new class
-     *
-     * @param superClass
-     * @param methods
-     */
-    function clazz(SuperClass, methods) {
-        var constructor = function () {};
-        constructor.prototype = new SuperClass;
-        constructor.prototype.constructor = constructor;
-        constructor.prototype.parent = SuperClass.prototype;
-        constructor.prototype = $.extend(constructor.prototype, methods);
-        return constructor;
-    }
-
-    AbstractSelect2 = clazz(Object, {
-
-        // abstract
-        bind: function (func) {
-            var self = this;
-            return function () {
-                func.apply(self, arguments);
-            };
-        },
-
-        // abstract
-        init: function (opts) {
-            var results, search, resultsSelector = ".select2-results";
-
-            // prepare options
-            this.opts = opts = this.prepareOpts(opts);
-
-            this.id=opts.id;
-
-            // destroy if called on an existing component
-            if (opts.element.data("select2") !== undefined &&
-                opts.element.data("select2") !== null) {
-                opts.element.data("select2").destroy();
-            }
-
-            this.container = this.createContainer();
-
-            this.liveRegion = $('.select2-hidden-accessible');
-            if (this.liveRegion.length == 0) {
-                this.liveRegion = $("<span>", {
-                        role: "status",
-                        "aria-live": "polite"
-                    })
-                    .addClass("select2-hidden-accessible")
-                    .appendTo(document.body);
-            }
-
-            this.containerId="s2id_"+(opts.element.attr("id") || "autogen"+nextUid());
-            this.containerEventName= this.containerId
-                .replace(/([.])/g, '_')
-                .replace(/([;&,\-\.\+\*\~':"\!\^#$%@\[\]\(\)=>\|])/g, '\\$1');
-            this.container.attr("id", this.containerId);
-
-            this.container.attr("title", opts.element.attr("title"));
-
-            this.body = $(document.body);
-
-            syncCssClasses(this.container, this.opts.element, this.opts.adaptContainerCssClass);
-
-            this.container.attr("style", opts.element.attr("style"));
-            this.container.css(evaluate(opts.containerCss, this.opts.element));
-            this.container.addClass(evaluate(opts.containerCssClass, this.opts.element));
-
-            this.elementTabIndex = this.opts.element.attr("tabindex");
-
-            // swap container for the element
-            this.opts.element
-                .data("select2", this)
-                .attr("tabindex", "-1")
-                .before(this.container)
-                .on("click.select2", killEvent); // do not leak click events
-
-            this.container.data("select2", this);
-
-            this.dropdown = this.container.find(".select2-drop");
-
-            syncCssClasses(this.dropdown, this.opts.element, this.opts.adaptDropdownCssClass);
-
-            this.dropdown.addClass(evaluate(opts.dropdownCssClass, this.opts.element));
-            this.dropdown.data("select2", this);
-            this.dropdown.on("click", killEvent);
-
-            this.results = results = this.container.find(resultsSelector);
-            this.search = search = this.container.find("input.select2-input");
-
-            this.queryCount = 0;
-            this.resultsPage = 0;
-            this.context = null;
-
-            // initialize the container
-            this.initContainer();
-
-            this.container.on("click", killEvent);
-
-            installFilteredMouseMove(this.results);
-
-            this.dropdown.on("mousemove-filtered", resultsSelector, this.bind(this.highlightUnderEvent));
-            this.dropdown.on("touchstart touchmove touchend", resultsSelector, this.bind(function (event) {
-                this._touchEvent = true;
-                this.highlightUnderEvent(event);
-            }));
-            this.dropdown.on("touchmove", resultsSelector, this.bind(this.touchMoved));
-            this.dropdown.on("touchstart touchend", resultsSelector, this.bind(this.clearTouchMoved));
-
-            // Waiting for a click event on touch devices to select option and hide dropdown
-            // otherwise click will be triggered on an underlying element
-            this.dropdown.on('click', this.bind(function (event) {
-                if (this._touchEvent) {
-                    this._touchEvent = false;
-                    this.selectHighlighted();
-                }
-            }));
-
-            installDebouncedScroll(80, this.results);
-            this.dropdown.on("scroll-debounced", resultsSelector, this.bind(this.loadMoreIfNeeded));
-
-            // do not propagate change event from the search field out of the component
-            $(this.container).on("change", ".select2-input", function(e) {e.stopPropagation();});
-            $(this.dropdown).on("change", ".select2-input", function(e) {e.stopPropagation();});
-
-            // if jquery.mousewheel plugin is installed we can prevent out-of-bounds scrolling of results via mousewheel
-            if ($.fn.mousewheel) {
-                results.mousewheel(function (e, delta, deltaX, deltaY) {
-                    var top = results.scrollTop();
-                    if (deltaY > 0 && top - deltaY <= 0) {
-                        results.scrollTop(0);
-                        killEvent(e);
-                    } else if (deltaY < 0 && results.get(0).scrollHeight - results.scrollTop() + deltaY <= results.height()) {
-                        results.scrollTop(results.get(0).scrollHeight - results.height());
-                        killEvent(e);
-                    }
-                });
-            }
-
-            installKeyUpChangeEvent(search);
-            search.on("keyup-change input paste", this.bind(this.updateResults));
-            search.on("focus", function () { search.addClass("select2-focused"); });
-            search.on("blur", function () { search.removeClass("select2-focused");});
-
-            this.dropdown.on("mouseup", resultsSelector, this.bind(function (e) {
-                if ($(e.target).closest(".select2-result-selectable").length > 0) {
-                    this.highlightUnderEvent(e);
-                    this.selectHighlighted(e);
-                }
-            }));
-
-            // trap all mouse events from leaving the dropdown. sometimes there may be a modal that is listening
-            // for mouse events outside of itself so it can close itself. since the dropdown is now outside the select2's
-            // dom it will trigger the popup close, which is not what we want
-            // focusin can cause focus wars between modals and select2 since the dropdown is outside the modal.
-            this.dropdown.on("click mouseup mousedown touchstart touchend focusin", function (e) { e.stopPropagation(); });
-
-            this.lastSearchTerm = undefined;
-
-            if ($.isFunction(this.opts.initSelection)) {
-                // initialize selection based on the current value of the source element
-                this.initSelection();
-
-                // if the user has provided a function that can set selection based on the value of the source element
-                // we monitor the change event on the element and trigger it, allowing for two way synchronization
-                this.monitorSource();
-            }
-
-            if (opts.maximumInputLength !== null) {
-                this.search.attr("maxlength", opts.maximumInputLength);
-            }
-
-            var disabled = opts.element.prop("disabled");
-            if (disabled === undefined) disabled = false;
-            this.enable(!disabled);
-
-            var readonly = opts.element.prop("readonly");
-            if (readonly === undefined) readonly = false;
-            this.readonly(readonly);
-
-            // Calculate size of scrollbar
-            scrollBarDimensions = scrollBarDimensions || measureScrollbar();
-
-            this.autofocus = opts.element.prop("autofocus");
-            opts.element.prop("autofocus", false);
-            if (this.autofocus) this.focus();
-
-            this.search.attr("placeholder", opts.searchInputPlaceholder);
-        },
-
-        // abstract
-        destroy: function () {
-            var element=this.opts.element, select2 = element.data("select2"), self = this;
-
-            this.close();
-
-            if (element.length && element[0].detachEvent && self._sync) {
-                element.each(function () {
-                    if (self._sync) {
-                        this.detachEvent("onpropertychange", self._sync);
-                    }
-                });
-            }
-            if (this.propertyObserver) {
-                this.propertyObserver.disconnect();
-                this.propertyObserver = null;
-            }
-            this._sync = null;
-
-            if (select2 !== undefined) {
-                select2.container.remove();
-                select2.liveRegion.remove();
-                select2.dropdown.remove();
-                element.removeData("select2")
-                    .off(".select2");
-                if (!element.is("input[type='hidden']")) {
-                    element
-                        .show()
-                        .prop("autofocus", this.autofocus || false);
-                    if (this.elementTabIndex) {
-                        element.attr({tabindex: this.elementTabIndex});
-                    } else {
-                        element.removeAttr("tabindex");
-                    }
-                    element.show();
-                } else {
-                    element.css("display", "");
-                }
-            }
-
-            cleanupJQueryElements.call(this,
-                "container",
-                "liveRegion",
-                "dropdown",
-                "results",
-                "search"
-            );
-        },
-
-        // abstract
-        optionToData: function(element) {
-            if (element.is("option")) {
-                return {
-                    id:element.prop("value"),
-                    text:element.text(),
-                    element: element.get(),
-                    css: element.attr("class"),
-                    disabled: element.prop("disabled"),
-                    locked: equal(element.attr("locked"), "locked") || equal(element.data("locked"), true)
-                };
-            } else if (element.is("optgroup")) {
-                return {
-                    text:element.attr("label"),
-                    children:[],
-                    element: element.get(),
-                    css: element.attr("class")
-                };
-            }
-        },
-
-        // abstract
-        prepareOpts: function (opts) {
-            var element, select, idKey, ajaxUrl, self = this;
-
-            element = opts.element;
-
-            if (element.get(0).tagName.toLowerCase() === "select") {
-                this.select = select = opts.element;
-            }
-
-            if (select) {
-                // these options are not allowed when attached to a select because they are picked up off the element itself
-                $.each(["id", "multiple", "ajax", "query", "createSearchChoice", "initSelection", "data", "tags"], function () {
-                    if (this in opts) {
-                        throw new Error("Option '" + this + "' is not allowed for Select2 when attached to a <select> element.");
-                    }
-                });
-            }
-
-            opts.debug = opts.debug || $.fn.select2.defaults.debug;
-
-            // Warnings for options renamed/removed in Select2 4.0.0
-            // Only when it's enabled through debug mode
-            if (opts.debug && console && console.warn) {
-                // id was removed
-                if (opts.id != null) {
-                    console.warn(
-                        'Select2: The `id` option has been removed in Select2 4.0.0, ' +
-                        'consider renaming your `id` property or mapping the property before your data makes it to Select2. ' +
-                        'You can read more at https://select2.github.io/announcements-4.0.html#changed-id'
-                    );
-                }
-
-                // text was removed
-                if (opts.text != null) {
-                    console.warn(
-                        'Select2: The `text` option has been removed in Select2 4.0.0, ' +
-                        'consider renaming your `text` property or mapping the property before your data makes it to Select2. ' +
-                        'You can read more at https://select2.github.io/announcements-4.0.html#changed-id'
-                    );
-                }
-
-                // sortResults was renamed to results
-                if (opts.sortResults != null) {
-                    console.warn(
-                        'Select2: the `sortResults` option has been renamed to `sorter` in Select2 4.0.0. '
-                    );
-                }
-
-                // selectOnBlur was renamed to selectOnClose
-                if (opts.selectOnBlur != null) {
-                    console.warn(
-                        'Select2: The `selectOnBlur` option has been renamed to `selectOnClose` in Select2 4.0.0.'
-                    );
-                }
-
-                // ajax.results was renamed to ajax.processResults
-                if (opts.ajax != null && opts.ajax.results != null) {
-                    console.warn(
-                        'Select2: The `ajax.results` option has been renamed to `ajax.processResults` in Select2 4.0.0.'
-                    );
-                }
-
-                // format* options were renamed to language.*
-                if (opts.formatNoResults != null) {
-                    console.warn(
-                        'Select2: The `formatNoResults` option has been renamed to `language.noResults` in Select2 4.0.0.'
-                    );
-                }
-                if (opts.formatSearching != null) {
-                    console.warn(
-                        'Select2: The `formatSearching` option has been renamed to `language.searching` in Select2 4.0.0.'
-                    );
-                }
-                if (opts.formatInputTooShort != null) {
-                    console.warn(
-                        'Select2: The `formatInputTooShort` option has been renamed to `language.inputTooShort` in Select2 4.0.0.'
-                    );
-                }
-                if (opts.formatInputTooLong != null) {
-                    console.warn(
-                        'Select2: The `formatInputTooLong` option has been renamed to `language.inputTooLong` in Select2 4.0.0.'
-                    );
-                }
-                if (opts.formatLoading != null) {
-                    console.warn(
-                        'Select2: The `formatLoading` option has been renamed to `language.loadingMore` in Select2 4.0.0.'
-                    );
-                }
-                if (opts.formatSelectionTooBig != null) {
-                    console.warn(
-                        'Select2: The `formatSelectionTooBig` option has been renamed to `language.maximumSelected` in Select2 4.0.0.'
-                    );
-                }
-
-                if (opts.element.data('select2Tags')) {
-                    console.warn(
-                        'Select2: The `data-select2-tags` attribute has been renamed to `data-tags` in Select2 4.0.0.'
-                    );
-                }
-            }
-
-            // Aliasing options renamed in Select2 4.0.0
-
-            // data-select2-tags -> data-tags
-            if (opts.element.data('tags') != null) {
-                var elemTags = opts.element.data('tags');
-
-                // data-tags should actually be a boolean
-                if (!$.isArray(elemTags)) {
-                    elemTags = [];
-                }
-
-                opts.element.data('select2Tags', elemTags);
-            }
-
-            // sortResults -> sorter
-            if (opts.sorter != null) {
-                opts.sortResults = opts.sorter;
-            }
-
-            // selectOnBlur -> selectOnClose
-            if (opts.selectOnClose != null) {
-                opts.selectOnBlur = opts.selectOnClose;
-            }
-
-            // ajax.results -> ajax.processResults
-            if (opts.ajax != null) {
-                if ($.isFunction(opts.ajax.processResults)) {
-                    opts.ajax.results = opts.ajax.processResults;
-                }
-            }
-
-            // Formatters/language options
-            if (opts.language != null) {
-                var lang = opts.language;
-
-                // formatNoMatches -> language.noMatches
-                if ($.isFunction(lang.noMatches)) {
-                    opts.formatNoMatches = lang.noMatches;
-                }
-
-                // formatSearching -> language.searching
-                if ($.isFunction(lang.searching)) {
-                    opts.formatSearching = lang.searching;
-                }
-
-                // formatInputTooShort -> language.inputTooShort
-                if ($.isFunction(lang.inputTooShort)) {
-                    opts.formatInputTooShort = lang.inputTooShort;
-                }
-
-                // formatInputTooLong -> language.inputTooLong
-                if ($.isFunction(lang.inputTooLong)) {
-                    opts.formatInputTooLong = lang.inputTooLong;
-                }
-
-                // formatLoading -> language.loadingMore
-                if ($.isFunction(lang.loadingMore)) {
-                    opts.formatLoading = lang.loadingMore;
-                }
-
-                // formatSelectionTooBig -> language.maximumSelected
-                if ($.isFunction(lang.maximumSelected)) {
-                    opts.formatSelectionTooBig = lang.maximumSelected;
-                }
-            }
-
-            opts = $.extend({}, {
-                populateResults: function(container, results, query) {
-                    var populate, id=this.opts.id, liveRegion=this.liveRegion;
-
-                    populate=function(results, container, depth) {
-
-                        var i, l, result, selectable, disabled, compound, node, label, innerContainer, formatted;
-
-                        results = opts.sortResults(results, container, query);
-
-                        // collect the created nodes for bulk append
-                        var nodes = [];
-                        for (i = 0, l = results.length; i < l; i = i + 1) {
-
-                            result=results[i];
-
-                            disabled = (result.disabled === true);
-                            selectable = (!disabled) && (id(result) !== undefined);
-
-                            compound=result.children && result.children.length > 0;
-
-                            node=$("<li></li>");
-                            node.addClass("select2-results-dept-"+depth);
-                            node.addClass("select2-result");
-                            node.addClass(selectable ? "select2-result-selectable" : "select2-result-unselectable");
-                            if (disabled) { node.addClass("select2-disabled"); }
-                            if (compound) { node.addClass("select2-result-with-children"); }
-                            node.addClass(self.opts.formatResultCssClass(result));
-                            node.attr("role", "presentation");
-
-                            label=$(document.createElement("div"));
-                            label.addClass("select2-result-label");
-                            label.attr("id", "select2-result-label-" + nextUid());
-                            label.attr("role", "option");
-
-                            formatted=opts.formatResult(result, label, query, self.opts.escapeMarkup);
-                            if (formatted!==undefined) {
-                                label.html(formatted);
-                                node.append(label);
-                            }
-
-
-                            if (compound) {
-                                innerContainer=$("<ul></ul>");
-                                innerContainer.addClass("select2-result-sub");
-                                populate(result.children, innerContainer, depth+1);
-                                node.append(innerContainer);
-                            }
-
-                            node.data("select2-data", result);
-                            nodes.push(node[0]);
-                        }
-
-                        // bulk append the created nodes
-                        container.append(nodes);
-                        liveRegion.text(opts.formatMatches(results.length));
-                    };
-
-                    populate(results, container, 0);
-                }
-            }, $.fn.select2.defaults, opts);
-
-            if (typeof(opts.id) !== "function") {
-                idKey = opts.id;
-                opts.id = function (e) { return e[idKey]; };
-            }
-
-            if ($.isArray(opts.element.data("select2Tags"))) {
-                if ("tags" in opts) {
-                    throw "tags specified as both an attribute 'data-select2-tags' and in options of Select2 " + opts.element.attr("id");
-                }
-                opts.tags=opts.element.data("select2Tags");
-            }
-
-            if (select) {
-                opts.query = this.bind(function (query) {
-                    var data = { results: [], more: false },
-                        term = query.term,
-                        children, placeholderOption, process;
-
-                    process=function(element, collection) {
-                        var group;
-                        if (element.is("option")) {
-                            if (query.matcher(term, element.text(), element)) {
-                                collection.push(self.optionToData(element));
-                            }
-                        } else if (element.is("optgroup")) {
-                            group=self.optionToData(element);
-                            element.children().each2(function(i, elm) { process(elm, group.children); });
-                            if (group.children.length>0) {
-                                collection.push(group);
-                            }
-                        }
-                    };
-
-                    children=element.children();
-
-                    // ignore the placeholder option if there is one
-                    if (this.getPlaceholder() !== undefined && children.length > 0) {
-                        placeholderOption = this.getPlaceholderOption();
-                        if (placeholderOption) {
-                            children=children.not(placeholderOption);
-                        }
-                    }
-
-                    children.each2(function(i, elm) { process(elm, data.results); });
-
-                    query.callback(data);
-                });
-                // this is needed because inside val() we construct choices from options and their id is hardcoded
-                opts.id=function(e) { return e.id; };
-            } else {
-                if (!("query" in opts)) {
-                    if ("ajax" in opts) {
-                        ajaxUrl = opts.element.data("ajax-url");
-                        if (ajaxUrl && ajaxUrl.length > 0) {
-                            opts.ajax.url = ajaxUrl;
-                        }
-                        opts.query = ajax.call(opts.element, opts.ajax);
-                    } else if ("data" in opts) {
-                        opts.query = local(opts.data);
-                    } else if ("tags" in opts) {
-                        opts.query = tags(opts.tags);
-                        if (opts.createSearchChoice === undefined) {
-                            opts.createSearchChoice = function (term) { return {id: $.trim(term), text: $.trim(term)}; };
-                        }
-                        if (opts.initSelection === undefined) {
-                            opts.initSelection = function (element, callback) {
-                                var data = [];
-                                $(splitVal(element.val(), opts.separator, opts.transformVal)).each(function () {
-                                    var obj = { id: this, text: this },
-                                        tags = opts.tags;
-                                    if ($.isFunction(tags)) tags=tags();
-                                    $(tags).each(function() { if (equal(this.id, obj.id)) { obj = this; return false; } });
-                                    data.push(obj);
-                                });
-
-                                callback(data);
-                            };
-                        }
-                    }
-                }
-            }
-            if (typeof(opts.query) !== "function") {
-                throw "query function not defined for Select2 " + opts.element.attr("id");
-            }
-
-            if (opts.createSearchChoicePosition === 'top') {
-                opts.createSearchChoicePosition = function(list, item) { list.unshift(item); };
-            }
-            else if (opts.createSearchChoicePosition === 'bottom') {
-                opts.createSearchChoicePosition = function(list, item) { list.push(item); };
-            }
-            else if (typeof(opts.createSearchChoicePosition) !== "function")  {
-                throw "invalid createSearchChoicePosition option must be 'top', 'bottom' or a custom function";
-            }
-
-            return opts;
-        },
-
-        /**
-         * Monitor the original element for changes and update select2 accordingly
-         */
-        // abstract
-        monitorSource: function () {
-            var el = this.opts.element, observer, self = this;
-
-            el.on("change.select2", this.bind(function (e) {
-                if (this.opts.element.data("select2-change-triggered") !== true) {
-                    this.initSelection();
-                }
-            }));
-
-            this._sync = this.bind(function () {
-
-                // sync enabled state
-                var disabled = el.prop("disabled");
-                if (disabled === undefined) disabled = false;
-                this.enable(!disabled);
-
-                var readonly = el.prop("readonly");
-                if (readonly === undefined) readonly = false;
-                this.readonly(readonly);
-
-                if (this.container) {
-                    syncCssClasses(this.container, this.opts.element, this.opts.adaptContainerCssClass);
-                    this.container.addClass(evaluate(this.opts.containerCssClass, this.opts.element));
-                }
-
-                if (this.dropdown) {
-                    syncCssClasses(this.dropdown, this.opts.element, this.opts.adaptDropdownCssClass);
-                    this.dropdown.addClass(evaluate(this.opts.dropdownCssClass, this.opts.element));
-                }
-
-            });
-
-            // IE8-10 (IE9/10 won't fire propertyChange via attachEventListener)
-            if (el.length && el[0].attachEvent) {
-                el.each(function() {
-                    this.attachEvent("onpropertychange", self._sync);
-                });
-            }
-
-            // safari, chrome, firefox, IE11
-            observer = window.MutationObserver || window.WebKitMutationObserver|| window.MozMutationObserver;
-            if (observer !== undefined) {
-                if (this.propertyObserver) { delete this.propertyObserver; this.propertyObserver = null; }
-                this.propertyObserver = new observer(function (mutations) {
-                    $.each(mutations, self._sync);
-                });
-                this.propertyObserver.observe(el.get(0), { attributes:true, subtree:false });
-            }
-        },
-
-        // abstract
-        triggerSelect: function(data) {
-            var evt = $.Event("select2-selecting", { val: this.id(data), object: data, choice: data });
-            this.opts.element.trigger(evt);
-            return !evt.isDefaultPrevented();
-        },
-
-        /**
-         * Triggers the change event on the source element
-         */
-        // abstract
-        triggerChange: function (details) {
-
-            details = details || {};
-            details= $.extend({}, details, { type: "change", val: this.val() });
-            // prevents recursive triggering
-            this.opts.element.data("select2-change-triggered", true);
-            this.opts.element.trigger(details);
-            this.opts.element.data("select2-change-triggered", false);
-
-            // some validation frameworks ignore the change event and listen instead to keyup, click for selects
-            // so here we trigger the click event manually
-            this.opts.element.click();
-
-            // ValidationEngine ignores the change event and listens instead to blur
-            // so here we trigger the blur event manually if so desired
-            if (this.opts.blurOnChange)
-                this.opts.element.blur();
-        },
-
-        //abstract
-        isInterfaceEnabled: function()
-        {
-            return this.enabledInterface === true;
-        },
-
-        // abstract
-        enableInterface: function() {
-            var enabled = this._enabled && !this._readonly,
-                disabled = !enabled;
-
-            if (enabled === this.enabledInterface) return false;
-
-            this.container.toggleClass("select2-container-disabled", disabled);
-            this.close();
-            this.enabledInterface = enabled;
-
-            return true;
-        },
-
-        // abstract
-        enable: function(enabled) {
-            if (enabled === undefined) enabled = true;
-            if (this._enabled === enabled) return;
-            this._enabled = enabled;
-
-            this.opts.element.prop("disabled", !enabled);
-            this.enableInterface();
-        },
-
-        // abstract
-        disable: function() {
-            this.enable(false);
-        },
-
-        // abstract
-        readonly: function(enabled) {
-            if (enabled === undefined) enabled = false;
-            if (this._readonly === enabled) return;
-            this._readonly = enabled;
-
-            this.opts.element.prop("readonly", enabled);
-            this.enableInterface();
-        },
-
-        // abstract
-        opened: function () {
-            return (this.container) ? this.container.hasClass("select2-dropdown-open") : false;
-        },
-
-        // abstract
-        positionDropdown: function() {
-            var $dropdown = this.dropdown,
-                container = this.container,
-                offset = container.offset(),
-                height = container.outerHeight(false),
-                width = container.outerWidth(false),
-                dropHeight = $dropdown.outerHeight(false),
-                $window = $(window),
-                windowWidth = $window.width(),
-                windowHeight = $window.height(),
-                viewPortRight = $window.scrollLeft() + windowWidth,
-                viewportBottom = $window.scrollTop() + windowHeight,
-                dropTop = offset.top + height,
-                dropLeft = offset.left,
-                enoughRoomBelow = dropTop + dropHeight <= viewportBottom,
-                enoughRoomAbove = (offset.top - dropHeight) >= $window.scrollTop(),
-                dropWidth = $dropdown.outerWidth(false),
-                enoughRoomOnRight = function() {
-                    return dropLeft + dropWidth <= viewPortRight;
-                },
-                enoughRoomOnLeft = function() {
-                    return offset.left + viewPortRight + container.outerWidth(false)  > dropWidth;
-                },
-                aboveNow = $dropdown.hasClass("select2-drop-above"),
-                bodyOffset,
-                above,
-                changeDirection,
-                css,
-                resultsListNode;
-
-            // always prefer the current above/below alignment, unless there is not enough room
-            if (aboveNow) {
-                above = true;
-                if (!enoughRoomAbove && enoughRoomBelow) {
-                    changeDirection = true;
-                    above = false;
-                }
-            } else {
-                above = false;
-                if (!enoughRoomBelow && enoughRoomAbove) {
-                    changeDirection = true;
-                    above = true;
-                }
-            }
-
-            //if we are changing direction we need to get positions when dropdown is hidden;
-            if (changeDirection) {
-                $dropdown.hide();
-                offset = this.container.offset();
-                height = this.container.outerHeight(false);
-                width = this.container.outerWidth(false);
-                dropHeight = $dropdown.outerHeight(false);
-                viewPortRight = $window.scrollLeft() + windowWidth;
-                viewportBottom = $window.scrollTop() + windowHeight;
-                dropTop = offset.top + height;
-                dropLeft = offset.left;
-                dropWidth = $dropdown.outerWidth(false);
-                $dropdown.show();
-
-                // fix so the cursor does not move to the left within the search-textbox in IE
-                this.focusSearch();
-            }
-
-            if (this.opts.dropdownAutoWidth) {
-                resultsListNode = $('.select2-results', $dropdown)[0];
-                $dropdown.addClass('select2-drop-auto-width');
-                $dropdown.css('width', '');
-                // Add scrollbar width to dropdown if vertical scrollbar is present
-                dropWidth = $dropdown.outerWidth(false) + (resultsListNode.scrollHeight === resultsListNode.clientHeight ? 0 : scrollBarDimensions.width);
-                dropWidth > width ? width = dropWidth : dropWidth = width;
-                dropHeight = $dropdown.outerHeight(false);
-            }
-            else {
-                this.container.removeClass('select2-drop-auto-width');
-            }
-
-            //console.log("below/ droptop:", dropTop, "dropHeight", dropHeight, "sum", (dropTop+dropHeight)+" viewport bottom", viewportBottom, "enough?", enoughRoomBelow);
-            //console.log("above/ offset.top", offset.top, "dropHeight", dropHeight, "top", (offset.top-dropHeight), "scrollTop", this.body.scrollTop(), "enough?", enoughRoomAbove);
-
-            // fix positioning when body has an offset and is not position: static
-            if (this.body.css('position') !== 'static') {
-                bodyOffset = this.body.offset();
-                dropTop -= bodyOffset.top;
-                dropLeft -= bodyOffset.left;
-            }
-
-            if (!enoughRoomOnRight() && enoughRoomOnLeft()) {
-                dropLeft = offset.left + this.container.outerWidth(false) - dropWidth;
-            }
-
-            css =  {
-                left: dropLeft,
-                width: width
-            };
-
-            if (above) {
-                this.container.addClass("select2-drop-above");
-                $dropdown.addClass("select2-drop-above");
-                dropHeight = $dropdown.outerHeight(false);
-                css.top = offset.top - dropHeight;
-                css.bottom = 'auto';
-            }
-            else {
-                css.top = dropTop;
-                css.bottom = 'auto';
-                this.container.removeClass("select2-drop-above");
-                $dropdown.removeClass("select2-drop-above");
-            }
-            css = $.extend(css, evaluate(this.opts.dropdownCss, this.opts.element));
-
-            $dropdown.css(css);
-        },
-
-        // abstract
-        shouldOpen: function() {
-            var event;
-
-            if (this.opened()) return false;
-
-            if (this._enabled === false || this._readonly === true) return false;
-
-            event = $.Event("select2-opening");
-            this.opts.element.trigger(event);
-            return !event.isDefaultPrevented();
-        },
-
-        // abstract
-        clearDropdownAlignmentPreference: function() {
-            // clear the classes used to figure out the preference of where the dropdown should be opened
-            this.container.removeClass("select2-drop-above");
-            this.dropdown.removeClass("select2-drop-above");
-        },
-
-        /**
-         * Opens the dropdown
-         *
-         * @return {Boolean} whether or not dropdown was opened. This method will return false if, for example,
-         * the dropdown is already open, or if the 'open' event listener on the element called preventDefault().
-         */
-        // abstract
-        open: function () {
-
-            if (!this.shouldOpen()) return false;
-
-            this.opening();
-
-            // Only bind the document mousemove when the dropdown is visible
-            $document.on("mousemove.select2Event", function (e) {
-                lastMousePosition.x = e.pageX;
-                lastMousePosition.y = e.pageY;
-            });
-
-            return true;
-        },
-
-        /**
-         * Performs the opening of the dropdown
-         */
-        // abstract
-        opening: function() {
-            var cid = this.containerEventName,
-                scroll = "scroll." + cid,
-                resize = "resize."+cid,
-                orient = "orientationchange."+cid,
-                mask;
-
-            this.container.addClass("select2-dropdown-open").addClass("select2-container-active");
-
-            this.clearDropdownAlignmentPreference();
-
-            if(this.dropdown[0] !== this.body.children().last()[0]) {
-                this.dropdown.detach().appendTo(this.body);
-            }
-
-            // create the dropdown mask if doesn't already exist
-            mask = $("#select2-drop-mask");
-            if (mask.length === 0) {
-                mask = $(document.createElement("div"));
-                mask.attr("id","select2-drop-mask").attr("class","select2-drop-mask");
-                mask.hide();
-                mask.appendTo(this.body);
-                mask.on("mousedown touchstart click", function (e) {
-                    // Prevent IE from generating a click event on the body
-                    reinsertElement(mask);
-
-                    var dropdown = $("#select2-drop"), self;
-                    if (dropdown.length > 0) {
-                        self=dropdown.data("select2");
-                        if (self.opts.selectOnBlur) {
-                            self.selectHighlighted({noFocus: true});
-                        }
-                        self.close();
-                        e.preventDefault();
-                        e.stopPropagation();
-                    }
-                });
-            }
-
-            // ensure the mask is always right before the dropdown
-            if (this.dropdown.prev()[0] !== mask[0]) {
-                this.dropdown.before(mask);
-            }
-
-            // move the global id to the correct dropdown
-            $("#select2-drop").removeAttr("id");
-            this.dropdown.attr("id", "select2-drop");
-
-            // show the elements
-            mask.show();
-
-            this.positionDropdown();
-            this.dropdown.show();
-            this.positionDropdown();
-
-            this.dropdown.addClass("select2-drop-active");
-
-            // attach listeners to events that can change the position of the container and thus require
-            // the position of the dropdown to be updated as well so it does not come unglued from the container
-            var that = this;
-            this.container.parents().add(window).each(function () {
-                $(this).on(resize+" "+scroll+" "+orient, function (e) {
-                    if (that.opened()) that.positionDropdown();
-                });
-            });
-
-
-        },
-
-        // abstract
-        close: function () {
-            if (!this.opened()) return;
-
-            var cid = this.containerEventName,
-                scroll = "scroll." + cid,
-                resize = "resize."+cid,
-                orient = "orientationchange."+cid;
-
-            // unbind event listeners
-            this.container.parents().add(window).each(function () { $(this).off(scroll).off(resize).off(orient); });
-
-            this.clearDropdownAlignmentPreference();
-
-            $("#select2-drop-mask").hide();
-            this.dropdown.removeAttr("id"); // only the active dropdown has the select2-drop id
-            this.dropdown.hide();
-            this.container.removeClass("select2-dropdown-open").removeClass("select2-container-active");
-            this.results.empty();
-
-            // Now that the dropdown is closed, unbind the global document mousemove event
-            $document.off("mousemove.select2Event");
-
-            this.clearSearch();
-            this.search.removeClass("select2-active");
-
-            // Remove the aria active descendant for highlighted element
-            this.search.removeAttr("aria-activedescendant");
-            this.opts.element.trigger($.Event("select2-close"));
-        },
-
-        /**
-         * Opens control, sets input value, and updates results.
-         */
-        // abstract
-        externalSearch: function (term) {
-            this.open();
-            this.search.val(term);
-            this.updateResults(false);
-        },
-
-        // abstract
-        clearSearch: function () {
-
-        },
-
-        /**
-         * @return {Boolean} Whether or not search value was changed.
-         * @private
-         */
-        prefillNextSearchTerm: function () {
-            // initializes search's value with nextSearchTerm (if defined by user)
-            // ignore nextSearchTerm if the dropdown is opened by the user pressing a letter
-            if(this.search.val() !== "") {
-                return false;
-            }
-
-            var nextSearchTerm = this.opts.nextSearchTerm(this.data(), this.lastSearchTerm);
-            if(nextSearchTerm !== undefined){
-                this.search.val(nextSearchTerm);
-                this.search.select();
-                return true;
-            }
-
-            return false;
-        },
-
-        //abstract
-        getMaximumSelectionSize: function() {
-            return evaluate(this.opts.maximumSelectionSize, this.opts.element);
-        },
-
-        // abstract
-        ensureHighlightVisible: function () {
-            var results = this.results, children, index, child, hb, rb, y, more, topOffset;
-
-            index = this.highlight();
-
-            if (index < 0) return;
-
-            if (index == 0) {
-
-                // if the first element is highlighted scroll all the way to the top,
-                // that way any unselectable headers above it will also be scrolled
-                // into view
-
-                results.scrollTop(0);
-                return;
-            }
-
-            children = this.findHighlightableChoices().find('.select2-result-label');
-
-            child = $(children[index]);
-
-            topOffset = (child.offset() || {}).top || 0;
-
-            hb = topOffset + child.outerHeight(true);
-
-            // if this is the last child lets also make sure select2-more-results is visible
-            if (index === children.length - 1) {
-                more = results.find("li.select2-more-results");
-                if (more.length > 0) {
-                    hb = more.offset().top + more.outerHeight(true);
-                }
-            }
-
-            rb = results.offset().top + results.outerHeight(false);
-            if (hb > rb) {
-                results.scrollTop(results.scrollTop() + (hb - rb));
-            }
-            y = topOffset - results.offset().top;
-
-            // make sure the top of the element is visible
-            if (y < 0 && child.css('display') != 'none' ) {
-                results.scrollTop(results.scrollTop() + y); // y is negative
-            }
-        },
-
-        // abstract
-        findHighlightableChoices: function() {
-            return this.results.find(".select2-result-selectable:not(.select2-disabled):not(.select2-selected)");
-        },
-
-        // abstract
-        moveHighlight: function (delta) {
-            var choices = this.findHighlightableChoices(),
-                index = this.highlight();
-
-            while (index > -1 && index < choices.length) {
-                index += delta;
-                var choice = $(choices[index]);
-                if (choice.hasClass("select2-result-selectable") && !choice.hasClass("select2-disabled") && !choice.hasClass("select2-selected")) {
-                    this.highlight(index);
-                    break;
-                }
-            }
-        },
-
-        // abstract
-        highlight: function (index) {
-            var choices = this.findHighlightableChoices(),
-                choice,
-                data;
-
-            if (arguments.length === 0) {
-                return indexOf(choices.filter(".select2-highlighted")[0], choices.get());
-            }
-
-            if (index >= choices.length) index = choices.length - 1;
-            if (index < 0) index = 0;
-
-            this.removeHighlight();
-
-            choice = $(choices[index]);
-            choice.addClass("select2-highlighted");
-
-            // ensure assistive technology can determine the active choice
-            this.search.attr("aria-activedescendant", choice.find(".select2-result-label").attr("id"));
-
-            this.ensureHighlightVisible();
-
-            this.liveRegion.text(choice.text());
-
-            data = choice.data("select2-data");
-            if (data) {
-                this.opts.element.trigger({ type: "select2-highlight", val: this.id(data), choice: data });
-            }
-        },
-
-        removeHighlight: function() {
-            this.results.find(".select2-highlighted").removeClass("select2-highlighted");
-        },
-
-        touchMoved: function() {
-            this._touchMoved = true;
-        },
-
-        clearTouchMoved: function() {
-          this._touchMoved = false;
-        },
-
-        // abstract
-        countSelectableResults: function() {
-            return this.findHighlightableChoices().length;
-        },
-
-        // abstract
-        highlightUnderEvent: function (event) {
-            var el = $(event.target).closest(".select2-result-selectable");
-            if (el.length > 0 && !el.is(".select2-highlighted")) {
-                var choices = this.findHighlightableChoices();
-                this.highlight(choices.index(el));
-            } else if (el.length == 0) {
-                // if we are over an unselectable item remove all highlights
-                this.removeHighlight();
-            }
-        },
-
-        // abstract
-        loadMoreIfNeeded: function () {
-            var results = this.results,
-                more = results.find("li.select2-more-results"),
-                below, // pixels the element is below the scroll fold, below==0 is when the element is starting to be visible
-                page = this.resultsPage + 1,
-                self=this,
-                term=this.search.val(),
-                context=this.context;
-
-            if (more.length === 0) return;
-            below = more.offset().top - results.offset().top - results.height();
-
-            if (below <= this.opts.loadMorePadding) {
-                more.addClass("select2-active");
-                this.opts.query({
-                        element: this.opts.element,
-                        term: term,
-                        page: page,
-                        context: context,
-                        matcher: this.opts.matcher,
-                        callback: this.bind(function (data) {
-
-                    // ignore a response if the select2 has been closed before it was received
-                    if (!self.opened()) return;
-
-
-                    self.opts.populateResults.call(this, results, data.results, {term: term, page: page, context:context});
-                    self.postprocessResults(data, false, false);
-
-                    if (data.more===true) {
-                        more.detach().appendTo(results).html(self.opts.escapeMarkup(evaluate(self.opts.formatLoadMore, self.opts.element, page+1)));
-                        window.setTimeout(function() { self.loadMoreIfNeeded(); }, 10);
-                    } else {
-                        more.remove();
-                    }
-                    self.positionDropdown();
-                    self.resultsPage = page;
-                    self.context = data.context;
-                    this.opts.element.trigger({ type: "select2-loaded", items: data });
-                })});
-            }
-        },
-
-        /**
-         * Default tokenizer function which does nothing
-         */
-        tokenize: function() {
-
-        },
-
-        /**
-         * @param initial whether or not this is the call to this method right after the dropdown has been opened
-         */
-        // abstract
-        updateResults: function (initial) {
-            var search = this.search,
-                results = this.results,
-                opts = this.opts,
-                data,
-                self = this,
-                input,
-                term = search.val(),
-                lastTerm = $.data(this.container, "select2-last-term"),
-                // sequence number used to drop out-of-order responses
-                queryNumber;
-
-            // prevent duplicate queries against the same term
-            if (initial !== true && lastTerm && equal(term, lastTerm)) return;
-
-            $.data(this.container, "select2-last-term", term);
-
-            // if the search is currently hidden we do not alter the results
-            if (initial !== true && (this.showSearchInput === false || !this.opened())) {
-                return;
-            }
-
-            function postRender() {
-                search.removeClass("select2-active");
-                self.positionDropdown();
-                if (results.find('.select2-no-results,.select2-selection-limit,.select2-searching').length) {
-                    self.liveRegion.text(results.text());
-                }
-                else {
-                    self.liveRegion.text(self.opts.formatMatches(results.find('.select2-result-selectable:not(".select2-selected")').length));
-                }
-            }
-
-            function render(html) {
-                results.html(html);
-                postRender();
-            }
-
-            queryNumber = ++this.queryCount;
-
-            var maxSelSize = this.getMaximumSelectionSize();
-            if (maxSelSize >=1) {
-                data = this.data();
-                if ($.isArray(data) && data.length >= maxSelSize && checkFormatter(opts.formatSelectionTooBig, "formatSelectionTooBig")) {
-                    render("<li class='select2-selection-limit'>" + evaluate(opts.formatSelectionTooBig, opts.element, maxSelSize) + "</li>");
-                    return;
-                }
-            }
-
-            if (search.val().length < opts.minimumInputLength) {
-                if (checkFormatter(opts.formatInputTooShort, "formatInputTooShort")) {
-                    render("<li class='select2-no-results'>" + evaluate(opts.formatInputTooShort, opts.element, search.val(), opts.minimumInputLength) + "</li>");
-                } else {
-                    render("");
-                }
-                if (initial && this.showSearch) this.showSearch(true);
-                return;
-            }
-
-            if (opts.maximumInputLength && search.val().length > opts.maximumInputLength) {
-                if (checkFormatter(opts.formatInputTooLong, "formatInputTooLong")) {
-                    render("<li class='select2-no-results'>" + evaluate(opts.formatInputTooLong, opts.element, search.val(), opts.maximumInputLength) + "</li>");
-                } else {
-                    render("");
-                }
-                return;
-            }
-
-            if (opts.formatSearching && this.findHighlightableChoices().length === 0) {
-                render("<li class='select2-searching'>" + evaluate(opts.formatSearching, opts.element) + "</li>");
-            }
-
-            search.addClass("select2-active");
-
-            this.removeHighlight();
-
-            // give the tokenizer a chance to pre-process the input
-            input = this.tokenize();
-            if (input != undefined && input != null) {
-                search.val(input);
-            }
-
-            this.resultsPage = 1;
-
-            opts.query({
-                element: opts.element,
-                    term: search.val(),
-                    page: this.resultsPage,
-                    context: null,
-                    matcher: opts.matcher,
-                    callback: this.bind(function (data) {
-                var def; // default choice
-
-                // ignore old responses
-                if (queryNumber != this.queryCount) {
-                  return;
-                }
-
-                // ignore a response if the select2 has been closed before it was received
-                if (!this.opened()) {
-                    this.search.removeClass("select2-active");
-                    return;
-                }
-
-                // handle ajax error
-                if(data.hasError !== undefined && checkFormatter(opts.formatAjaxError, "formatAjaxError")) {
-                    render("<li class='select2-ajax-error'>" + evaluate(opts.formatAjaxError, opts.element, data.jqXHR, data.textStatus, data.errorThrown) + "</li>");
-                    return;
-                }
-
-                // save context, if any
-                this.context = (data.context===undefined) ? null : data.context;
-                // create a default choice and prepend it to the list
-                if (this.opts.createSearchChoice && search.val() !== "") {
-                    def = this.opts.createSearchChoice.call(self, search.val(), data.results);
-                    if (def !== undefined && def !== null && self.id(def) !== undefined && self.id(def) !== null) {
-                        if ($(data.results).filter(
-                            function () {
-                                return equal(self.id(this), self.id(def));
-                            }).length === 0) {
-                            this.opts.createSearchChoicePosition(data.results, def);
-                        }
-                    }
-                }
-
-                if (data.results.length === 0 && checkFormatter(opts.formatNoMatches, "formatNoMatches")) {
-                    render("<li class='select2-no-results'>" + evaluate(opts.formatNoMatches, opts.element, search.val()) + "</li>");
-                    if(this.showSearch){
-                        this.showSearch(search.val());
-                    }
-                    return;
-                }
-
-                results.empty();
-                self.opts.populateResults.call(this, results, data.results, {term: search.val(), page: this.resultsPage, context:null});
-
-                if (data.more === true && checkFormatter(opts.formatLoadMore, "formatLoadMore")) {
-                    results.append("<li class='select2-more-results'>" + opts.escapeMarkup(evaluate(opts.formatLoadMore, opts.element, this.resultsPage)) + "</li>");
-                    window.setTimeout(function() { self.loadMoreIfNeeded(); }, 10);
-                }
-
-                this.postprocessResults(data, initial);
-
-                postRender();
-
-                this.opts.element.trigger({ type: "select2-loaded", items: data });
-            })});
-        },
-
-        // abstract
-        cancel: function () {
-            this.close();
-        },
-
-        // abstract
-        blur: function () {
-            // if selectOnBlur == true, select the currently highlighted option
-            if (this.opts.selectOnBlur)
-                this.selectHighlighted({noFocus: true});
-
-            this.close();
-            this.container.removeClass("select2-container-active");
-            // synonymous to .is(':focus'), which is available in jquery >= 1.6
-            if (this.search[0] === document.activeElement) { this.search.blur(); }
-            this.clearSearch();
-            this.selection.find(".select2-search-choice-focus").removeClass("select2-search-choice-focus");
-        },
-
-        // abstract
-        focusSearch: function () {
-            focus(this.search);
-        },
-
-        // abstract
-        selectHighlighted: function (options) {
-            if (this._touchMoved) {
-              this.clearTouchMoved();
-              return;
-            }
-            var index=this.highlight(),
-                highlighted=this.results.find(".select2-highlighted"),
-                data = highlighted.closest('.select2-result').data("select2-data");
-
-            if (data) {
-                this.highlight(index);
-                this.onSelect(data, options);
-            } else if (options && options.noFocus) {
-                this.close();
-            }
-        },
-
-        // abstract
-        getPlaceholder: function () {
-            var placeholderOption;
-            return this.opts.element.attr("placeholder") ||
-                this.opts.element.attr("data-placeholder") || // jquery 1.4 compat
-                this.opts.element.data("placeholder") ||
-                this.opts.placeholder ||
-                ((placeholderOption = this.getPlaceholderOption()) !== undefined ? placeholderOption.text() : undefined);
-        },
-
-        // abstract
-        getPlaceholderOption: function() {
-            if (this.select) {
-                var firstOption = this.select.children('option').first();
-                if (this.opts.placeholderOption !== undefined ) {
-                    //Determine the placeholder option based on the specified placeholderOption setting
-                    return (this.opts.placeholderOption === "first" && firstOption) ||
-                           (typeof this.opts.placeholderOption === "function" && this.opts.placeholderOption(this.select));
-                } else if ($.trim(firstOption.text()) === "" && firstOption.val() === "") {
-                    //No explicit placeholder option specified, use the first if it's blank
-                    return firstOption;
-                }
-            }
-        },
-
-        /**
-         * Get the desired width for the container element.  This is
-         * derived first from option `width` passed to select2, then
-         * the inline 'style' on the original element, and finally
-         * falls back to the jQuery calculated element width.
-         */
-        // abstract
-        initContainerWidth: function () {
-            function resolveContainerWidth() {
-                var style, attrs, matches, i, l, attr;
-
-                if (this.opts.width === "off") {
-                    return null;
-                } else if (this.opts.width === "element"){
-                    return this.opts.element.outerWidth(false) === 0 ? 'auto' : this.opts.element.outerWidth(false) + 'px';
-                } else if (this.opts.width === "copy" || this.opts.width === "resolve") {
-                    // check if there is inline style on the element that contains width
-                    style = this.opts.element.attr('style');
-                    if (typeof(style) === "string") {
-                        attrs = style.split(';');
-                        for (i = 0, l = attrs.length; i < l; i = i + 1) {
-                            attr = attrs[i].replace(/\s/g, '');
-                            matches = attr.match(/^width:(([-+]?([0-9]*\.)?[0-9]+)(px|em|ex|%|in|cm|mm|pt|pc))/i);
-                            if (matches !== null && matches.length >= 1)
-                                return matches[1];
-                        }
-                    }
-
-                    if (this.opts.width === "resolve") {
-                        // next check if css('width') can resolve a width that is percent based, this is sometimes possible
-                        // when attached to input type=hidden or elements hidden via css
-                        style = this.opts.element.css('width');
-                        if (style.indexOf("%") > 0) return style;
-
-                        // finally, fallback on the calculated width of the element
-                        return (this.opts.element.outerWidth(false) === 0 ? 'auto' : this.opts.element.outerWidth(false) + 'px');
-                    }
-
-                    return null;
-                } else if ($.isFunction(this.opts.width)) {
-                    return this.opts.width();
-                } else {
-                    return this.opts.width;
-               }
-            };
-
-            var width = resolveContainerWidth.call(this);
-            if (width !== null) {
-                this.container.css("width", width);
-            }
-        }
-    });
-
-    SingleSelect2 = clazz(AbstractSelect2, {
-
-        // single
-
-        createContainer: function () {
-            var container = $(document.createElement("div")).attr({
-                "class": "select2-container"
-            }).html([
-                "<a href='javascript:void(0)' class='select2-choice' tabindex='-1'>",
-                "   <span class='select2-chosen'>&#160;</span><abbr class='select2-search-choice-close'></abbr>",
-                "   <span class='select2-arrow' role='presentation'><b role='presentation'></b></span>",
-                "</a>",
-                "<label for='' class='select2-offscreen'></label>",
-                "<input class='select2-focusser select2-offscreen' type='text' aria-haspopup='true' role='button' />",
-                "<div class='select2-drop select2-display-none'>",
-                "   <div class='select2-search'>",
-                "       <label for='' class='select2-offscreen'></label>",
-                "       <input type='text' autocomplete='off' autocorrect='off' autocapitalize='off' spellcheck='false' class='select2-input' role='combobox' aria-expanded='true'",
-                "       aria-autocomplete='list' />",
-                "   </div>",
-                "   <ul class='select2-results' role='listbox'>",
-                "   </ul>",
-                "</div>"].join(""));
-            return container;
-        },
-
-        // single
-        enableInterface: function() {
-            if (this.parent.enableInterface.apply(this, arguments)) {
-                this.focusser.prop("disabled", !this.isInterfaceEnabled());
-            }
-        },
-
-        // single
-        opening: function () {
-            var el, range, len;
-
-            if (this.opts.minimumResultsForSearch >= 0) {
-                this.showSearch(true);
-            }
-
-            this.parent.opening.apply(this, arguments);
-
-            if (this.showSearchInput !== false) {
-                // IE appends focusser.val() at the end of field :/ so we manually insert it at the beginning using a range
-                // all other browsers handle this just fine
-
-                this.search.val(this.focusser.val());
-            }
-            if (this.opts.shouldFocusInput(this)) {
-                this.search.focus();
-                // move the cursor to the end after focussing, otherwise it will be at the beginning and
-                // new text will appear *before* focusser.val()
-                el = this.search.get(0);
-                if (el.createTextRange) {
-                    range = el.createTextRange();
-                    range.collapse(false);
-                    range.select();
-                } else if (el.setSelectionRange) {
-                    len = this.search.val().length;
-                    el.setSelectionRange(len, len);
-                }
-            }
-
-            this.prefillNextSearchTerm();
-
-            this.focusser.prop("disabled", true).val("");
-            this.updateResults(true);
-            this.opts.element.trigger($.Event("select2-open"));
-        },
-
-        // single
-        close: function () {
-            if (!this.opened()) return;
-            this.parent.close.apply(this, arguments);
-
-            this.focusser.prop("disabled", false);
-
-            if (this.opts.shouldFocusInput(this)) {
-                this.focusser.focus();
-            }
-        },
-
-        // single
-        focus: function () {
-            if (this.opened()) {
-                this.close();
-            } else {
-                this.focusser.prop("disabled", false);
-                if (this.opts.shouldFocusInput(this)) {
-                    this.focusser.focus();
-                }
-            }
-        },
-
-        // single
-        isFocused: function () {
-            return this.container.hasClass("select2-container-active");
-        },
-
-        // single
-        cancel: function () {
-            this.parent.cancel.apply(this, arguments);
-            this.focusser.prop("disabled", false);
-
-            if (this.opts.shouldFocusInput(this)) {
-                this.focusser.focus();
-            }
-        },
-
-        // single
-        destroy: function() {
-            $("label[for='" + this.focusser.attr('id') + "']")
-                .attr('for', this.opts.element.attr("id"));
-            this.parent.destroy.apply(this, arguments);
-
-            cleanupJQueryElements.call(this,
-                "selection",
-                "focusser"
-            );
-        },
-
-        // single
-        initContainer: function () {
-
-            var selection,
-                container = this.container,
-                dropdown = this.dropdown,
-                idSuffix = nextUid(),
-                elementLabel;
-
-            if (this.opts.minimumResultsForSearch < 0) {
-                this.showSearch(false);
-            } else {
-                this.showSearch(true);
-            }
-
-            this.selection = selection = container.find(".select2-choice");
-
-            this.focusser = container.find(".select2-focusser");
-
-            // add aria associations
-            selection.find(".select2-chosen").attr("id", "select2-chosen-"+idSuffix);
-            this.focusser.attr("aria-labelledby", "select2-chosen-"+idSuffix);
-            this.results.attr("id", "select2-results-"+idSuffix);
-            this.search.attr("aria-owns", "select2-results-"+idSuffix);
-
-            // rewrite labels from original element to focusser
-            this.focusser.attr("id", "s2id_autogen"+idSuffix);
-
-            elementLabel = $("label[for='" + this.opts.element.attr("id") + "']");
-            this.opts.element.on('focus.select2', this.bind(function () { this.focus(); }));
-
-            this.focusser.prev()
-                .text(elementLabel.text())
-                .attr('for', this.focusser.attr('id'));
-
-            // Ensure the original element retains an accessible name
-            var originalTitle = this.opts.element.attr("title");
-            this.opts.element.attr("title", (originalTitle || elementLabel.text()));
-
-            this.focusser.attr("tabindex", this.elementTabIndex);
-
-            // write label for search field using the label from the focusser element
-            this.search.attr("id", this.focusser.attr('id') + '_search');
-
-            this.search.prev()
-                .text($("label[for='" + this.focusser.attr('id') + "']").text())
-                .attr('for', this.search.attr('id'));
-
-            this.search.on("keydown", this.bind(function (e) {
-                if (!this.isInterfaceEnabled()) return;
-
-                // filter 229 keyCodes (input method editor is processing key input)
-                if (229 == e.keyCode) return;
-
-                if (e.which === KEY.PAGE_UP || e.which === KEY.PAGE_DOWN) {
-                    // prevent the page from scrolling
-                    killEvent(e);
-                    return;
-                }
-
-                switch (e.which) {
-                    case KEY.UP:
-                    case KEY.DOWN:
-                        this.moveHighlight((e.which === KEY.UP) ? -1 : 1);
-                        killEvent(e);
-                        return;
-                    case KEY.ENTER:
-                        this.selectHighlighted();
-                        killEvent(e);
-                        return;
-                    case KEY.TAB:
-                        this.selectHighlighted({noFocus: true});
-                        return;
-                    case KEY.ESC:
-                        this.cancel(e);
-                        killEvent(e);
-                        return;
-                }
-            }));
-
-            this.search.on("blur", this.bind(function(e) {
-                // a workaround for chrome to keep the search field focussed when the scroll bar is used to scroll the dropdown.
-                // without this the search field loses focus which is annoying
-                if (document.activeElement === this.body.get(0)) {
-                    window.setTimeout(this.bind(function() {
-                        if (this.opened() && this.results && this.results.length > 1) {
-                            this.search.focus();
-                        }
-                    }), 0);
-                }
-            }));
-
-            this.focusser.on("keydown", this.bind(function (e) {
-                if (!this.isInterfaceEnabled()) return;
-
-                if (e.which === KEY.TAB || KEY.isControl(e) || KEY.isFunctionKey(e) || e.which === KEY.ESC) {
-                    return;
-                }
-
-                if (this.opts.openOnEnter === false && e.which === KEY.ENTER) {
-                    killEvent(e);
-                    return;
-                }
-
-                if (e.which == KEY.DOWN || e.which == KEY.UP
-                    || (e.which == KEY.ENTER && this.opts.openOnEnter)) {
-
-                    if (e.altKey || e.ctrlKey || e.shiftKey || e.metaKey) return;
-
-                    this.open();
-                    killEvent(e);
-                    return;
-                }
-
-                if (e.which == KEY.DELETE || e.which == KEY.BACKSPACE) {
-                    if (this.opts.allowClear) {
-                        this.clear();
-                    }
-                    killEvent(e);
-                    return;
-                }
-            }));
-
-
-            installKeyUpChangeEvent(this.focusser);
-            this.focusser.on("keyup-change input", this.bind(function(e) {
-                if (this.opts.minimumResultsForSearch >= 0) {
-                    e.stopPropagation();
-                    if (this.opened()) return;
-                    this.open();
-                }
-            }));
-
-            selection.on("mousedown touchstart", "abbr", this.bind(function (e) {
-                if (!this.isInterfaceEnabled()) {
-                    return;
-                }
-
-                this.clear();
-                killEventImmediately(e);
-                this.close();
-
-                if (this.selection) {
-                    this.selection.focus();
-                }
-            }));
-
-            selection.on("mousedown touchstart", this.bind(function (e) {
-                // Prevent IE from generating a click event on the body
-                reinsertElement(selection);
-
-                if (!this.container.hasClass("select2-container-active")) {
-                    this.opts.element.trigger($.Event("select2-focus"));
-                }
-
-                if (this.opened()) {
-                    this.close();
-                } else if (this.isInterfaceEnabled()) {
-                    this.open();
-                }
-
-                killEvent(e);
-            }));
-
-            dropdown.on("mousedown touchstart", this.bind(function() {
-                if (this.opts.shouldFocusInput(this)) {
-                    this.search.focus();
-                }
-            }));
-
-            selection.on("focus", this.bind(function(e) {
-                killEvent(e);
-            }));
-
-            this.focusser.on("focus", this.bind(function(){
-                if (!this.container.hasClass("select2-container-active")) {
-                    this.opts.element.trigger($.Event("select2-focus"));
-                }
-                this.container.addClass("select2-container-active");
-            })).on("blur", this.bind(function() {
-                if (!this.opened()) {
-                    this.container.removeClass("select2-container-active");
-                    this.opts.element.trigger($.Event("select2-blur"));
-                }
-            }));
-            this.search.on("focus", this.bind(function(){
-                if (!this.container.hasClass("select2-container-active")) {
-                    this.opts.element.trigger($.Event("select2-focus"));
-                }
-                this.container.addClass("select2-container-active");
-            }));
-
-            this.initContainerWidth();
-            this.opts.element.hide();
-            this.setPlaceholder();
-
-        },
-
-        // single
-        clear: function(triggerChange) {
-            var data=this.selection.data("select2-data");
-            if (data) { // guard against queued quick consecutive clicks
-                var evt = $.Event("select2-clearing");
-                this.opts.element.trigger(evt);
-                if (evt.isDefaultPrevented()) {
-                    return;
-                }
-                var placeholderOption = this.getPlaceholderOption();
-                this.opts.element.val(placeholderOption ? placeholderOption.val() : "");
-                this.selection.find(".select2-chosen").empty();
-                this.selection.removeData("select2-data");
-                this.setPlaceholder();
-
-                if (triggerChange !== false){
-                    this.opts.element.trigger({ type: "select2-removed", val: this.id(data), choice: data });
-                    this.triggerChange({removed:data});
-                }
-            }
-        },
-
-        /**
-         * Sets selection based on source element's value
-         */
-        // single
-        initSelection: function () {
-            var selected;
-            if (this.isPlaceholderOptionSelected()) {
-                this.updateSelection(null);
-                this.close();
-                this.setPlaceholder();
-            } else {
-                var self = this;
-                this.opts.initSelection.call(null, this.opts.element, function(selected){
-                    if (selected !== undefined && selected !== null) {
-                        self.updateSelection(selected);
-                        self.close();
-                        self.setPlaceholder();
-                        self.lastSearchTerm = self.search.val();
-                    }
-                });
-            }
-        },
-
-        isPlaceholderOptionSelected: function() {
-            var placeholderOption;
-            if (this.getPlaceholder() === undefined) return false; // no placeholder specified so no option should be considered
-            return ((placeholderOption = this.getPlaceholderOption()) !== undefined && placeholderOption.prop("selected"))
-                || (this.opts.element.val() === "")
-                || (this.opts.element.val() === undefined)
-                || (this.opts.element.val() === null);
-        },
-
-        // single
-        prepareOpts: function () {
-            var opts = this.parent.prepareOpts.apply(this, arguments),
-                self=this;
-
-            if (opts.element.get(0).tagName.toLowerCase() === "select") {
-                // install the selection initializer
-                opts.initSelection = function (element, callback) {
-                    var selected = element.find("option").filter(function() { return this.selected && !this.disabled });
-                    // a single select box always has a value, no need to null check 'selected'
-                    callback(self.optionToData(selected));
-                };
-            } else if ("data" in opts) {
-                // install default initSelection when applied to hidden input and data is local
-                opts.initSelection = opts.initSelection || function (element, callback) {
-                    var id = element.val();
-                    //search in data by id, storing the actual matching item
-                    var match = null;
-                    opts.query({
-                        matcher: function(term, text, el){
-                            var is_match = equal(id, opts.id(el));
-                            if (is_match) {
-                                match = el;
-                            }
-                            return is_match;
-                        },
-                        callback: !$.isFunction(callback) ? $.noop : function() {
-                            callback(match);
-                        }
-                    });
-                };
-            }
-
-            return opts;
-        },
-
-        // single
-        getPlaceholder: function() {
-            // if a placeholder is specified on a single select without a valid placeholder option ignore it
-            if (this.select) {
-                if (this.getPlaceholderOption() === undefined) {
-                    return undefined;
-                }
-            }
-
-            return this.parent.getPlaceholder.apply(this, arguments);
-        },
-
-        // single
-        setPlaceholder: function () {
-            var placeholder = this.getPlaceholder();
-
-            if (this.isPlaceholderOptionSelected() && placeholder !== undefined) {
-
-                // check for a placeholder option if attached to a select
-                if (this.select && this.getPlaceholderOption() === undefined) return;
-
-                this.selection.find(".select2-chosen").html(this.opts.escapeMarkup(placeholder));
-
-                this.selection.addClass("select2-default");
-
-                this.container.removeClass("select2-allowclear");
-            }
-        },
-
-        // single
-        postprocessResults: function (data, initial, noHighlightUpdate) {
-            var selected = 0, self = this, showSearchInput = true;
-
-            // find the selected element in the result list
-
-            this.findHighlightableChoices().each2(function (i, elm) {
-                if (equal(self.id(elm.data("select2-data")), self.opts.element.val())) {
-                    selected = i;
-                    return false;
-                }
-            });
-
-            // and highlight it
-            if (noHighlightUpdate !== false) {
-                if (initial === true && selected >= 0) {
-                    this.highlight(selected);
-                } else {
-                    this.highlight(0);
-                }
-            }
-
-            // hide the search box if this is the first we got the results and there are enough of them for search
-
-            if (initial === true) {
-                var min = this.opts.minimumResultsForSearch;
-                if (min >= 0) {
-                    this.showSearch(countResults(data.results) >= min);
-                }
-            }
-        },
-
-        // single
-        showSearch: function(showSearchInput) {
-            if (this.showSearchInput === showSearchInput) return;
-
-            this.showSearchInput = showSearchInput;
-
-            this.dropdown.find(".select2-search").toggleClass("select2-search-hidden", !showSearchInput);
-            this.dropdown.find(".select2-search").toggleClass("select2-offscreen", !showSearchInput);
-            //add "select2-with-searchbox" to the container if search box is shown
-            $(this.dropdown, this.container).toggleClass("select2-with-searchbox", showSearchInput);
-        },
-
-        // single
-        onSelect: function (data, options) {
-
-            if (!this.triggerSelect(data)) { return; }
-
-            var old = this.opts.element.val(),
-                oldData = this.data();
-
-            this.opts.element.val(this.id(data));
-            this.updateSelection(data);
-
-            this.opts.element.trigger({ type: "select2-selected", val: this.id(data), choice: data });
-
-            this.lastSearchTerm = this.search.val();
-            this.close();
-
-            if ((!options || !options.noFocus) && this.opts.shouldFocusInput(this)) {
-                this.focusser.focus();
-            }
-
-            if (!equal(old, this.id(data))) {
-                this.triggerChange({ added: data, removed: oldData });
-            }
-        },
-
-        // single
-        updateSelection: function (data) {
-
-            var container=this.selection.find(".select2-chosen"), formatted, cssClass;
-
-            this.selection.data("select2-data", data);
-
-            container.empty();
-            if (data !== null) {
-                formatted=this.opts.formatSelection(data, container, this.opts.escapeMarkup);
-            }
-            if (formatted !== undefined) {
-                container.append(formatted);
-            }
-            cssClass=this.opts.formatSelectionCssClass(data, container);
-            if (cssClass !== undefined) {
-                container.addClass(cssClass);
-            }
-
-            this.selection.removeClass("select2-default");
-
-            if (this.opts.allowClear && this.getPlaceholder() !== undefined) {
-                this.container.addClass("select2-allowclear");
-            }
-        },
-
-        // single
-        val: function () {
-            var val,
-                triggerChange = false,
-                data = null,
-                self = this,
-                oldData = this.data();
-
-            if (arguments.length === 0) {
-                return this.opts.element.val();
-            }
-
-            val = arguments[0];
-
-            if (arguments.length > 1) {
-                triggerChange = arguments[1];
-
-                if (this.opts.debug && console && console.warn) {
-                    console.warn(
-                        'Select2: The second option to `select2("val")` is not supported in Select2 4.0.0. ' +
-                        'The `change` event will always be triggered in 4.0.0.'
-                    );
-                }
-            }
-
-            if (this.select) {
-                if (this.opts.debug && console && console.warn) {
-                    console.warn(
-                        'Select2: Setting the value on a <select> using `select2("val")` is no longer supported in 4.0.0. ' +
-                        'You can use the `.val(newValue).trigger("change")` method provided by jQuery instead.'
-                    );
-                }
-
-                this.select
-                    .val(val)
-                    .find("option").filter(function() { return this.selected }).each2(function (i, elm) {
-                        data = self.optionToData(elm);
-                        return false;
-                    });
-                this.updateSelection(data);
-                this.setPlaceholder();
-                if (triggerChange) {
-                    this.triggerChange({added: data, removed:oldData});
-                }
-            } else {
-                // val is an id. !val is true for [undefined,null,'',0] - 0 is legal
-                if (!val && val !== 0) {
-                    this.clear(triggerChange);
-                    return;
-                }
-                if (this.opts.initSelection === undefined) {
-                    throw new Error("cannot call val() if initSelection() is not defined");
-                }
-                this.opts.element.val(val);
-                this.opts.initSelection(this.opts.element, function(data){
-                    self.opts.element.val(!data ? "" : self.id(data));
-                    self.updateSelection(data);
-                    self.setPlaceholder();
-                    if (triggerChange) {
-                        self.triggerChange({added: data, removed:oldData});
-                    }
-                });
-            }
-        },
-
-        // single
-        clearSearch: function () {
-            this.search.val("");
-            this.focusser.val("");
-        },
-
-        // single
-        data: function(value) {
-            var data,
-                triggerChange = false;
-
-            if (arguments.length === 0) {
-                data = this.selection.data("select2-data");
-                if (data == undefined) data = null;
-                return data;
-            } else {
-                if (this.opts.debug && console && console.warn) {
-                    console.warn(
-                        'Select2: The `select2("data")` method can no longer set selected values in 4.0.0, ' +
-                        'consider using the `.val()` method instead.'
-                    );
-                }
-
-                if (arguments.length > 1) {
-                    triggerChange = arguments[1];
-                }
-                if (!value) {
-                    this.clear(triggerChange);
-                } else {
-                    data = this.data();
-                    this.opts.element.val(!value ? "" : this.id(value));
-                    this.updateSelection(value);
-                    if (triggerChange) {
-                        this.triggerChange({added: value, removed:data});
-                    }
-                }
-            }
-        }
-    });
-
-    MultiSelect2 = clazz(AbstractSelect2, {
-
-        // multi
-        createContainer: function () {
-            var container = $(document.createElement("div")).attr({
-                "class": "select2-container select2-container-multi"
-            }).html([
-                "<ul class='select2-choices'>",
-                "  <li class='select2-search-field'>",
-                "    <label for='' class='select2-offscreen'></label>",
-                "    <input type='text' autocomplete='off' autocorrect='off' autocapitalize='off' spellcheck='false' class='select2-input'>",
-                "  </li>",
-                "</ul>",
-                "<div class='select2-drop select2-drop-multi select2-display-none'>",
-                "   <ul class='select2-results'>",
-                "   </ul>",
-                "</div>"].join(""));
-            return container;
-        },
-
-        // multi
-        prepareOpts: function () {
-            var opts = this.parent.prepareOpts.apply(this, arguments),
-                self=this;
-
-            // TODO validate placeholder is a string if specified
-            if (opts.element.get(0).tagName.toLowerCase() === "select") {
-                // install the selection initializer
-                opts.initSelection = function (element, callback) {
-
-                    var data = [];
-
-                    element.find("option").filter(function() { return this.selected && !this.disabled }).each2(function (i, elm) {
-                        data.push(self.optionToData(elm));
-                    });
-                    callback(data);
-                };
-            } else if ("data" in opts) {
-                // install default initSelection when applied to hidden input and data is local
-                opts.initSelection = opts.initSelection || function (element, callback) {
-                    var ids = splitVal(element.val(), opts.separator, opts.transformVal);
-                    //search in data by array of ids, storing matching items in a list
-                    var matches = [];
-                    opts.query({
-                        matcher: function(term, text, el){
-                            var is_match = $.grep(ids, function(id) {
-                                return equal(id, opts.id(el));
-                            }).length;
-                            if (is_match) {
-                                matches.push(el);
-                            }
-                            return is_match;
-                        },
-                        callback: !$.isFunction(callback) ? $.noop : function() {
-                            // reorder matches based on the order they appear in the ids array because right now
-                            // they are in the order in which they appear in data array
-                            var ordered = [];
-                            for (var i = 0; i < ids.length; i++) {
-                                var id = ids[i];
-                                for (var j = 0; j < matches.length; j++) {
-                                    var match = matches[j];
-                                    if (equal(id, opts.id(match))) {
-                                        ordered.push(match);
-                                        matches.splice(j, 1);
-                                        break;
-                                    }
-                                }
-                            }
-                            callback(ordered);
-                        }
-                    });
-                };
-            }
-
-            return opts;
-        },
-
-        // multi
-        selectChoice: function (choice) {
-
-            var selected = this.container.find(".select2-search-choice-focus");
-            if (selected.length && choice && choice[0] == selected[0]) {
-
-            } else {
-                if (selected.length) {
-                    this.opts.element.trigger("choice-deselected", selected);
-                }
-                selected.removeClass("select2-search-choice-focus");
-                if (choice && choice.length) {
-                    this.close();
-                    choice.addClass("select2-search-choice-focus");
-                    this.opts.element.trigger("choice-selected", choice);
-                }
-            }
-        },
-
-        // multi
-        destroy: function() {
-            $("label[for='" + this.search.attr('id') + "']")
-                .attr('for', this.opts.element.attr("id"));
-            this.parent.destroy.apply(this, arguments);
-
-            cleanupJQueryElements.call(this,
-                "searchContainer",
-                "selection"
-            );
-        },
-
-        // multi
-        initContainer: function () {
-
-            var selector = ".select2-choices", selection;
-
-            this.searchContainer = this.container.find(".select2-search-field");
-            this.selection = selection = this.container.find(selector);
-
-            var _this = this;
-            this.selection.on("click", ".select2-container:not(.select2-container-disabled) .select2-search-choice:not(.select2-locked)", function (e) {
-                _this.search[0].focus();
-                _this.selectChoice($(this));
-            });
-
-            // rewrite labels from original element to focusser
-            this.search.attr("id", "s2id_autogen"+nextUid());
-
-            this.search.prev()
-                .text($("label[for='" + this.opts.element.attr("id") + "']").text())
-                .attr('for', this.search.attr('id'));
-            this.opts.element.on('focus.select2', this.bind(function () { this.focus(); }));
-
-            this.search.on("input paste", this.bind(function() {
-                if (this.search.attr('placeholder') && this.search.val().length == 0) return;
-                if (!this.isInterfaceEnabled()) return;
-                if (!this.opened()) {
-                    this.open();
-                }
-            }));
-
-            this.search.attr("tabindex", this.elementTabIndex);
-
-            this.keydowns = 0;
-            this.search.on("keydown", this.bind(function (e) {
-                if (!this.isInterfaceEnabled()) return;
-
-                ++this.keydowns;
-                var selected = selection.find(".select2-search-choice-focus");
-                var prev = selected.prev(".select2-search-choice:not(.select2-locked)");
-                var next = selected.next(".select2-search-choice:not(.select2-locked)");
-                var pos = getCursorInfo(this.search);
-
-                if (selected.length &&
-                    (e.which == KEY.LEFT || e.which == KEY.RIGHT || e.which == KEY.BACKSPACE || e.which == KEY.DELETE || e.which == KEY.ENTER)) {
-                    var selectedChoice = selected;
-                    if (e.which == KEY.LEFT && prev.length) {
-                        selectedChoice = prev;
-                    }
-                    else if (e.which == KEY.RIGHT) {
-                        selectedChoice = next.length ? next : null;
-                    }
-                    else if (e.which === KEY.BACKSPACE) {
-                        if (this.unselect(selected.first())) {
-                            this.search.width(10);
-                            selectedChoice = prev.length ? prev : next;
-                        }
-                    } else if (e.which == KEY.DELETE) {
-                        if (this.unselect(selected.first())) {
-                            this.search.width(10);
-                            selectedChoice = next.length ? next : null;
-                        }
-                    } else if (e.which == KEY.ENTER) {
-                        selectedChoice = null;
-                    }
-
-                    this.selectChoice(selectedChoice);
-                    killEvent(e);
-                    if (!selectedChoice || !selectedChoice.length) {
-                        this.open();
-                    }
-                    return;
-                } else if (((e.which === KEY.BACKSPACE && this.keydowns == 1)
-                    || e.which == KEY.LEFT) && (pos.offset == 0 && !pos.length)) {
-
-                    this.selectChoice(selection.find(".select2-search-choice:not(.select2-locked)").last());
-                    killEvent(e);
-                    return;
-                } else {
-                    this.selectChoice(null);
-                }
-
-                if (this.opened()) {
-                    switch (e.which) {
-                    case KEY.UP:
-                    case KEY.DOWN:
-                        this.moveHighlight((e.which === KEY.UP) ? -1 : 1);
-                        killEvent(e);
-                        return;
-                    case KEY.ENTER:
-                        this.selectHighlighted();
-                        killEvent(e);
-                        return;
-                    case KEY.TAB:
-                        this.selectHighlighted({noFocus:true});
-                        this.close();
-                        return;
-                    case KEY.ESC:
-                        this.cancel(e);
-                        killEvent(e);
-                        return;
-                    }
-                }
-
-                if (e.which === KEY.TAB || KEY.isControl(e) || KEY.isFunctionKey(e)
-                 || e.which === KEY.BACKSPACE || e.which === KEY.ESC) {
-                    return;
-                }
-
-                if (e.which === KEY.ENTER) {
-                    if (this.opts.openOnEnter === false) {
-                        return;
-                    } else if (e.altKey || e.ctrlKey || e.shiftKey || e.metaKey) {
-                        return;
-                    }
-                }
-
-                this.open();
-
-                if (e.which === KEY.PAGE_UP || e.which === KEY.PAGE_DOWN) {
-                    // prevent the page from scrolling
-                    killEvent(e);
-                }
-
-                if (e.which === KEY.ENTER) {
-                    // prevent form from being submitted
-                    killEvent(e);
-                }
-
-            }));
-
-            this.search.on("keyup", this.bind(function (e) {
-                this.keydowns = 0;
-                this.resizeSearch();
-            })
-            );
-
-            this.search.on("blur", this.bind(function(e) {
-                this.container.removeClass("select2-container-active");
-                this.search.removeClass("select2-focused");
-                this.selectChoice(null);
-                if (!this.opened()) this.clearSearch();
-                e.stopImmediatePropagation();
-                this.opts.element.trigger($.Event("select2-blur"));
-            }));
-
-            this.container.on("click", selector, this.bind(function (e) {
-                if (!this.isInterfaceEnabled()) return;
-                if ($(e.target).closest(".select2-search-choice").length > 0) {
-                    // clicked inside a select2 search choice, do not open
-                    return;
-                }
-                this.selectChoice(null);
-                this.clearPlaceholder();
-                if (!this.container.hasClass("select2-container-active")) {
-                    this.opts.element.trigger($.Event("select2-focus"));
-                }
-                this.open();
-                this.focusSearch();
-                e.preventDefault();
-            }));
-
-            this.container.on("focus", selector, this.bind(function () {
-                if (!this.isInterfaceEnabled()) return;
-                if (!this.container.hasClass("select2-container-active")) {
-                    this.opts.element.trigger($.Event("select2-focus"));
-                }
-                this.container.addClass("select2-container-active");
-                this.dropdown.addClass("select2-drop-active");
-                this.clearPlaceholder();
-            }));
-
-            this.initContainerWidth();
-            this.opts.element.hide();
-
-            // set the placeholder if necessary
-            this.clearSearch();
-        },
-
-        // multi
-        enableInterface: function() {
-            if (this.parent.enableInterface.apply(this, arguments)) {
-                this.search.prop("disabled", !this.isInterfaceEnabled());
-            }
-        },
-
-        // multi
-        initSelection: function () {
-            var data;
-            if (this.opts.element.val() === "" && this.opts.element.text() === "") {
-                this.updateSelection([]);
-                this.close();
-                // set the placeholder if necessary
-                this.clearSearch();
-            }
-            if (this.select || this.opts.element.val() !== "") {
-                var self = this;
-                this.opts.initSelection.call(null, this.opts.element, function(data){
-                    if (data !== undefined && data !== null) {
-                        self.updateSelection(data);
-                        self.close();
-                        // set the placeholder if necessary
-                        self.clearSearch();
-                    }
-                });
-            }
-        },
-
-        // multi
-        clearSearch: function () {
-            var placeholder = this.getPlaceholder(),
-                maxWidth = this.getMaxSearchWidth();
-
-            if (placeholder !== undefined  && this.getVal().length === 0 && this.search.hasClass("select2-focused") === false) {
-                this.search.val(placeholder).addClass("select2-default");
-                // stretch the search box to full width of the container so as much of the placeholder is visible as possible
-                // we could call this.resizeSearch(), but we do not because that requires a sizer and we do not want to create one so early because of a firefox bug, see #944
-                this.search.width(maxWidth > 0 ? maxWidth : this.container.css("width"));
-            } else {
-                this.search.val("").width(10);
-            }
-        },
-
-        // multi
-        clearPlaceholder: function () {
-            if (this.search.hasClass("select2-default")) {
-                this.search.val("").removeClass("select2-default");
-            }
-        },
-
-        // multi
-        opening: function () {
-            this.clearPlaceholder(); // should be done before super so placeholder is not used to search
-            this.resizeSearch();
-
-            this.parent.opening.apply(this, arguments);
-
-            this.focusSearch();
-
-            this.prefillNextSearchTerm();
-            this.updateResults(true);
-
-            if (this.opts.shouldFocusInput(this)) {
-                this.search.focus();
-            }
-            this.opts.element.trigger($.Event("select2-open"));
-        },
-
-        // multi
-        close: function () {
-            if (!this.opened()) return;
-            this.parent.close.apply(this, arguments);
-        },
-
-        // multi
-        focus: function () {
-            this.close();
-            this.search.focus();
-        },
-
-        // multi
-        isFocused: function () {
-            return this.search.hasClass("select2-focused");
-        },
-
-        // multi
-        updateSelection: function (data) {
-            var ids = {}, filtered = [], self = this;
-
-            // filter out duplicates
-            $(data).each(function () {
-                if (!(self.id(this) in ids)) {
-                    ids[self.id(this)] = 0;
-                    filtered.push(this);
-                }
-            });
-
-            this.selection.find(".select2-search-choice").remove();
-            this.addSelectedChoice(filtered);
-            self.postprocessResults();
-        },
-
-        // multi
-        tokenize: function() {
-            var input = this.search.val();
-            input = this.opts.tokenizer.call(this, input, this.data(), this.bind(this.onSelect), this.opts);
-            if (input != null && input != undefined) {
-                this.search.val(input);
-                if (input.length > 0) {
-                    this.open();
-                }
-            }
-
-        },
-
-        // multi
-        onSelect: function (data, options) {
-
-            if (!this.triggerSelect(data) || data.text === "") { return; }
-
-            this.addSelectedChoice(data);
-
-            this.opts.element.trigger({ type: "selected", val: this.id(data), choice: data });
-
-            // keep track of the search's value before it gets cleared
-            this.lastSearchTerm = this.search.val();
-
-            this.clearSearch();
-            this.updateResults();
-
-            if (this.select || !this.opts.closeOnSelect) this.postprocessResults(data, false, this.opts.closeOnSelect===true);
-
-            if (this.opts.closeOnSelect) {
-                this.close();
-                this.search.width(10);
-            } else {
-                if (this.countSelectableResults()>0) {
-                    this.search.width(10);
-                    this.resizeSearch();
-                    if (this.getMaximumSelectionSize() > 0 && this.val().length >= this.getMaximumSelectionSize()) {
-                        // if we reached max selection size repaint the results so choices
-                        // are replaced with the max selection reached message
-                        this.updateResults(true);
-                    } else {
-                        // initializes search's value with nextSearchTerm and update search result
-                        if (this.prefillNextSearchTerm()) {
-                            this.updateResults();
-                        }
-                    }
-                    this.positionDropdown();
-                } else {
-                    // if nothing left to select close
-                    this.close();
-                    this.search.width(10);
-                }
-            }
-
-            // since its not possible to select an element that has already been
-            // added we do not need to check if this is a new element before firing change
-            this.triggerChange({ added: data });
-
-            if (!options || !options.noFocus)
-                this.focusSearch();
-        },
-
-        // multi
-        cancel: function () {
-            this.close();
-            this.focusSearch();
-        },
-
-        addSelectedChoice: function (data) {
-            var val = this.getVal(), self = this;
-            $(data).each(function () {
-                val.push(self.createChoice(this));
-            });
-            this.setVal(val);
-        },
-
-        createChoice: function (data) {
-            var enableChoice = !data.locked,
-                enabledItem = $(
-                    "<li class='select2-search-choice'>" +
-                    "    <div></div>" +
-                    "    <a href='#' class='select2-search-choice-close' tabindex='-1'></a>" +
-                    "</li>"),
-                disabledItem = $(
-                    "<li class='select2-search-choice select2-locked'>" +
-                    "<div></div>" +
-                    "</li>");
-            var choice = enableChoice ? enabledItem : disabledItem,
-                id = this.id(data),
-                formatted,
-                cssClass;
-
-            formatted=this.opts.formatSelection(data, choice.find("div"), this.opts.escapeMarkup);
-            if (formatted != undefined) {
-                choice.find("div").replaceWith($("<div></div>").html(formatted));
-            }
-            cssClass=this.opts.formatSelectionCssClass(data, choice.find("div"));
-            if (cssClass != undefined) {
-                choice.addClass(cssClass);
-            }
-
-            if(enableChoice){
-              choice.find(".select2-search-choice-close")
-                  .on("mousedown", killEvent)
-                  .on("click dblclick", this.bind(function (e) {
-                  if (!this.isInterfaceEnabled()) return;
-
-                  this.unselect($(e.target));
-                  this.selection.find(".select2-search-choice-focus").removeClass("select2-search-choice-focus");
-                  killEvent(e);
-                  this.close();
-                  this.focusSearch();
-              })).on("focus", this.bind(function () {
-                  if (!this.isInterfaceEnabled()) return;
-                  this.container.addClass("select2-container-active");
-                  this.dropdown.addClass("select2-drop-active");
-              }));
-            }
-
-            choice.data("select2-data", data);
-            choice.insertBefore(this.searchContainer);
-
-            return id;
-        },
-
-        // multi
-        unselect: function (selected) {
-            var val = this.getVal(),
-                data,
-                index;
-            selected = selected.closest(".select2-search-choice");
-
-            if (selected.length === 0) {
-                throw "Invalid argument: " + selected + ". Must be .select2-search-choice";
-            }
-
-            data = selected.data("select2-data");
-
-            if (!data) {
-                // prevent a race condition when the 'x' is clicked really fast repeatedly the event can be queued
-                // and invoked on an element already removed
-                return;
-            }
-
-            var evt = $.Event("select2-removing");
-            evt.val = this.id(data);
-            evt.choice = data;
-            this.opts.element.trigger(evt);
-
-            if (evt.isDefaultPrevented()) {
-                return false;
-            }
-
-            while((index = indexOf(this.id(data), val)) >= 0) {
-                val.splice(index, 1);
-                this.setVal(val);
-                if (this.select) this.postprocessResults();
-            }
-
-            selected.remove();
-
-            this.opts.element.trigger({ type: "select2-removed", val: this.id(data), choice: data });
-            this.triggerChange({ removed: data });
-
-            return true;
-        },
-
-        // multi
-        postprocessResults: function (data, initial, noHighlightUpdate) {
-            var val = this.getVal(),
-                choices = this.results.find(".select2-result"),
-                compound = this.results.find(".select2-result-with-children"),
-                self = this;
-
-            choices.each2(function (i, choice) {
-                var id = self.id(choice.data("select2-data"));
-                if (indexOf(id, val) >= 0) {
-                    choice.addClass("select2-selected");
-                    // mark all children of the selected parent as selected
-                    choice.find(".select2-result-selectable").addClass("select2-selected");
-                }
-            });
-
-            compound.each2(function(i, choice) {
-                // hide an optgroup if it doesn't have any selectable children
-                if (!choice.is('.select2-result-selectable')
-                    && choice.find(".select2-result-selectable:not(.select2-selected)").length === 0) {
-                    choice.addClass("select2-selected");
-                }
-            });
-
-            if (this.highlight() == -1 && noHighlightUpdate !== false && this.opts.closeOnSelect === true){
-                self.highlight(0);
-            }
-
-            //If all results are chosen render formatNoMatches
-            if(!this.opts.createSearchChoice && !choices.filter('.select2-result:not(.select2-selected)').length > 0){
-                if(!data || data && !data.more && this.results.find(".select2-no-results").length === 0) {
-                    if (checkFormatter(self.opts.formatNoMatches, "formatNoMatches")) {
-                        this.results.append("<li class='select2-no-results'>" + evaluate(self.opts.formatNoMatches, self.opts.element, self.search.val()) + "</li>");
-                    }
-                }
-            }
-
-        },
-
-        // multi
-        getMaxSearchWidth: function() {
-            return this.selection.width() - getSideBorderPadding(this.search);
-        },
-
-        // multi
-        resizeSearch: function () {
-            var minimumWidth, left, maxWidth, containerLeft, searchWidth,
-                sideBorderPadding = getSideBorderPadding(this.search);
-
-            minimumWidth = measureTextWidth(this.search) + 10;
-
-            left = this.search.offset().left;
-
-            maxWidth = this.selection.width();
-            containerLeft = this.selection.offset().left;
-
-            searchWidth = maxWidth - (left - containerLeft) - sideBorderPadding;
-
-            if (searchWidth < minimumWidth) {
-                searchWidth = maxWidth - sideBorderPadding;
-            }
-
-            if (searchWidth < 40) {
-                searchWidth = maxWidth - sideBorderPadding;
-            }
-
-            if (searchWidth <= 0) {
-              searchWidth = minimumWidth;
-            }
-
-            this.search.width(Math.floor(searchWidth));
-        },
-
-        // multi
-        getVal: function () {
-            var val;
-            if (this.select) {
-                val = this.select.val();
-                return val === null ? [] : val;
-            } else {
-                val = this.opts.element.val();
-                return splitVal(val, this.opts.separator, this.opts.transformVal);
-            }
-        },
-
-        // multi
-        setVal: function (val) {
-            if (this.select) {
-                this.select.val(val);
-            } else {
-                var unique = [], valMap = {};
-                // filter out duplicates
-                $(val).each(function () {
-                    if (!(this in valMap)) {
-                        unique.push(this);
-                        valMap[this] = 0;
-                    }
-                });
-                this.opts.element.val(unique.length === 0 ? "" : unique.join(this.opts.separator));
-            }
-        },
-
-        // multi
-        buildChangeDetails: function (old, current) {
-            var current = current.slice(0),
-                old = old.slice(0);
-
-            // remove intersection from each array
-            for (var i = 0; i < current.length; i++) {
-                for (var j = 0; j < old.length; j++) {
-                    if (equal(this.opts.id(current[i]), this.opts.id(old[j]))) {
-                        current.splice(i, 1);
-                        i--;
-                        old.splice(j, 1);
-                        break;
-                    }
-                }
-            }
-
-            return {added: current, removed: old};
-        },
-
-
-        // multi
-        val: function (val, triggerChange) {
-            var oldData, self=this;
-
-            if (arguments.length === 0) {
-                return this.getVal();
-            }
-
-            oldData=this.data();
-            if (!oldData.length) oldData=[];
-
-            // val is an id. !val is true for [undefined,null,'',0] - 0 is legal
-            if (!val && val !== 0) {
-                this.opts.element.val("");
-                this.updateSelection([]);
-                this.clearSearch();
-                if (triggerChange) {
-                    this.triggerChange({added: this.data(), removed: oldData});
-                }
-                return;
-            }
-
-            // val is a list of ids
-            this.setVal(val);
-
-            if (this.select) {
-                this.opts.initSelection(this.select, this.bind(this.updateSelection));
-                if (triggerChange) {
-                    this.triggerChange(this.buildChangeDetails(oldData, this.data()));
-                }
-            } else {
-                if (this.opts.initSelection === undefined) {
-                    throw new Error("val() cannot be called if initSelection() is not defined");
-                }
-
-                this.opts.initSelection(this.opts.element, function(data){
-                    var ids=$.map(data, self.id);
-                    self.setVal(ids);
-                    self.updateSelection(data);
-                    self.clearSearch();
-                    if (triggerChange) {
-                        self.triggerChange(self.buildChangeDetails(oldData, self.data()));
-                    }
-                });
-            }
-            this.clearSearch();
-        },
-
-        // multi
-        onSortStart: function() {
-            if (this.select) {
-                throw new Error("Sorting of elements is not supported when attached to <select>. Attach to <input type='hidden'/> instead.");
-            }
-
-            // collapse search field into 0 width so its container can be collapsed as well
-            this.search.width(0);
-            // hide the container
-            this.searchContainer.hide();
-        },
-
-        // multi
-        onSortEnd:function() {
-
-            var val=[], self=this;
-
-            // show search and move it to the end of the list
-            this.searchContainer.show();
-            // make sure the search container is the last item in the list
-            this.searchContainer.appendTo(this.searchContainer.parent());
-            // since we collapsed the width in dragStarted, we resize it here
-            this.resizeSearch();
-
-            // update selection
-            this.selection.find(".select2-search-choice").each(function() {
-                val.push(self.opts.id($(this).data("select2-data")));
-            });
-            this.setVal(val);
-            this.triggerChange();
-        },
-
-        // multi
-        data: function(values, triggerChange) {
-            var self=this, ids, old;
-            if (arguments.length === 0) {
-                 return this.selection
-                     .children(".select2-search-choice")
-                     .map(function() { return $(this).data("select2-data"); })
-                     .get();
-            } else {
-                old = this.data();
-                if (!values) { values = []; }
-                ids = $.map(values, function(e) { return self.opts.id(e); });
-                this.setVal(ids);
-                this.updateSelection(values);
-                this.clearSearch();
-                if (triggerChange) {
-                    this.triggerChange(this.buildChangeDetails(old, this.data()));
-                }
-            }
-        }
-    });
-
-    $.fn.select2 = function () {
-
-        var args = Array.prototype.slice.call(arguments, 0),
-            opts,
-            select2,
-            method, value, multiple,
-            allowedMethods = ["val", "destroy", "opened", "open", "close", "focus", "isFocused", "container", "dropdown", "onSortStart", "onSortEnd", "enable", "disable", "readonly", "positionDropdown", "data", "search"],
-            valueMethods = ["opened", "isFocused", "container", "dropdown"],
-            propertyMethods = ["val", "data"],
-            methodsMap = { search: "externalSearch" };
-
-        this.each(function () {
-            if (args.length === 0 || typeof(args[0]) === "object") {
-                opts = args.length === 0 ? {} : $.extend({}, args[0]);
-                opts.element = $(this);
-
-                if (opts.element.get(0).tagName.toLowerCase() === "select") {
-                    multiple = opts.element.prop("multiple");
-                } else {
-                    multiple = opts.multiple || false;
-                    if ("tags" in opts) {opts.multiple = multiple = true;}
-                }
-
-                select2 = multiple ? new window.Select2["class"].multi() : new window.Select2["class"].single();
-                select2.init(opts);
-            } else if (typeof(args[0]) === "string") {
-
-                if (indexOf(args[0], allowedMethods) < 0) {
-                    throw "Unknown method: " + args[0];
-                }
-
-                value = undefined;
-                select2 = $(this).data("select2");
-                if (select2 === undefined) return;
-
-                method=args[0];
-
-                if (method === "container") {
-                    value = select2.container;
-                } else if (method === "dropdown") {
-                    value = select2.dropdown;
-                } else {
-                    if (methodsMap[method]) method = methodsMap[method];
-
-                    value = select2[method].apply(select2, args.slice(1));
-                }
-                if (indexOf(args[0], valueMethods) >= 0
-                    || (indexOf(args[0], propertyMethods) >= 0 && args.length == 1)) {
-                    return false; // abort the iteration, ready to return first matched value
-                }
-            } else {
-                throw "Invalid arguments to select2 plugin: " + args;
-            }
-        });
-        return (value === undefined) ? this : value;
-    };
-
-    // plugin defaults, accessible to users
-    $.fn.select2.defaults = {
-        debug: false,
-        width: "copy",
-        loadMorePadding: 0,
-        closeOnSelect: true,
-        openOnEnter: true,
-        containerCss: {},
-        dropdownCss: {},
-        containerCssClass: "",
-        dropdownCssClass: "",
-        formatResult: function(result, container, query, escapeMarkup) {
-            var markup=[];
-            markMatch(this.text(result), query.term, markup, escapeMarkup);
-            return markup.join("");
-        },
-        transformVal: function(val) {
-            return $.trim(val);
-        },
-        formatSelection: function (data, container, escapeMarkup) {
-            return data ? escapeMarkup(this.text(data)) : undefined;
-        },
-        sortResults: function (results, container, query) {
-            return results;
-        },
-        formatResultCssClass: function(data) {return data.css;},
-        formatSelectionCssClass: function(data, container) {return undefined;},
-        minimumResultsForSearch: 0,
-        minimumInputLength: 0,
-        maximumInputLength: null,
-        maximumSelectionSize: 0,
-        id: function (e) { return e == undefined ? null : e.id; },
-        text: function (e) {
-          if (e && this.data && this.data.text) {
-            if ($.isFunction(this.data.text)) {
-              return this.data.text(e);
-            } else {
-              return e[this.data.text];
-            }
-          } else {
-            return e.text;
-          }
-        },
-        matcher: function(term, text) {
-            return stripDiacritics(''+text).toUpperCase().indexOf(stripDiacritics(''+term).toUpperCase()) >= 0;
-        },
-        separator: ",",
-        tokenSeparators: [],
-        tokenizer: defaultTokenizer,
-        escapeMarkup: defaultEscapeMarkup,
-        blurOnChange: false,
-        selectOnBlur: false,
-        adaptContainerCssClass: function(c) { return c; },
-        adaptDropdownCssClass: function(c) { return null; },
-        nextSearchTerm: function(selectedObject, currentSearchTerm) { return undefined; },
-        searchInputPlaceholder: '',
-        createSearchChoicePosition: 'top',
-        shouldFocusInput: function (instance) {
-            // Attempt to detect touch devices
-            var supportsTouchEvents = (('ontouchstart' in window) ||
-                                       (navigator.msMaxTouchPoints > 0));
-
-            // Only devices which support touch events should be special cased
-            if (!supportsTouchEvents) {
-                return true;
-            }
-
-            // Never focus the input if search is disabled
-            if (instance.opts.minimumResultsForSearch < 0) {
-                return false;
-            }
-
-            return true;
-        }
-    };
-
-    $.fn.select2.locales = [];
-
-    $.fn.select2.locales['en'] = {
-         formatMatches: function (matches) { if (matches === 1) { return "One result is available, press enter to select it."; } return matches + " results are available, use up and down arrow keys to navigate."; },
-         formatNoMatches: function () { return "No matches found"; },
-         formatAjaxError: function (jqXHR, textStatus, errorThrown) { return "Loading failed"; },
-         formatInputTooShort: function (input, min) { var n = min - input.length; return "Please enter " + n + " or more character" + (n == 1 ? "" : "s"); },
-         formatInputTooLong: function (input, max) { var n = input.length - max; return "Please delete " + n + " character" + (n == 1 ? "" : "s"); },
-         formatSelectionTooBig: function (limit) { return "You can only select " + limit + " item" + (limit == 1 ? "" : "s"); },
-         formatLoadMore: function (pageNumber) { return "Loading more results…"; },
-         formatSearching: function () { return "Searching…"; }
-    };
-
-    $.extend($.fn.select2.defaults, $.fn.select2.locales['en']);
-
-    $.fn.select2.ajaxDefaults = {
-        transport: $.ajax,
-        params: {
-            type: "GET",
-            cache: false,
-            dataType: "json"
-        }
-    };
-
-    // exports
-    window.Select2 = {
-        query: {
-            ajax: ajax,
-            local: local,
-            tags: tags
-        }, util: {
-            debounce: debounce,
-            markMatch: markMatch,
-            escapeMarkup: defaultEscapeMarkup,
-            stripDiacritics: stripDiacritics
-        }, "class": {
-            "abstract": AbstractSelect2,
-            "single": SingleSelect2,
-            "multi": MultiSelect2
-        }
-    };
-
-}(jQuery));
diff --git a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2.min.js b/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2.min.js
deleted file mode 100644
index ac1d7885c..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2.min.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2014 Igor Vaynberg
-
-Version: 3.5.4 Timestamp: Sun Aug 30 13:30:32 EDT 2015
-
-This software is licensed under the Apache License, Version 2.0 (the "Apache License") or the GNU
-General Public License version 2 (the "GPL License"). You may choose either license to govern your
-use of this software only upon the condition that you accept all of the terms of either the Apache
-License or the GPL License.
-
-You may obtain a copy of the Apache License and the GPL License at:
-
-http://www.apache.org/licenses/LICENSE-2.0
-http://www.gnu.org/licenses/gpl-2.0.html
-
-Unless required by applicable law or agreed to in writing, software distributed under the Apache License
-or the GPL License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-either express or implied. See the Apache License and the GPL License for the specific language governing
-permissions and limitations under the Apache License and the GPL License.
-*/
-!function(a){"undefined"==typeof a.fn.each2&&a.extend(a.fn,{each2:function(b){for(var c=a([0]),d=-1,e=this.length;++d<e&&(c.context=c[0]=this[d])&&b.call(c[0],d,c)!==!1;);return this}})}(jQuery),function(a,b){"use strict";function n(b){var c=a(document.createTextNode(""));b.before(c),c.before(b),c.remove()}function o(a){function b(a){return m[a]||a}return a.replace(/[^\u0000-\u007E]/g,b)}function p(a,b){for(var c=0,d=b.length;d>c;c+=1)if(r(a,b[c]))return c;return-1}function q(){var b=a(l);b.appendTo(document.body);var c={width:b.width()-b[0].clientWidth,height:b.height()-b[0].clientHeight};return b.remove(),c}function r(a,c){return a===c?!0:a===b||c===b?!1:null===a||null===c?!1:a.constructor===String?a+""==c+"":c.constructor===String?c+""==a+"":!1}function s(a,b,c){var d,e,f;if(null===a||a.length<1)return[];for(d=a.split(b),e=0,f=d.length;f>e;e+=1)d[e]=c(d[e]);return d}function t(a){return a.outerWidth(!1)-a.width()}function u(c){var d="keyup-change-value";c.on("keydown",function(){a.data(c,d)===b&&a.data(c,d,c.val())}),c.on("keyup",function(){var e=a.data(c,d);e!==b&&c.val()!==e&&(a.removeData(c,d),c.trigger("keyup-change"))})}function v(c){c.on("mousemove",function(c){var d=h;(d===b||d.x!==c.pageX||d.y!==c.pageY)&&a(c.target).trigger("mousemove-filtered",c)})}function w(a,c,d){d=d||b;var e;return function(){var b=arguments;window.clearTimeout(e),e=window.setTimeout(function(){c.apply(d,b)},a)}}function x(a,b){var c=w(a,function(a){b.trigger("scroll-debounced",a)});b.on("scroll",function(a){p(a.target,b.get())>=0&&c(a)})}function y(a){a[0]!==document.activeElement&&window.setTimeout(function(){var d,b=a[0],c=a.val().length;a.focus();var e=b.offsetWidth>0||b.offsetHeight>0;e&&b===document.activeElement&&(b.setSelectionRange?b.setSelectionRange(c,c):b.createTextRange&&(d=b.createTextRange(),d.collapse(!1),d.select()))},0)}function z(b){b=a(b)[0];var c=0,d=0;if("selectionStart"in b)c=b.selectionStart,d=b.selectionEnd-c;else if("selection"in document){b.focus();var e=document.selection.createRange();d=document.selection.createRange().text.length,e.moveStart("character",-b.value.length),c=e.text.length-d}return{offset:c,length:d}}function A(a){a.preventDefault(),a.stopPropagation()}function B(a){a.preventDefault(),a.stopImmediatePropagation()}function C(b){if(!g){var c=b[0].currentStyle||window.getComputedStyle(b[0],null);g=a(document.createElement("div")).css({position:"absolute",left:"-10000px",top:"-10000px",display:"none",fontSize:c.fontSize,fontFamily:c.fontFamily,fontStyle:c.fontStyle,fontWeight:c.fontWeight,letterSpacing:c.letterSpacing,textTransform:c.textTransform,whiteSpace:"nowrap"}),g.attr("class","select2-sizer"),a(document.body).append(g)}return g.text(b.val()),g.width()}function D(b,c,d){var e,g,f=[];e=a.trim(b.attr("class")),e&&(e=""+e,a(e.split(/\s+/)).each2(function(){0===this.indexOf("select2-")&&f.push(this)})),e=a.trim(c.attr("class")),e&&(e=""+e,a(e.split(/\s+/)).each2(function(){0!==this.indexOf("select2-")&&(g=d(this),g&&f.push(g))})),b.attr("class",f.join(" "))}function E(a,b,c,d){var e=o(a.toUpperCase()).indexOf(o(b.toUpperCase())),f=b.length;return 0>e?void c.push(d(a)):(c.push(d(a.substring(0,e))),c.push("<span class='select2-match'>"),c.push(d(a.substring(e,e+f))),c.push("</span>"),void c.push(d(a.substring(e+f,a.length))))}function F(a){var b={"\\":"&#92;","&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#39;","/":"&#47;"};return String(a).replace(/[&<>"'\/\\]/g,function(a){return b[a]})}function G(c){var d,e=null,f=c.quietMillis||100,g=c.url,h=this;return function(i){window.clearTimeout(d),d=window.setTimeout(function(){var d=c.data,f=g,j=c.transport||a.fn.select2.ajaxDefaults.transport,k={type:c.type||"GET",cache:c.cache||!1,jsonpCallback:c.jsonpCallback||b,dataType:c.dataType||"json"},l=a.extend({},a.fn.select2.ajaxDefaults.params,k);d=d?d.call(h,i.term,i.page,i.context):null,f="function"==typeof f?f.call(h,i.term,i.page,i.context):f,e&&"function"==typeof e.abort&&e.abort(),c.params&&(a.isFunction(c.params)?a.extend(l,c.params.call(h)):a.extend(l,c.params)),a.extend(l,{url:f,dataType:c.dataType,data:d,success:function(a){var b=c.results(a,i.page,i);i.callback(b)},error:function(a,b,c){var d={hasError:!0,jqXHR:a,textStatus:b,errorThrown:c};i.callback(d)}}),e=j.call(h,l)},f)}}function H(b){var d,e,c=b,f=function(a){return""+a.text};a.isArray(c)&&(e=c,c={results:e}),a.isFunction(c)===!1&&(e=c,c=function(){return e});var g=c();return g.text&&(f=g.text,a.isFunction(f)||(d=g.text,f=function(a){return a[d]})),function(b){var g,d=b.term,e={results:[]};return""===d?void b.callback(c()):(g=function(c,e){var h,i;if(c=c[0],c.children){h={};for(i in c)c.hasOwnProperty(i)&&(h[i]=c[i]);h.children=[],a(c.children).each2(function(a,b){g(b,h.children)}),(h.children.length||b.matcher(d,f(h),c))&&e.push(h)}else b.matcher(d,f(c),c)&&e.push(c)},a(c().results).each2(function(a,b){g(b,e.results)}),void b.callback(e))}}function I(c){var d=a.isFunction(c);return function(e){var f=e.term,g={results:[]},h=d?c(e):c;a.isArray(h)&&(a(h).each(function(){var a=this.text!==b,c=a?this.text:this;(""===f||e.matcher(f,c))&&g.results.push(a?this:{id:this,text:this})}),e.callback(g))}}function J(b,c){if(a.isFunction(b))return!0;if(!b)return!1;if("string"==typeof b)return!0;throw new Error(c+" must be a string, function, or falsy value")}function K(b,c){if(a.isFunction(b)){var d=Array.prototype.slice.call(arguments,2);return b.apply(c,d)}return b}function L(b){var c=0;return a.each(b,function(a,b){b.children?c+=L(b.children):c++}),c}function M(a,c,d,e){var h,i,j,k,l,f=a,g=!1;if(!e.createSearchChoice||!e.tokenSeparators||e.tokenSeparators.length<1)return b;for(;;){for(i=-1,j=0,k=e.tokenSeparators.length;k>j&&(l=e.tokenSeparators[j],i=a.indexOf(l),!(i>=0));j++);if(0>i)break;if(h=a.substring(0,i),a=a.substring(i+l.length),h.length>0&&(h=e.createSearchChoice.call(this,h,c),h!==b&&null!==h&&e.id(h)!==b&&null!==e.id(h))){for(g=!1,j=0,k=c.length;k>j;j++)if(r(e.id(h),e.id(c[j]))){g=!0;break}g||d(h)}}return f!==a?a:void 0}function N(){var b=this;a.each(arguments,function(a,c){b[c].remove(),b[c]=null})}function O(b,c){var d=function(){};return d.prototype=new b,d.prototype.constructor=d,d.prototype.parent=b.prototype,d.prototype=a.extend(d.prototype,c),d}if(window.Select2===b){var c,d,e,f,g,i,j,h={x:0,y:0},k={TAB:9,ENTER:13,ESC:27,SPACE:32,LEFT:37,UP:38,RIGHT:39,DOWN:40,SHIFT:16,CTRL:17,ALT:18,PAGE_UP:33,PAGE_DOWN:34,HOME:36,END:35,BACKSPACE:8,DELETE:46,isArrow:function(a){switch(a=a.which?a.which:a){case k.LEFT:case k.RIGHT:case k.UP:case k.DOWN:return!0}return!1},isControl:function(a){var b=a.which;switch(b){case k.SHIFT:case k.CTRL:case k.ALT:return!0}return a.metaKey?!0:!1},isFunctionKey:function(a){return a=a.which?a.which:a,a>=112&&123>=a}},l="<div class='select2-measure-scrollbar'></div>",m={"\u24b6":"A","\uff21":"A","\xc0":"A","\xc1":"A","\xc2":"A","\u1ea6":"A","\u1ea4":"A","\u1eaa":"A","\u1ea8":"A","\xc3":"A","\u0100":"A","\u0102":"A","\u1eb0":"A","\u1eae":"A","\u1eb4":"A","\u1eb2":"A","\u0226":"A","\u01e0":"A","\xc4":"A","\u01de":"A","\u1ea2":"A","\xc5":"A","\u01fa":"A","\u01cd":"A","\u0200":"A","\u0202":"A","\u1ea0":"A","\u1eac":"A","\u1eb6":"A","\u1e00":"A","\u0104":"A","\u023a":"A","\u2c6f":"A","\ua732":"AA","\xc6":"AE","\u01fc":"AE","\u01e2":"AE","\ua734":"AO","\ua736":"AU","\ua738":"AV","\ua73a":"AV","\ua73c":"AY","\u24b7":"B","\uff22":"B","\u1e02":"B","\u1e04":"B","\u1e06":"B","\u0243":"B","\u0182":"B","\u0181":"B","\u24b8":"C","\uff23":"C","\u0106":"C","\u0108":"C","\u010a":"C","\u010c":"C","\xc7":"C","\u1e08":"C","\u0187":"C","\u023b":"C","\ua73e":"C","\u24b9":"D","\uff24":"D","\u1e0a":"D","\u010e":"D","\u1e0c":"D","\u1e10":"D","\u1e12":"D","\u1e0e":"D","\u0110":"D","\u018b":"D","\u018a":"D","\u0189":"D","\ua779":"D","\u01f1":"DZ","\u01c4":"DZ","\u01f2":"Dz","\u01c5":"Dz","\u24ba":"E","\uff25":"E","\xc8":"E","\xc9":"E","\xca":"E","\u1ec0":"E","\u1ebe":"E","\u1ec4":"E","\u1ec2":"E","\u1ebc":"E","\u0112":"E","\u1e14":"E","\u1e16":"E","\u0114":"E","\u0116":"E","\xcb":"E","\u1eba":"E","\u011a":"E","\u0204":"E","\u0206":"E","\u1eb8":"E","\u1ec6":"E","\u0228":"E","\u1e1c":"E","\u0118":"E","\u1e18":"E","\u1e1a":"E","\u0190":"E","\u018e":"E","\u24bb":"F","\uff26":"F","\u1e1e":"F","\u0191":"F","\ua77b":"F","\u24bc":"G","\uff27":"G","\u01f4":"G","\u011c":"G","\u1e20":"G","\u011e":"G","\u0120":"G","\u01e6":"G","\u0122":"G","\u01e4":"G","\u0193":"G","\ua7a0":"G","\ua77d":"G","\ua77e":"G","\u24bd":"H","\uff28":"H","\u0124":"H","\u1e22":"H","\u1e26":"H","\u021e":"H","\u1e24":"H","\u1e28":"H","\u1e2a":"H","\u0126":"H","\u2c67":"H","\u2c75":"H","\ua78d":"H","\u24be":"I","\uff29":"I","\xcc":"I","\xcd":"I","\xce":"I","\u0128":"I","\u012a":"I","\u012c":"I","\u0130":"I","\xcf":"I","\u1e2e":"I","\u1ec8":"I","\u01cf":"I","\u0208":"I","\u020a":"I","\u1eca":"I","\u012e":"I","\u1e2c":"I","\u0197":"I","\u24bf":"J","\uff2a":"J","\u0134":"J","\u0248":"J","\u24c0":"K","\uff2b":"K","\u1e30":"K","\u01e8":"K","\u1e32":"K","\u0136":"K","\u1e34":"K","\u0198":"K","\u2c69":"K","\ua740":"K","\ua742":"K","\ua744":"K","\ua7a2":"K","\u24c1":"L","\uff2c":"L","\u013f":"L","\u0139":"L","\u013d":"L","\u1e36":"L","\u1e38":"L","\u013b":"L","\u1e3c":"L","\u1e3a":"L","\u0141":"L","\u023d":"L","\u2c62":"L","\u2c60":"L","\ua748":"L","\ua746":"L","\ua780":"L","\u01c7":"LJ","\u01c8":"Lj","\u24c2":"M","\uff2d":"M","\u1e3e":"M","\u1e40":"M","\u1e42":"M","\u2c6e":"M","\u019c":"M","\u24c3":"N","\uff2e":"N","\u01f8":"N","\u0143":"N","\xd1":"N","\u1e44":"N","\u0147":"N","\u1e46":"N","\u0145":"N","\u1e4a":"N","\u1e48":"N","\u0220":"N","\u019d":"N","\ua790":"N","\ua7a4":"N","\u01ca":"NJ","\u01cb":"Nj","\u24c4":"O","\uff2f":"O","\xd2":"O","\xd3":"O","\xd4":"O","\u1ed2":"O","\u1ed0":"O","\u1ed6":"O","\u1ed4":"O","\xd5":"O","\u1e4c":"O","\u022c":"O","\u1e4e":"O","\u014c":"O","\u1e50":"O","\u1e52":"O","\u014e":"O","\u022e":"O","\u0230":"O","\xd6":"O","\u022a":"O","\u1ece":"O","\u0150":"O","\u01d1":"O","\u020c":"O","\u020e":"O","\u01a0":"O","\u1edc":"O","\u1eda":"O","\u1ee0":"O","\u1ede":"O","\u1ee2":"O","\u1ecc":"O","\u1ed8":"O","\u01ea":"O","\u01ec":"O","\xd8":"O","\u01fe":"O","\u0186":"O","\u019f":"O","\ua74a":"O","\ua74c":"O","\u01a2":"OI","\ua74e":"OO","\u0222":"OU","\u24c5":"P","\uff30":"P","\u1e54":"P","\u1e56":"P","\u01a4":"P","\u2c63":"P","\ua750":"P","\ua752":"P","\ua754":"P","\u24c6":"Q","\uff31":"Q","\ua756":"Q","\ua758":"Q","\u024a":"Q","\u24c7":"R","\uff32":"R","\u0154":"R","\u1e58":"R","\u0158":"R","\u0210":"R","\u0212":"R","\u1e5a":"R","\u1e5c":"R","\u0156":"R","\u1e5e":"R","\u024c":"R","\u2c64":"R","\ua75a":"R","\ua7a6":"R","\ua782":"R","\u24c8":"S","\uff33":"S","\u1e9e":"S","\u015a":"S","\u1e64":"S","\u015c":"S","\u1e60":"S","\u0160":"S","\u1e66":"S","\u1e62":"S","\u1e68":"S","\u0218":"S","\u015e":"S","\u2c7e":"S","\ua7a8":"S","\ua784":"S","\u24c9":"T","\uff34":"T","\u1e6a":"T","\u0164":"T","\u1e6c":"T","\u021a":"T","\u0162":"T","\u1e70":"T","\u1e6e":"T","\u0166":"T","\u01ac":"T","\u01ae":"T","\u023e":"T","\ua786":"T","\ua728":"TZ","\u24ca":"U","\uff35":"U","\xd9":"U","\xda":"U","\xdb":"U","\u0168":"U","\u1e78":"U","\u016a":"U","\u1e7a":"U","\u016c":"U","\xdc":"U","\u01db":"U","\u01d7":"U","\u01d5":"U","\u01d9":"U","\u1ee6":"U","\u016e":"U","\u0170":"U","\u01d3":"U","\u0214":"U","\u0216":"U","\u01af":"U","\u1eea":"U","\u1ee8":"U","\u1eee":"U","\u1eec":"U","\u1ef0":"U","\u1ee4":"U","\u1e72":"U","\u0172":"U","\u1e76":"U","\u1e74":"U","\u0244":"U","\u24cb":"V","\uff36":"V","\u1e7c":"V","\u1e7e":"V","\u01b2":"V","\ua75e":"V","\u0245":"V","\ua760":"VY","\u24cc":"W","\uff37":"W","\u1e80":"W","\u1e82":"W","\u0174":"W","\u1e86":"W","\u1e84":"W","\u1e88":"W","\u2c72":"W","\u24cd":"X","\uff38":"X","\u1e8a":"X","\u1e8c":"X","\u24ce":"Y","\uff39":"Y","\u1ef2":"Y","\xdd":"Y","\u0176":"Y","\u1ef8":"Y","\u0232":"Y","\u1e8e":"Y","\u0178":"Y","\u1ef6":"Y","\u1ef4":"Y","\u01b3":"Y","\u024e":"Y","\u1efe":"Y","\u24cf":"Z","\uff3a":"Z","\u0179":"Z","\u1e90":"Z","\u017b":"Z","\u017d":"Z","\u1e92":"Z","\u1e94":"Z","\u01b5":"Z","\u0224":"Z","\u2c7f":"Z","\u2c6b":"Z","\ua762":"Z","\u24d0":"a","\uff41":"a","\u1e9a":"a","\xe0":"a","\xe1":"a","\xe2":"a","\u1ea7":"a","\u1ea5":"a","\u1eab":"a","\u1ea9":"a","\xe3":"a","\u0101":"a","\u0103":"a","\u1eb1":"a","\u1eaf":"a","\u1eb5":"a","\u1eb3":"a","\u0227":"a","\u01e1":"a","\xe4":"a","\u01df":"a","\u1ea3":"a","\xe5":"a","\u01fb":"a","\u01ce":"a","\u0201":"a","\u0203":"a","\u1ea1":"a","\u1ead":"a","\u1eb7":"a","\u1e01":"a","\u0105":"a","\u2c65":"a","\u0250":"a","\ua733":"aa","\xe6":"ae","\u01fd":"ae","\u01e3":"ae","\ua735":"ao","\ua737":"au","\ua739":"av","\ua73b":"av","\ua73d":"ay","\u24d1":"b","\uff42":"b","\u1e03":"b","\u1e05":"b","\u1e07":"b","\u0180":"b","\u0183":"b","\u0253":"b","\u24d2":"c","\uff43":"c","\u0107":"c","\u0109":"c","\u010b":"c","\u010d":"c","\xe7":"c","\u1e09":"c","\u0188":"c","\u023c":"c","\ua73f":"c","\u2184":"c","\u24d3":"d","\uff44":"d","\u1e0b":"d","\u010f":"d","\u1e0d":"d","\u1e11":"d","\u1e13":"d","\u1e0f":"d","\u0111":"d","\u018c":"d","\u0256":"d","\u0257":"d","\ua77a":"d","\u01f3":"dz","\u01c6":"dz","\u24d4":"e","\uff45":"e","\xe8":"e","\xe9":"e","\xea":"e","\u1ec1":"e","\u1ebf":"e","\u1ec5":"e","\u1ec3":"e","\u1ebd":"e","\u0113":"e","\u1e15":"e","\u1e17":"e","\u0115":"e","\u0117":"e","\xeb":"e","\u1ebb":"e","\u011b":"e","\u0205":"e","\u0207":"e","\u1eb9":"e","\u1ec7":"e","\u0229":"e","\u1e1d":"e","\u0119":"e","\u1e19":"e","\u1e1b":"e","\u0247":"e","\u025b":"e","\u01dd":"e","\u24d5":"f","\uff46":"f","\u1e1f":"f","\u0192":"f","\ua77c":"f","\u24d6":"g","\uff47":"g","\u01f5":"g","\u011d":"g","\u1e21":"g","\u011f":"g","\u0121":"g","\u01e7":"g","\u0123":"g","\u01e5":"g","\u0260":"g","\ua7a1":"g","\u1d79":"g","\ua77f":"g","\u24d7":"h","\uff48":"h","\u0125":"h","\u1e23":"h","\u1e27":"h","\u021f":"h","\u1e25":"h","\u1e29":"h","\u1e2b":"h","\u1e96":"h","\u0127":"h","\u2c68":"h","\u2c76":"h","\u0265":"h","\u0195":"hv","\u24d8":"i","\uff49":"i","\xec":"i","\xed":"i","\xee":"i","\u0129":"i","\u012b":"i","\u012d":"i","\xef":"i","\u1e2f":"i","\u1ec9":"i","\u01d0":"i","\u0209":"i","\u020b":"i","\u1ecb":"i","\u012f":"i","\u1e2d":"i","\u0268":"i","\u0131":"i","\u24d9":"j","\uff4a":"j","\u0135":"j","\u01f0":"j","\u0249":"j","\u24da":"k","\uff4b":"k","\u1e31":"k","\u01e9":"k","\u1e33":"k","\u0137":"k","\u1e35":"k","\u0199":"k","\u2c6a":"k","\ua741":"k","\ua743":"k","\ua745":"k","\ua7a3":"k","\u24db":"l","\uff4c":"l","\u0140":"l","\u013a":"l","\u013e":"l","\u1e37":"l","\u1e39":"l","\u013c":"l","\u1e3d":"l","\u1e3b":"l","\u017f":"l","\u0142":"l","\u019a":"l","\u026b":"l","\u2c61":"l","\ua749":"l","\ua781":"l","\ua747":"l","\u01c9":"lj","\u24dc":"m","\uff4d":"m","\u1e3f":"m","\u1e41":"m","\u1e43":"m","\u0271":"m","\u026f":"m","\u24dd":"n","\uff4e":"n","\u01f9":"n","\u0144":"n","\xf1":"n","\u1e45":"n","\u0148":"n","\u1e47":"n","\u0146":"n","\u1e4b":"n","\u1e49":"n","\u019e":"n","\u0272":"n","\u0149":"n","\ua791":"n","\ua7a5":"n","\u01cc":"nj","\u24de":"o","\uff4f":"o","\xf2":"o","\xf3":"o","\xf4":"o","\u1ed3":"o","\u1ed1":"o","\u1ed7":"o","\u1ed5":"o","\xf5":"o","\u1e4d":"o","\u022d":"o","\u1e4f":"o","\u014d":"o","\u1e51":"o","\u1e53":"o","\u014f":"o","\u022f":"o","\u0231":"o","\xf6":"o","\u022b":"o","\u1ecf":"o","\u0151":"o","\u01d2":"o","\u020d":"o","\u020f":"o","\u01a1":"o","\u1edd":"o","\u1edb":"o","\u1ee1":"o","\u1edf":"o","\u1ee3":"o","\u1ecd":"o","\u1ed9":"o","\u01eb":"o","\u01ed":"o","\xf8":"o","\u01ff":"o","\u0254":"o","\ua74b":"o","\ua74d":"o","\u0275":"o","\u01a3":"oi","\u0223":"ou","\ua74f":"oo","\u24df":"p","\uff50":"p","\u1e55":"p","\u1e57":"p","\u01a5":"p","\u1d7d":"p","\ua751":"p","\ua753":"p","\ua755":"p","\u24e0":"q","\uff51":"q","\u024b":"q","\ua757":"q","\ua759":"q","\u24e1":"r","\uff52":"r","\u0155":"r","\u1e59":"r","\u0159":"r","\u0211":"r","\u0213":"r","\u1e5b":"r","\u1e5d":"r","\u0157":"r","\u1e5f":"r","\u024d":"r","\u027d":"r","\ua75b":"r","\ua7a7":"r","\ua783":"r","\u24e2":"s","\uff53":"s","\xdf":"s","\u015b":"s","\u1e65":"s","\u015d":"s","\u1e61":"s","\u0161":"s","\u1e67":"s","\u1e63":"s","\u1e69":"s","\u0219":"s","\u015f":"s","\u023f":"s","\ua7a9":"s","\ua785":"s","\u1e9b":"s","\u24e3":"t","\uff54":"t","\u1e6b":"t","\u1e97":"t","\u0165":"t","\u1e6d":"t","\u021b":"t","\u0163":"t","\u1e71":"t","\u1e6f":"t","\u0167":"t","\u01ad":"t","\u0288":"t","\u2c66":"t","\ua787":"t","\ua729":"tz","\u24e4":"u","\uff55":"u","\xf9":"u","\xfa":"u","\xfb":"u","\u0169":"u","\u1e79":"u","\u016b":"u","\u1e7b":"u","\u016d":"u","\xfc":"u","\u01dc":"u","\u01d8":"u","\u01d6":"u","\u01da":"u","\u1ee7":"u","\u016f":"u","\u0171":"u","\u01d4":"u","\u0215":"u","\u0217":"u","\u01b0":"u","\u1eeb":"u","\u1ee9":"u","\u1eef":"u","\u1eed":"u","\u1ef1":"u","\u1ee5":"u","\u1e73":"u","\u0173":"u","\u1e77":"u","\u1e75":"u","\u0289":"u","\u24e5":"v","\uff56":"v","\u1e7d":"v","\u1e7f":"v","\u028b":"v","\ua75f":"v","\u028c":"v","\ua761":"vy","\u24e6":"w","\uff57":"w","\u1e81":"w","\u1e83":"w","\u0175":"w","\u1e87":"w","\u1e85":"w","\u1e98":"w","\u1e89":"w","\u2c73":"w","\u24e7":"x","\uff58":"x","\u1e8b":"x","\u1e8d":"x","\u24e8":"y","\uff59":"y","\u1ef3":"y","\xfd":"y","\u0177":"y","\u1ef9":"y","\u0233":"y","\u1e8f":"y","\xff":"y","\u1ef7":"y","\u1e99":"y","\u1ef5":"y","\u01b4":"y","\u024f":"y","\u1eff":"y","\u24e9":"z","\uff5a":"z","\u017a":"z","\u1e91":"z","\u017c":"z","\u017e":"z","\u1e93":"z","\u1e95":"z","\u01b6":"z","\u0225":"z","\u0240":"z","\u2c6c":"z","\ua763":"z","\u0386":"\u0391","\u0388":"\u0395","\u0389":"\u0397","\u038a":"\u0399","\u03aa":"\u0399","\u038c":"\u039f","\u038e":"\u03a5","\u03ab":"\u03a5","\u038f":"\u03a9","\u03ac":"\u03b1","\u03ad":"\u03b5","\u03ae":"\u03b7","\u03af":"\u03b9","\u03ca":"\u03b9","\u0390":"\u03b9","\u03cc":"\u03bf","\u03cd":"\u03c5","\u03cb":"\u03c5","\u03b0":"\u03c5","\u03c9":"\u03c9","\u03c2":"\u03c3"};i=a(document),f=function(){var a=1;return function(){return a++}}(),c=O(Object,{bind:function(a){var b=this;return function(){a.apply(b,arguments)}},init:function(c){var d,e,g=".select2-results";this.opts=c=this.prepareOpts(c),this.id=c.id,c.element.data("select2")!==b&&null!==c.element.data("select2")&&c.element.data("select2").destroy(),this.container=this.createContainer(),this.liveRegion=a(".select2-hidden-accessible"),0==this.liveRegion.length&&(this.liveRegion=a("<span>",{role:"status","aria-live":"polite"}).addClass("select2-hidden-accessible").appendTo(document.body)),this.containerId="s2id_"+(c.element.attr("id")||"autogen"+f()),this.containerEventName=this.containerId.replace(/([.])/g,"_").replace(/([;&,\-\.\+\*\~':"\!\^#$%@\[\]\(\)=>\|])/g,"\\$1"),this.container.attr("id",this.containerId),this.container.attr("title",c.element.attr("title")),this.body=a(document.body),D(this.container,this.opts.element,this.opts.adaptContainerCssClass),this.container.attr("style",c.element.attr("style")),this.container.css(K(c.containerCss,this.opts.element)),this.container.addClass(K(c.containerCssClass,this.opts.element)),this.elementTabIndex=this.opts.element.attr("tabindex"),this.opts.element.data("select2",this).attr("tabindex","-1").before(this.container).on("click.select2",A),this.container.data("select2",this),this.dropdown=this.container.find(".select2-drop"),D(this.dropdown,this.opts.element,this.opts.adaptDropdownCssClass),this.dropdown.addClass(K(c.dropdownCssClass,this.opts.element)),this.dropdown.data("select2",this),this.dropdown.on("click",A),this.results=d=this.container.find(g),this.search=e=this.container.find("input.select2-input"),this.queryCount=0,this.resultsPage=0,this.context=null,this.initContainer(),this.container.on("click",A),v(this.results),this.dropdown.on("mousemove-filtered",g,this.bind(this.highlightUnderEvent)),this.dropdown.on("touchstart touchmove touchend",g,this.bind(function(a){this._touchEvent=!0,this.highlightUnderEvent(a)})),this.dropdown.on("touchmove",g,this.bind(this.touchMoved)),this.dropdown.on("touchstart touchend",g,this.bind(this.clearTouchMoved)),this.dropdown.on("click",this.bind(function(a){this._touchEvent&&(this._touchEvent=!1,this.selectHighlighted())})),x(80,this.results),this.dropdown.on("scroll-debounced",g,this.bind(this.loadMoreIfNeeded)),a(this.container).on("change",".select2-input",function(a){a.stopPropagation()}),a(this.dropdown).on("change",".select2-input",function(a){a.stopPropagation()}),a.fn.mousewheel&&d.mousewheel(function(a,b,c,e){var f=d.scrollTop();e>0&&0>=f-e?(d.scrollTop(0),A(a)):0>e&&d.get(0).scrollHeight-d.scrollTop()+e<=d.height()&&(d.scrollTop(d.get(0).scrollHeight-d.height()),A(a))}),u(e),e.on("keyup-change input paste",this.bind(this.updateResults)),e.on("focus",function(){e.addClass("select2-focused")}),e.on("blur",function(){e.removeClass("select2-focused")}),this.dropdown.on("mouseup",g,this.bind(function(b){a(b.target).closest(".select2-result-selectable").length>0&&(this.highlightUnderEvent(b),this.selectHighlighted(b))})),this.dropdown.on("click mouseup mousedown touchstart touchend focusin",function(a){a.stopPropagation()}),this.lastSearchTerm=b,a.isFunction(this.opts.initSelection)&&(this.initSelection(),this.monitorSource()),null!==c.maximumInputLength&&this.search.attr("maxlength",c.maximumInputLength);var h=c.element.prop("disabled");h===b&&(h=!1),this.enable(!h);var i=c.element.prop("readonly");i===b&&(i=!1),this.readonly(i),j=j||q(),this.autofocus=c.element.prop("autofocus"),c.element.prop("autofocus",!1),this.autofocus&&this.focus(),this.search.attr("placeholder",c.searchInputPlaceholder)},destroy:function(){var a=this.opts.element,c=a.data("select2"),d=this;this.close(),a.length&&a[0].detachEvent&&d._sync&&a.each(function(){d._sync&&this.detachEvent("onpropertychange",d._sync)}),this.propertyObserver&&(this.propertyObserver.disconnect(),this.propertyObserver=null),this._sync=null,c!==b&&(c.container.remove(),c.liveRegion.remove(),c.dropdown.remove(),a.removeData("select2").off(".select2"),a.is("input[type='hidden']")?a.css("display",""):(a.show().prop("autofocus",this.autofocus||!1),this.elementTabIndex?a.attr({tabindex:this.elementTabIndex}):a.removeAttr("tabindex"),a.show())),N.call(this,"container","liveRegion","dropdown","results","search")},optionToData:function(a){return a.is("option")?{id:a.prop("value"),text:a.text(),element:a.get(),css:a.attr("class"),disabled:a.prop("disabled"),locked:r(a.attr("locked"),"locked")||r(a.data("locked"),!0)}:a.is("optgroup")?{text:a.attr("label"),children:[],element:a.get(),css:a.attr("class")}:void 0},prepareOpts:function(c){var d,e,g,h,i=this;if(d=c.element,"select"===d.get(0).tagName.toLowerCase()&&(this.select=e=c.element),e&&a.each(["id","multiple","ajax","query","createSearchChoice","initSelection","data","tags"],function(){if(this in c)throw new Error("Option '"+this+"' is not allowed for Select2 when attached to a <select> element.")}),c.debug=c.debug||a.fn.select2.defaults.debug,c.debug&&console&&console.warn&&(null!=c.id&&console.warn("Select2: The `id` option has been removed in Select2 4.0.0, consider renaming your `id` property or mapping the property before your data makes it to Select2. You can read more at https://select2.github.io/announcements-4.0.html#changed-id"),null!=c.text&&console.warn("Select2: The `text` option has been removed in Select2 4.0.0, consider renaming your `text` property or mapping the property before your data makes it to Select2. You can read more at https://select2.github.io/announcements-4.0.html#changed-id"),null!=c.sortResults&&console.warn("Select2: the `sortResults` option has been renamed to `sorter` in Select2 4.0.0. "),null!=c.selectOnBlur&&console.warn("Select2: The `selectOnBlur` option has been renamed to `selectOnClose` in Select2 4.0.0."),null!=c.ajax&&null!=c.ajax.results&&console.warn("Select2: The `ajax.results` option has been renamed to `ajax.processResults` in Select2 4.0.0."),null!=c.formatNoResults&&console.warn("Select2: The `formatNoResults` option has been renamed to `language.noResults` in Select2 4.0.0."),null!=c.formatSearching&&console.warn("Select2: The `formatSearching` option has been renamed to `language.searching` in Select2 4.0.0."),null!=c.formatInputTooShort&&console.warn("Select2: The `formatInputTooShort` option has been renamed to `language.inputTooShort` in Select2 4.0.0."),null!=c.formatInputTooLong&&console.warn("Select2: The `formatInputTooLong` option has been renamed to `language.inputTooLong` in Select2 4.0.0."),null!=c.formatLoading&&console.warn("Select2: The `formatLoading` option has been renamed to `language.loadingMore` in Select2 4.0.0."),null!=c.formatSelectionTooBig&&console.warn("Select2: The `formatSelectionTooBig` option has been renamed to `language.maximumSelected` in Select2 4.0.0."),c.element.data("select2Tags")&&console.warn("Select2: The `data-select2-tags` attribute has been renamed to `data-tags` in Select2 4.0.0.")),null!=c.element.data("tags")){var j=c.element.data("tags");a.isArray(j)||(j=[]),c.element.data("select2Tags",j)}if(null!=c.sorter&&(c.sortResults=c.sorter),null!=c.selectOnClose&&(c.selectOnBlur=c.selectOnClose),null!=c.ajax&&a.isFunction(c.ajax.processResults)&&(c.ajax.results=c.ajax.processResults),null!=c.language){var k=c.language;a.isFunction(k.noMatches)&&(c.formatNoMatches=k.noMatches),a.isFunction(k.searching)&&(c.formatSearching=k.searching),a.isFunction(k.inputTooShort)&&(c.formatInputTooShort=k.inputTooShort),a.isFunction(k.inputTooLong)&&(c.formatInputTooLong=k.inputTooLong),a.isFunction(k.loadingMore)&&(c.formatLoading=k.loadingMore),a.isFunction(k.maximumSelected)&&(c.formatSelectionTooBig=k.maximumSelected)}if(c=a.extend({},{populateResults:function(d,e,g){var h,j=this.opts.id,k=this.liveRegion;(h=function(d,e,l){var m,n,o,p,q,r,s,t,u,v;d=c.sortResults(d,e,g);var w=[];for(m=0,n=d.length;n>m;m+=1)o=d[m],q=o.disabled===!0,p=!q&&j(o)!==b,r=o.children&&o.children.length>0,s=a("<li></li>"),s.addClass("select2-results-dept-"+l),s.addClass("select2-result"),s.addClass(p?"select2-result-selectable":"select2-result-unselectable"),q&&s.addClass("select2-disabled"),r&&s.addClass("select2-result-with-children"),s.addClass(i.opts.formatResultCssClass(o)),s.attr("role","presentation"),t=a(document.createElement("div")),t.addClass("select2-result-label"),t.attr("id","select2-result-label-"+f()),t.attr("role","option"),v=c.formatResult(o,t,g,i.opts.escapeMarkup),v!==b&&(t.html(v),s.append(t)),r&&(u=a("<ul></ul>"),u.addClass("select2-result-sub"),h(o.children,u,l+1),s.append(u)),s.data("select2-data",o),w.push(s[0]);e.append(w),k.text(c.formatMatches(d.length))})(e,d,0)}},a.fn.select2.defaults,c),"function"!=typeof c.id&&(g=c.id,c.id=function(a){return a[g]}),a.isArray(c.element.data("select2Tags"))){if("tags"in c)throw"tags specified as both an attribute 'data-select2-tags' and in options of Select2 "+c.element.attr("id");c.tags=c.element.data("select2Tags")}if(e?(c.query=this.bind(function(a){var f,g,h,c={results:[],more:!1},e=a.term;h=function(b,c){var d;b.is("option")?a.matcher(e,b.text(),b)&&c.push(i.optionToData(b)):b.is("optgroup")&&(d=i.optionToData(b),b.children().each2(function(a,b){h(b,d.children)}),d.children.length>0&&c.push(d))},f=d.children(),this.getPlaceholder()!==b&&f.length>0&&(g=this.getPlaceholderOption(),g&&(f=f.not(g))),f.each2(function(a,b){h(b,c.results)}),a.callback(c)}),c.id=function(a){return a.id}):"query"in c||("ajax"in c?(h=c.element.data("ajax-url"),h&&h.length>0&&(c.ajax.url=h),c.query=G.call(c.element,c.ajax)):"data"in c?c.query=H(c.data):"tags"in c&&(c.query=I(c.tags),c.createSearchChoice===b&&(c.createSearchChoice=function(b){return{id:a.trim(b),text:a.trim(b)}}),c.initSelection===b&&(c.initSelection=function(b,d){var e=[];a(s(b.val(),c.separator,c.transformVal)).each(function(){var b={id:this,text:this},d=c.tags;a.isFunction(d)&&(d=d()),a(d).each(function(){return r(this.id,b.id)?(b=this,!1):void 0}),e.push(b)}),d(e)}))),"function"!=typeof c.query)throw"query function not defined for Select2 "+c.element.attr("id");if("top"===c.createSearchChoicePosition)c.createSearchChoicePosition=function(a,b){a.unshift(b)};else if("bottom"===c.createSearchChoicePosition)c.createSearchChoicePosition=function(a,b){a.push(b)};else if("function"!=typeof c.createSearchChoicePosition)throw"invalid createSearchChoicePosition option must be 'top', 'bottom' or a custom function";return c},monitorSource:function(){var d,c=this.opts.element,e=this;c.on("change.select2",this.bind(function(a){this.opts.element.data("select2-change-triggered")!==!0&&this.initSelection()})),this._sync=this.bind(function(){var a=c.prop("disabled");a===b&&(a=!1),this.enable(!a);var d=c.prop("readonly");d===b&&(d=!1),this.readonly(d),this.container&&(D(this.container,this.opts.element,this.opts.adaptContainerCssClass),this.container.addClass(K(this.opts.containerCssClass,this.opts.element))),this.dropdown&&(D(this.dropdown,this.opts.element,this.opts.adaptDropdownCssClass),this.dropdown.addClass(K(this.opts.dropdownCssClass,this.opts.element)))}),c.length&&c[0].attachEvent&&c.each(function(){this.attachEvent("onpropertychange",e._sync)}),d=window.MutationObserver||window.WebKitMutationObserver||window.MozMutationObserver,d!==b&&(this.propertyObserver&&(delete this.propertyObserver,this.propertyObserver=null),this.propertyObserver=new d(function(b){a.each(b,e._sync)}),this.propertyObserver.observe(c.get(0),{attributes:!0,subtree:!1}))},triggerSelect:function(b){var c=a.Event("select2-selecting",{val:this.id(b),object:b,choice:b});return this.opts.element.trigger(c),!c.isDefaultPrevented()},triggerChange:function(b){b=b||{},b=a.extend({},b,{type:"change",val:this.val()}),this.opts.element.data("select2-change-triggered",!0),this.opts.element.trigger(b),this.opts.element.data("select2-change-triggered",!1),this.opts.element.click(),this.opts.blurOnChange&&this.opts.element.blur()},isInterfaceEnabled:function(){return this.enabledInterface===!0},enableInterface:function(){var a=this._enabled&&!this._readonly,b=!a;return a===this.enabledInterface?!1:(this.container.toggleClass("select2-container-disabled",b),this.close(),this.enabledInterface=a,!0)},enable:function(a){a===b&&(a=!0),this._enabled!==a&&(this._enabled=a,this.opts.element.prop("disabled",!a),this.enableInterface())},disable:function(){this.enable(!1)},readonly:function(a){a===b&&(a=!1),this._readonly!==a&&(this._readonly=a,this.opts.element.prop("readonly",a),this.enableInterface())},opened:function(){return this.container?this.container.hasClass("select2-dropdown-open"):!1},positionDropdown:function(){var v,w,x,y,z,b=this.dropdown,c=this.container,d=c.offset(),e=c.outerHeight(!1),f=c.outerWidth(!1),g=b.outerHeight(!1),h=a(window),i=h.width(),k=h.height(),l=h.scrollLeft()+i,m=h.scrollTop()+k,n=d.top+e,o=d.left,p=m>=n+g,q=d.top-g>=h.scrollTop(),r=b.outerWidth(!1),s=function(){return l>=o+r},t=function(){return d.left+l+c.outerWidth(!1)>r},u=b.hasClass("select2-drop-above");u?(w=!0,!q&&p&&(x=!0,w=!1)):(w=!1,!p&&q&&(x=!0,w=!0)),x&&(b.hide(),d=this.container.offset(),e=this.container.outerHeight(!1),f=this.container.outerWidth(!1),g=b.outerHeight(!1),l=h.scrollLeft()+i,m=h.scrollTop()+k,n=d.top+e,o=d.left,r=b.outerWidth(!1),b.show(),this.focusSearch()),this.opts.dropdownAutoWidth?(z=a(".select2-results",b)[0],b.addClass("select2-drop-auto-width"),b.css("width",""),r=b.outerWidth(!1)+(z.scrollHeight===z.clientHeight?0:j.width),r>f?f=r:r=f,g=b.outerHeight(!1)):this.container.removeClass("select2-drop-auto-width"),"static"!==this.body.css("position")&&(v=this.body.offset(),n-=v.top,o-=v.left),!s()&&t()&&(o=d.left+this.container.outerWidth(!1)-r),y={left:o,width:f},w?(this.container.addClass("select2-drop-above"),b.addClass("select2-drop-above"),g=b.outerHeight(!1),y.top=d.top-g,y.bottom="auto"):(y.top=n,y.bottom="auto",this.container.removeClass("select2-drop-above"),b.removeClass("select2-drop-above")),y=a.extend(y,K(this.opts.dropdownCss,this.opts.element)),b.css(y)},shouldOpen:function(){var b;return this.opened()?!1:this._enabled===!1||this._readonly===!0?!1:(b=a.Event("select2-opening"),this.opts.element.trigger(b),!b.isDefaultPrevented())},clearDropdownAlignmentPreference:function(){this.container.removeClass("select2-drop-above"),
-this.dropdown.removeClass("select2-drop-above")},open:function(){return this.shouldOpen()?(this.opening(),i.on("mousemove.select2Event",function(a){h.x=a.pageX,h.y=a.pageY}),!0):!1},opening:function(){var f,b=this.containerEventName,c="scroll."+b,d="resize."+b,e="orientationchange."+b;this.container.addClass("select2-dropdown-open").addClass("select2-container-active"),this.clearDropdownAlignmentPreference(),this.dropdown[0]!==this.body.children().last()[0]&&this.dropdown.detach().appendTo(this.body),f=a("#select2-drop-mask"),0===f.length&&(f=a(document.createElement("div")),f.attr("id","select2-drop-mask").attr("class","select2-drop-mask"),f.hide(),f.appendTo(this.body),f.on("mousedown touchstart click",function(b){n(f);var d,c=a("#select2-drop");c.length>0&&(d=c.data("select2"),d.opts.selectOnBlur&&d.selectHighlighted({noFocus:!0}),d.close(),b.preventDefault(),b.stopPropagation())})),this.dropdown.prev()[0]!==f[0]&&this.dropdown.before(f),a("#select2-drop").removeAttr("id"),this.dropdown.attr("id","select2-drop"),f.show(),this.positionDropdown(),this.dropdown.show(),this.positionDropdown(),this.dropdown.addClass("select2-drop-active");var g=this;this.container.parents().add(window).each(function(){a(this).on(d+" "+c+" "+e,function(a){g.opened()&&g.positionDropdown()})})},close:function(){if(this.opened()){var b=this.containerEventName,c="scroll."+b,d="resize."+b,e="orientationchange."+b;this.container.parents().add(window).each(function(){a(this).off(c).off(d).off(e)}),this.clearDropdownAlignmentPreference(),a("#select2-drop-mask").hide(),this.dropdown.removeAttr("id"),this.dropdown.hide(),this.container.removeClass("select2-dropdown-open").removeClass("select2-container-active"),this.results.empty(),i.off("mousemove.select2Event"),this.clearSearch(),this.search.removeClass("select2-active"),this.search.removeAttr("aria-activedescendant"),this.opts.element.trigger(a.Event("select2-close"))}},externalSearch:function(a){this.open(),this.search.val(a),this.updateResults(!1)},clearSearch:function(){},prefillNextSearchTerm:function(){if(""!==this.search.val())return!1;var a=this.opts.nextSearchTerm(this.data(),this.lastSearchTerm);return a!==b?(this.search.val(a),this.search.select(),!0):!1},getMaximumSelectionSize:function(){return K(this.opts.maximumSelectionSize,this.opts.element)},ensureHighlightVisible:function(){var c,d,e,f,g,h,i,j,b=this.results;if(d=this.highlight(),!(0>d)){if(0==d)return void b.scrollTop(0);c=this.findHighlightableChoices().find(".select2-result-label"),e=a(c[d]),j=(e.offset()||{}).top||0,f=j+e.outerHeight(!0),d===c.length-1&&(i=b.find("li.select2-more-results"),i.length>0&&(f=i.offset().top+i.outerHeight(!0))),g=b.offset().top+b.outerHeight(!1),f>g&&b.scrollTop(b.scrollTop()+(f-g)),h=j-b.offset().top,0>h&&"none"!=e.css("display")&&b.scrollTop(b.scrollTop()+h)}},findHighlightableChoices:function(){return this.results.find(".select2-result-selectable:not(.select2-disabled):not(.select2-selected)")},moveHighlight:function(b){for(var c=this.findHighlightableChoices(),d=this.highlight();d>-1&&d<c.length;){d+=b;var e=a(c[d]);if(e.hasClass("select2-result-selectable")&&!e.hasClass("select2-disabled")&&!e.hasClass("select2-selected")){this.highlight(d);break}}},highlight:function(b){var d,e,c=this.findHighlightableChoices();return 0===arguments.length?p(c.filter(".select2-highlighted")[0],c.get()):(b>=c.length&&(b=c.length-1),0>b&&(b=0),this.removeHighlight(),d=a(c[b]),d.addClass("select2-highlighted"),this.search.attr("aria-activedescendant",d.find(".select2-result-label").attr("id")),this.ensureHighlightVisible(),this.liveRegion.text(d.text()),e=d.data("select2-data"),void(e&&this.opts.element.trigger({type:"select2-highlight",val:this.id(e),choice:e})))},removeHighlight:function(){this.results.find(".select2-highlighted").removeClass("select2-highlighted")},touchMoved:function(){this._touchMoved=!0},clearTouchMoved:function(){this._touchMoved=!1},countSelectableResults:function(){return this.findHighlightableChoices().length},highlightUnderEvent:function(b){var c=a(b.target).closest(".select2-result-selectable");if(c.length>0&&!c.is(".select2-highlighted")){var d=this.findHighlightableChoices();this.highlight(d.index(c))}else 0==c.length&&this.removeHighlight()},loadMoreIfNeeded:function(){var c,a=this.results,b=a.find("li.select2-more-results"),d=this.resultsPage+1,e=this,f=this.search.val(),g=this.context;0!==b.length&&(c=b.offset().top-a.offset().top-a.height(),c<=this.opts.loadMorePadding&&(b.addClass("select2-active"),this.opts.query({element:this.opts.element,term:f,page:d,context:g,matcher:this.opts.matcher,callback:this.bind(function(c){e.opened()&&(e.opts.populateResults.call(this,a,c.results,{term:f,page:d,context:g}),e.postprocessResults(c,!1,!1),c.more===!0?(b.detach().appendTo(a).html(e.opts.escapeMarkup(K(e.opts.formatLoadMore,e.opts.element,d+1))),window.setTimeout(function(){e.loadMoreIfNeeded()},10)):b.remove(),e.positionDropdown(),e.resultsPage=d,e.context=c.context,this.opts.element.trigger({type:"select2-loaded",items:c}))})})))},tokenize:function(){},updateResults:function(c){function m(){d.removeClass("select2-active"),h.positionDropdown(),e.find(".select2-no-results,.select2-selection-limit,.select2-searching").length?h.liveRegion.text(e.text()):h.liveRegion.text(h.opts.formatMatches(e.find('.select2-result-selectable:not(".select2-selected")').length))}function n(a){e.html(a),m()}var g,i,l,d=this.search,e=this.results,f=this.opts,h=this,j=d.val(),k=a.data(this.container,"select2-last-term");if((c===!0||!k||!r(j,k))&&(a.data(this.container,"select2-last-term",j),c===!0||this.showSearchInput!==!1&&this.opened())){l=++this.queryCount;var o=this.getMaximumSelectionSize();if(o>=1&&(g=this.data(),a.isArray(g)&&g.length>=o&&J(f.formatSelectionTooBig,"formatSelectionTooBig")))return void n("<li class='select2-selection-limit'>"+K(f.formatSelectionTooBig,f.element,o)+"</li>");if(d.val().length<f.minimumInputLength)return n(J(f.formatInputTooShort,"formatInputTooShort")?"<li class='select2-no-results'>"+K(f.formatInputTooShort,f.element,d.val(),f.minimumInputLength)+"</li>":""),void(c&&this.showSearch&&this.showSearch(!0));if(f.maximumInputLength&&d.val().length>f.maximumInputLength)return void n(J(f.formatInputTooLong,"formatInputTooLong")?"<li class='select2-no-results'>"+K(f.formatInputTooLong,f.element,d.val(),f.maximumInputLength)+"</li>":"");f.formatSearching&&0===this.findHighlightableChoices().length&&n("<li class='select2-searching'>"+K(f.formatSearching,f.element)+"</li>"),d.addClass("select2-active"),this.removeHighlight(),i=this.tokenize(),i!=b&&null!=i&&d.val(i),this.resultsPage=1,f.query({element:f.element,term:d.val(),page:this.resultsPage,context:null,matcher:f.matcher,callback:this.bind(function(g){var i;if(l==this.queryCount){if(!this.opened())return void this.search.removeClass("select2-active");if(g.hasError!==b&&J(f.formatAjaxError,"formatAjaxError"))return void n("<li class='select2-ajax-error'>"+K(f.formatAjaxError,f.element,g.jqXHR,g.textStatus,g.errorThrown)+"</li>");if(this.context=g.context===b?null:g.context,this.opts.createSearchChoice&&""!==d.val()&&(i=this.opts.createSearchChoice.call(h,d.val(),g.results),i!==b&&null!==i&&h.id(i)!==b&&null!==h.id(i)&&0===a(g.results).filter(function(){return r(h.id(this),h.id(i))}).length&&this.opts.createSearchChoicePosition(g.results,i)),0===g.results.length&&J(f.formatNoMatches,"formatNoMatches"))return n("<li class='select2-no-results'>"+K(f.formatNoMatches,f.element,d.val())+"</li>"),void(this.showSearch&&this.showSearch(d.val()));e.empty(),h.opts.populateResults.call(this,e,g.results,{term:d.val(),page:this.resultsPage,context:null}),g.more===!0&&J(f.formatLoadMore,"formatLoadMore")&&(e.append("<li class='select2-more-results'>"+f.escapeMarkup(K(f.formatLoadMore,f.element,this.resultsPage))+"</li>"),window.setTimeout(function(){h.loadMoreIfNeeded()},10)),this.postprocessResults(g,c),m(),this.opts.element.trigger({type:"select2-loaded",items:g})}})})}},cancel:function(){this.close()},blur:function(){this.opts.selectOnBlur&&this.selectHighlighted({noFocus:!0}),this.close(),this.container.removeClass("select2-container-active"),this.search[0]===document.activeElement&&this.search.blur(),this.clearSearch(),this.selection.find(".select2-search-choice-focus").removeClass("select2-search-choice-focus")},focusSearch:function(){y(this.search)},selectHighlighted:function(a){if(this._touchMoved)return void this.clearTouchMoved();var b=this.highlight(),c=this.results.find(".select2-highlighted"),d=c.closest(".select2-result").data("select2-data");d?(this.highlight(b),this.onSelect(d,a)):a&&a.noFocus&&this.close()},getPlaceholder:function(){var a;return this.opts.element.attr("placeholder")||this.opts.element.attr("data-placeholder")||this.opts.element.data("placeholder")||this.opts.placeholder||((a=this.getPlaceholderOption())!==b?a.text():b)},getPlaceholderOption:function(){if(this.select){var c=this.select.children("option").first();if(this.opts.placeholderOption!==b)return"first"===this.opts.placeholderOption&&c||"function"==typeof this.opts.placeholderOption&&this.opts.placeholderOption(this.select);if(""===a.trim(c.text())&&""===c.val())return c}},initContainerWidth:function(){function b(){var b,c,d,e,f,g;if("off"===this.opts.width)return null;if("element"===this.opts.width)return 0===this.opts.element.outerWidth(!1)?"auto":this.opts.element.outerWidth(!1)+"px";if("copy"===this.opts.width||"resolve"===this.opts.width){if(b=this.opts.element.attr("style"),"string"==typeof b)for(c=b.split(";"),e=0,f=c.length;f>e;e+=1)if(g=c[e].replace(/\s/g,""),d=g.match(/^width:(([-+]?([0-9]*\.)?[0-9]+)(px|em|ex|%|in|cm|mm|pt|pc))/i),null!==d&&d.length>=1)return d[1];return"resolve"===this.opts.width?(b=this.opts.element.css("width"),b.indexOf("%")>0?b:0===this.opts.element.outerWidth(!1)?"auto":this.opts.element.outerWidth(!1)+"px"):null}return a.isFunction(this.opts.width)?this.opts.width():this.opts.width}var c=b.call(this);null!==c&&this.container.css("width",c)}}),d=O(c,{createContainer:function(){var b=a(document.createElement("div")).attr({"class":"select2-container"}).html(["<a href='javascript:void(0)' class='select2-choice' tabindex='-1'>","   <span class='select2-chosen'>&#160;</span><abbr class='select2-search-choice-close'></abbr>","   <span class='select2-arrow' role='presentation'><b role='presentation'></b></span>","</a>","<label for='' class='select2-offscreen'></label>","<input class='select2-focusser select2-offscreen' type='text' aria-haspopup='true' role='button' />","<div class='select2-drop select2-display-none'>","   <div class='select2-search'>","       <label for='' class='select2-offscreen'></label>","       <input type='text' autocomplete='off' autocorrect='off' autocapitalize='off' spellcheck='false' class='select2-input' role='combobox' aria-expanded='true'","       aria-autocomplete='list' />","   </div>","   <ul class='select2-results' role='listbox'>","   </ul>","</div>"].join(""));return b},enableInterface:function(){this.parent.enableInterface.apply(this,arguments)&&this.focusser.prop("disabled",!this.isInterfaceEnabled())},opening:function(){var b,c,d;this.opts.minimumResultsForSearch>=0&&this.showSearch(!0),this.parent.opening.apply(this,arguments),this.showSearchInput!==!1&&this.search.val(this.focusser.val()),this.opts.shouldFocusInput(this)&&(this.search.focus(),b=this.search.get(0),b.createTextRange?(c=b.createTextRange(),c.collapse(!1),c.select()):b.setSelectionRange&&(d=this.search.val().length,b.setSelectionRange(d,d))),this.prefillNextSearchTerm(),this.focusser.prop("disabled",!0).val(""),this.updateResults(!0),this.opts.element.trigger(a.Event("select2-open"))},close:function(){this.opened()&&(this.parent.close.apply(this,arguments),this.focusser.prop("disabled",!1),this.opts.shouldFocusInput(this)&&this.focusser.focus())},focus:function(){this.opened()?this.close():(this.focusser.prop("disabled",!1),this.opts.shouldFocusInput(this)&&this.focusser.focus())},isFocused:function(){return this.container.hasClass("select2-container-active")},cancel:function(){this.parent.cancel.apply(this,arguments),this.focusser.prop("disabled",!1),this.opts.shouldFocusInput(this)&&this.focusser.focus()},destroy:function(){a("label[for='"+this.focusser.attr("id")+"']").attr("for",this.opts.element.attr("id")),this.parent.destroy.apply(this,arguments),N.call(this,"selection","focusser")},initContainer:function(){var b,g,c=this.container,d=this.dropdown,e=f();this.opts.minimumResultsForSearch<0?this.showSearch(!1):this.showSearch(!0),this.selection=b=c.find(".select2-choice"),this.focusser=c.find(".select2-focusser"),b.find(".select2-chosen").attr("id","select2-chosen-"+e),this.focusser.attr("aria-labelledby","select2-chosen-"+e),this.results.attr("id","select2-results-"+e),this.search.attr("aria-owns","select2-results-"+e),this.focusser.attr("id","s2id_autogen"+e),g=a("label[for='"+this.opts.element.attr("id")+"']"),this.opts.element.on("focus.select2",this.bind(function(){this.focus()})),this.focusser.prev().text(g.text()).attr("for",this.focusser.attr("id"));var h=this.opts.element.attr("title");this.opts.element.attr("title",h||g.text()),this.focusser.attr("tabindex",this.elementTabIndex),this.search.attr("id",this.focusser.attr("id")+"_search"),this.search.prev().text(a("label[for='"+this.focusser.attr("id")+"']").text()).attr("for",this.search.attr("id")),this.search.on("keydown",this.bind(function(a){if(this.isInterfaceEnabled()&&229!=a.keyCode){if(a.which===k.PAGE_UP||a.which===k.PAGE_DOWN)return void A(a);switch(a.which){case k.UP:case k.DOWN:return this.moveHighlight(a.which===k.UP?-1:1),void A(a);case k.ENTER:return this.selectHighlighted(),void A(a);case k.TAB:return void this.selectHighlighted({noFocus:!0});case k.ESC:return this.cancel(a),void A(a)}}})),this.search.on("blur",this.bind(function(a){document.activeElement===this.body.get(0)&&window.setTimeout(this.bind(function(){this.opened()&&this.results&&this.results.length>1&&this.search.focus()}),0)})),this.focusser.on("keydown",this.bind(function(a){if(this.isInterfaceEnabled()&&a.which!==k.TAB&&!k.isControl(a)&&!k.isFunctionKey(a)&&a.which!==k.ESC){if(this.opts.openOnEnter===!1&&a.which===k.ENTER)return void A(a);if(a.which==k.DOWN||a.which==k.UP||a.which==k.ENTER&&this.opts.openOnEnter){if(a.altKey||a.ctrlKey||a.shiftKey||a.metaKey)return;return this.open(),void A(a)}return a.which==k.DELETE||a.which==k.BACKSPACE?(this.opts.allowClear&&this.clear(),void A(a)):void 0}})),u(this.focusser),this.focusser.on("keyup-change input",this.bind(function(a){if(this.opts.minimumResultsForSearch>=0){if(a.stopPropagation(),this.opened())return;this.open()}})),b.on("mousedown touchstart","abbr",this.bind(function(a){this.isInterfaceEnabled()&&(this.clear(),B(a),this.close(),this.selection&&this.selection.focus())})),b.on("mousedown touchstart",this.bind(function(c){n(b),this.container.hasClass("select2-container-active")||this.opts.element.trigger(a.Event("select2-focus")),this.opened()?this.close():this.isInterfaceEnabled()&&this.open(),A(c)})),d.on("mousedown touchstart",this.bind(function(){this.opts.shouldFocusInput(this)&&this.search.focus()})),b.on("focus",this.bind(function(a){A(a)})),this.focusser.on("focus",this.bind(function(){this.container.hasClass("select2-container-active")||this.opts.element.trigger(a.Event("select2-focus")),this.container.addClass("select2-container-active")})).on("blur",this.bind(function(){this.opened()||(this.container.removeClass("select2-container-active"),this.opts.element.trigger(a.Event("select2-blur")))})),this.search.on("focus",this.bind(function(){this.container.hasClass("select2-container-active")||this.opts.element.trigger(a.Event("select2-focus")),this.container.addClass("select2-container-active")})),this.initContainerWidth(),this.opts.element.hide(),this.setPlaceholder()},clear:function(b){var c=this.selection.data("select2-data");if(c){var d=a.Event("select2-clearing");if(this.opts.element.trigger(d),d.isDefaultPrevented())return;var e=this.getPlaceholderOption();this.opts.element.val(e?e.val():""),this.selection.find(".select2-chosen").empty(),this.selection.removeData("select2-data"),this.setPlaceholder(),b!==!1&&(this.opts.element.trigger({type:"select2-removed",val:this.id(c),choice:c}),this.triggerChange({removed:c}))}},initSelection:function(){if(this.isPlaceholderOptionSelected())this.updateSelection(null),this.close(),this.setPlaceholder();else{var c=this;this.opts.initSelection.call(null,this.opts.element,function(a){a!==b&&null!==a&&(c.updateSelection(a),c.close(),c.setPlaceholder(),c.lastSearchTerm=c.search.val())})}},isPlaceholderOptionSelected:function(){var a;return this.getPlaceholder()===b?!1:(a=this.getPlaceholderOption())!==b&&a.prop("selected")||""===this.opts.element.val()||this.opts.element.val()===b||null===this.opts.element.val()},prepareOpts:function(){var b=this.parent.prepareOpts.apply(this,arguments),c=this;return"select"===b.element.get(0).tagName.toLowerCase()?b.initSelection=function(a,b){var d=a.find("option").filter(function(){return this.selected&&!this.disabled});b(c.optionToData(d))}:"data"in b&&(b.initSelection=b.initSelection||function(c,d){var e=c.val(),f=null;b.query({matcher:function(a,c,d){var g=r(e,b.id(d));return g&&(f=d),g},callback:a.isFunction(d)?function(){d(f)}:a.noop})}),b},getPlaceholder:function(){return this.select&&this.getPlaceholderOption()===b?b:this.parent.getPlaceholder.apply(this,arguments)},setPlaceholder:function(){var a=this.getPlaceholder();if(this.isPlaceholderOptionSelected()&&a!==b){if(this.select&&this.getPlaceholderOption()===b)return;this.selection.find(".select2-chosen").html(this.opts.escapeMarkup(a)),this.selection.addClass("select2-default"),this.container.removeClass("select2-allowclear")}},postprocessResults:function(a,b,c){var d=0,e=this;if(this.findHighlightableChoices().each2(function(a,b){return r(e.id(b.data("select2-data")),e.opts.element.val())?(d=a,!1):void 0}),c!==!1&&(b===!0&&d>=0?this.highlight(d):this.highlight(0)),b===!0){var g=this.opts.minimumResultsForSearch;g>=0&&this.showSearch(L(a.results)>=g)}},showSearch:function(b){this.showSearchInput!==b&&(this.showSearchInput=b,this.dropdown.find(".select2-search").toggleClass("select2-search-hidden",!b),this.dropdown.find(".select2-search").toggleClass("select2-offscreen",!b),a(this.dropdown,this.container).toggleClass("select2-with-searchbox",b))},onSelect:function(a,b){if(this.triggerSelect(a)){var c=this.opts.element.val(),d=this.data();this.opts.element.val(this.id(a)),this.updateSelection(a),this.opts.element.trigger({type:"select2-selected",val:this.id(a),choice:a}),this.lastSearchTerm=this.search.val(),this.close(),b&&b.noFocus||!this.opts.shouldFocusInput(this)||this.focusser.focus(),r(c,this.id(a))||this.triggerChange({added:a,removed:d})}},updateSelection:function(a){var d,e,c=this.selection.find(".select2-chosen");this.selection.data("select2-data",a),c.empty(),null!==a&&(d=this.opts.formatSelection(a,c,this.opts.escapeMarkup)),d!==b&&c.append(d),e=this.opts.formatSelectionCssClass(a,c),e!==b&&c.addClass(e),this.selection.removeClass("select2-default"),this.opts.allowClear&&this.getPlaceholder()!==b&&this.container.addClass("select2-allowclear")},val:function(){var a,c=!1,d=null,e=this,f=this.data();if(0===arguments.length)return this.opts.element.val();if(a=arguments[0],arguments.length>1&&(c=arguments[1],this.opts.debug&&console&&console.warn&&console.warn('Select2: The second option to `select2("val")` is not supported in Select2 4.0.0. The `change` event will always be triggered in 4.0.0.')),this.select)this.opts.debug&&console&&console.warn&&console.warn('Select2: Setting the value on a <select> using `select2("val")` is no longer supported in 4.0.0. You can use the `.val(newValue).trigger("change")` method provided by jQuery instead.'),this.select.val(a).find("option").filter(function(){return this.selected}).each2(function(a,b){return d=e.optionToData(b),!1}),this.updateSelection(d),this.setPlaceholder(),c&&this.triggerChange({added:d,removed:f});else{if(!a&&0!==a)return void this.clear(c);if(this.opts.initSelection===b)throw new Error("cannot call val() if initSelection() is not defined");this.opts.element.val(a),this.opts.initSelection(this.opts.element,function(a){e.opts.element.val(a?e.id(a):""),e.updateSelection(a),e.setPlaceholder(),c&&e.triggerChange({added:a,removed:f})})}},clearSearch:function(){this.search.val(""),this.focusser.val("")},data:function(a){var c,d=!1;return 0===arguments.length?(c=this.selection.data("select2-data"),c==b&&(c=null),c):(this.opts.debug&&console&&console.warn&&console.warn('Select2: The `select2("data")` method can no longer set selected values in 4.0.0, consider using the `.val()` method instead.'),arguments.length>1&&(d=arguments[1]),a?(c=this.data(),this.opts.element.val(a?this.id(a):""),this.updateSelection(a),d&&this.triggerChange({added:a,removed:c})):this.clear(d),void 0)}}),e=O(c,{createContainer:function(){var b=a(document.createElement("div")).attr({"class":"select2-container select2-container-multi"}).html(["<ul class='select2-choices'>","  <li class='select2-search-field'>","    <label for='' class='select2-offscreen'></label>","    <input type='text' autocomplete='off' autocorrect='off' autocapitalize='off' spellcheck='false' class='select2-input'>","  </li>","</ul>","<div class='select2-drop select2-drop-multi select2-display-none'>","   <ul class='select2-results'>","   </ul>","</div>"].join(""));return b},prepareOpts:function(){var b=this.parent.prepareOpts.apply(this,arguments),c=this;return"select"===b.element.get(0).tagName.toLowerCase()?b.initSelection=function(a,b){var d=[];a.find("option").filter(function(){return this.selected&&!this.disabled}).each2(function(a,b){d.push(c.optionToData(b))}),b(d)}:"data"in b&&(b.initSelection=b.initSelection||function(c,d){var e=s(c.val(),b.separator,b.transformVal),f=[];b.query({matcher:function(c,d,g){var h=a.grep(e,function(a){return r(a,b.id(g))}).length;return h&&f.push(g),h},callback:a.isFunction(d)?function(){for(var a=[],c=0;c<e.length;c++)for(var g=e[c],h=0;h<f.length;h++){var i=f[h];if(r(g,b.id(i))){a.push(i),f.splice(h,1);break}}d(a)}:a.noop})}),b},selectChoice:function(a){var b=this.container.find(".select2-search-choice-focus");b.length&&a&&a[0]==b[0]||(b.length&&this.opts.element.trigger("choice-deselected",b),b.removeClass("select2-search-choice-focus"),a&&a.length&&(this.close(),a.addClass("select2-search-choice-focus"),this.opts.element.trigger("choice-selected",a)))},destroy:function(){a("label[for='"+this.search.attr("id")+"']").attr("for",this.opts.element.attr("id")),this.parent.destroy.apply(this,arguments),N.call(this,"searchContainer","selection")},initContainer:function(){var c,b=".select2-choices";this.searchContainer=this.container.find(".select2-search-field"),this.selection=c=this.container.find(b);var d=this;this.selection.on("click",".select2-container:not(.select2-container-disabled) .select2-search-choice:not(.select2-locked)",function(b){d.search[0].focus(),d.selectChoice(a(this))}),this.search.attr("id","s2id_autogen"+f()),this.search.prev().text(a("label[for='"+this.opts.element.attr("id")+"']").text()).attr("for",this.search.attr("id")),this.opts.element.on("focus.select2",this.bind(function(){this.focus()})),this.search.on("input paste",this.bind(function(){this.search.attr("placeholder")&&0==this.search.val().length||this.isInterfaceEnabled()&&(this.opened()||this.open())})),this.search.attr("tabindex",this.elementTabIndex),this.keydowns=0,this.search.on("keydown",this.bind(function(a){if(this.isInterfaceEnabled()){++this.keydowns;var b=c.find(".select2-search-choice-focus"),d=b.prev(".select2-search-choice:not(.select2-locked)"),e=b.next(".select2-search-choice:not(.select2-locked)"),f=z(this.search);if(b.length&&(a.which==k.LEFT||a.which==k.RIGHT||a.which==k.BACKSPACE||a.which==k.DELETE||a.which==k.ENTER)){var g=b;return a.which==k.LEFT&&d.length?g=d:a.which==k.RIGHT?g=e.length?e:null:a.which===k.BACKSPACE?this.unselect(b.first())&&(this.search.width(10),g=d.length?d:e):a.which==k.DELETE?this.unselect(b.first())&&(this.search.width(10),g=e.length?e:null):a.which==k.ENTER&&(g=null),this.selectChoice(g),A(a),void(g&&g.length||this.open())}if((a.which===k.BACKSPACE&&1==this.keydowns||a.which==k.LEFT)&&0==f.offset&&!f.length)return this.selectChoice(c.find(".select2-search-choice:not(.select2-locked)").last()),void A(a);if(this.selectChoice(null),this.opened())switch(a.which){case k.UP:case k.DOWN:return this.moveHighlight(a.which===k.UP?-1:1),void A(a);case k.ENTER:return this.selectHighlighted(),void A(a);case k.TAB:return this.selectHighlighted({noFocus:!0}),void this.close();case k.ESC:return this.cancel(a),void A(a)}if(a.which!==k.TAB&&!k.isControl(a)&&!k.isFunctionKey(a)&&a.which!==k.BACKSPACE&&a.which!==k.ESC){if(a.which===k.ENTER){if(this.opts.openOnEnter===!1)return;if(a.altKey||a.ctrlKey||a.shiftKey||a.metaKey)return}this.open(),(a.which===k.PAGE_UP||a.which===k.PAGE_DOWN)&&A(a),a.which===k.ENTER&&A(a)}}})),this.search.on("keyup",this.bind(function(a){this.keydowns=0,this.resizeSearch()})),this.search.on("blur",this.bind(function(b){this.container.removeClass("select2-container-active"),this.search.removeClass("select2-focused"),this.selectChoice(null),this.opened()||this.clearSearch(),b.stopImmediatePropagation(),this.opts.element.trigger(a.Event("select2-blur"))})),this.container.on("click",b,this.bind(function(b){this.isInterfaceEnabled()&&(a(b.target).closest(".select2-search-choice").length>0||(this.selectChoice(null),this.clearPlaceholder(),this.container.hasClass("select2-container-active")||this.opts.element.trigger(a.Event("select2-focus")),this.open(),this.focusSearch(),b.preventDefault()))})),this.container.on("focus",b,this.bind(function(){this.isInterfaceEnabled()&&(this.container.hasClass("select2-container-active")||this.opts.element.trigger(a.Event("select2-focus")),this.container.addClass("select2-container-active"),this.dropdown.addClass("select2-drop-active"),this.clearPlaceholder())})),this.initContainerWidth(),this.opts.element.hide(),this.clearSearch()},enableInterface:function(){this.parent.enableInterface.apply(this,arguments)&&this.search.prop("disabled",!this.isInterfaceEnabled())},initSelection:function(){if(""===this.opts.element.val()&&""===this.opts.element.text()&&(this.updateSelection([]),this.close(),this.clearSearch()),this.select||""!==this.opts.element.val()){var c=this;this.opts.initSelection.call(null,this.opts.element,function(a){a!==b&&null!==a&&(c.updateSelection(a),c.close(),c.clearSearch())})}},clearSearch:function(){var a=this.getPlaceholder(),c=this.getMaxSearchWidth();a!==b&&0===this.getVal().length&&this.search.hasClass("select2-focused")===!1?(this.search.val(a).addClass("select2-default"),this.search.width(c>0?c:this.container.css("width"))):this.search.val("").width(10)},clearPlaceholder:function(){this.search.hasClass("select2-default")&&this.search.val("").removeClass("select2-default")},opening:function(){this.clearPlaceholder(),this.resizeSearch(),this.parent.opening.apply(this,arguments),this.focusSearch(),this.prefillNextSearchTerm(),this.updateResults(!0),this.opts.shouldFocusInput(this)&&this.search.focus(),this.opts.element.trigger(a.Event("select2-open"))},close:function(){this.opened()&&this.parent.close.apply(this,arguments)},focus:function(){this.close(),this.search.focus()},isFocused:function(){return this.search.hasClass("select2-focused")},updateSelection:function(b){var c={},d=[],e=this;a(b).each(function(){e.id(this)in c||(c[e.id(this)]=0,d.push(this))}),this.selection.find(".select2-search-choice").remove(),this.addSelectedChoice(d),e.postprocessResults()},tokenize:function(){var a=this.search.val();a=this.opts.tokenizer.call(this,a,this.data(),this.bind(this.onSelect),this.opts),null!=a&&a!=b&&(this.search.val(a),a.length>0&&this.open())},onSelect:function(a,b){this.triggerSelect(a)&&""!==a.text&&(this.addSelectedChoice(a),this.opts.element.trigger({type:"selected",val:this.id(a),choice:a}),this.lastSearchTerm=this.search.val(),this.clearSearch(),this.updateResults(),(this.select||!this.opts.closeOnSelect)&&this.postprocessResults(a,!1,this.opts.closeOnSelect===!0),this.opts.closeOnSelect?(this.close(),this.search.width(10)):this.countSelectableResults()>0?(this.search.width(10),this.resizeSearch(),this.getMaximumSelectionSize()>0&&this.val().length>=this.getMaximumSelectionSize()?this.updateResults(!0):this.prefillNextSearchTerm()&&this.updateResults(),this.positionDropdown()):(this.close(),this.search.width(10)),this.triggerChange({added:a}),b&&b.noFocus||this.focusSearch())},cancel:function(){this.close(),this.focusSearch()},addSelectedChoice:function(b){var c=this.getVal(),d=this;a(b).each(function(){c.push(d.createChoice(this))}),this.setVal(c)},createChoice:function(c){var i,j,d=!c.locked,e=a("<li class='select2-search-choice'>    <div></div>    <a href='#' class='select2-search-choice-close' tabindex='-1'></a></li>"),f=a("<li class='select2-search-choice select2-locked'><div></div></li>"),g=d?e:f,h=this.id(c);return i=this.opts.formatSelection(c,g.find("div"),this.opts.escapeMarkup),i!=b&&g.find("div").replaceWith(a("<div></div>").html(i)),j=this.opts.formatSelectionCssClass(c,g.find("div")),j!=b&&g.addClass(j),d&&g.find(".select2-search-choice-close").on("mousedown",A).on("click dblclick",this.bind(function(b){this.isInterfaceEnabled()&&(this.unselect(a(b.target)),this.selection.find(".select2-search-choice-focus").removeClass("select2-search-choice-focus"),A(b),this.close(),this.focusSearch())})).on("focus",this.bind(function(){this.isInterfaceEnabled()&&(this.container.addClass("select2-container-active"),this.dropdown.addClass("select2-drop-active"))})),g.data("select2-data",c),g.insertBefore(this.searchContainer),h},unselect:function(b){var d,e,c=this.getVal();if(b=b.closest(".select2-search-choice"),0===b.length)throw"Invalid argument: "+b+". Must be .select2-search-choice";if(d=b.data("select2-data")){var f=a.Event("select2-removing");if(f.val=this.id(d),f.choice=d,this.opts.element.trigger(f),f.isDefaultPrevented())return!1;for(;(e=p(this.id(d),c))>=0;)c.splice(e,1),this.setVal(c),this.select&&this.postprocessResults();return b.remove(),this.opts.element.trigger({type:"select2-removed",val:this.id(d),choice:d}),this.triggerChange({removed:d}),!0}},postprocessResults:function(a,b,c){var d=this.getVal(),e=this.results.find(".select2-result"),f=this.results.find(".select2-result-with-children"),g=this;e.each2(function(a,b){var c=g.id(b.data("select2-data"));p(c,d)>=0&&(b.addClass("select2-selected"),b.find(".select2-result-selectable").addClass("select2-selected"))}),f.each2(function(a,b){b.is(".select2-result-selectable")||0!==b.find(".select2-result-selectable:not(.select2-selected)").length||b.addClass("select2-selected")}),-1==this.highlight()&&c!==!1&&this.opts.closeOnSelect===!0&&g.highlight(0),!this.opts.createSearchChoice&&!e.filter(".select2-result:not(.select2-selected)").length>0&&(!a||a&&!a.more&&0===this.results.find(".select2-no-results").length)&&J(g.opts.formatNoMatches,"formatNoMatches")&&this.results.append("<li class='select2-no-results'>"+K(g.opts.formatNoMatches,g.opts.element,g.search.val())+"</li>")},getMaxSearchWidth:function(){return this.selection.width()-t(this.search)},resizeSearch:function(){var a,b,c,d,e,f=t(this.search);a=C(this.search)+10,b=this.search.offset().left,c=this.selection.width(),d=this.selection.offset().left,e=c-(b-d)-f,a>e&&(e=c-f),40>e&&(e=c-f),0>=e&&(e=a),this.search.width(Math.floor(e))},getVal:function(){var a;return this.select?(a=this.select.val(),null===a?[]:a):(a=this.opts.element.val(),s(a,this.opts.separator,this.opts.transformVal))},setVal:function(b){if(this.select)this.select.val(b);else{var c=[],d={};a(b).each(function(){this in d||(c.push(this),d[this]=0)}),this.opts.element.val(0===c.length?"":c.join(this.opts.separator))}},buildChangeDetails:function(a,b){
-for(var b=b.slice(0),a=a.slice(0),c=0;c<b.length;c++)for(var d=0;d<a.length;d++)if(r(this.opts.id(b[c]),this.opts.id(a[d]))){b.splice(c,1),c--,a.splice(d,1);break}return{added:b,removed:a}},val:function(c,d){var e,f=this;if(0===arguments.length)return this.getVal();if(e=this.data(),e.length||(e=[]),!c&&0!==c)return this.opts.element.val(""),this.updateSelection([]),this.clearSearch(),void(d&&this.triggerChange({added:this.data(),removed:e}));if(this.setVal(c),this.select)this.opts.initSelection(this.select,this.bind(this.updateSelection)),d&&this.triggerChange(this.buildChangeDetails(e,this.data()));else{if(this.opts.initSelection===b)throw new Error("val() cannot be called if initSelection() is not defined");this.opts.initSelection(this.opts.element,function(b){var c=a.map(b,f.id);f.setVal(c),f.updateSelection(b),f.clearSearch(),d&&f.triggerChange(f.buildChangeDetails(e,f.data()))})}this.clearSearch()},onSortStart:function(){if(this.select)throw new Error("Sorting of elements is not supported when attached to <select>. Attach to <input type='hidden'/> instead.");this.search.width(0),this.searchContainer.hide()},onSortEnd:function(){var b=[],c=this;this.searchContainer.show(),this.searchContainer.appendTo(this.searchContainer.parent()),this.resizeSearch(),this.selection.find(".select2-search-choice").each(function(){b.push(c.opts.id(a(this).data("select2-data")))}),this.setVal(b),this.triggerChange()},data:function(b,c){var e,f,d=this;return 0===arguments.length?this.selection.children(".select2-search-choice").map(function(){return a(this).data("select2-data")}).get():(f=this.data(),b||(b=[]),e=a.map(b,function(a){return d.opts.id(a)}),this.setVal(e),this.updateSelection(b),this.clearSearch(),c&&this.triggerChange(this.buildChangeDetails(f,this.data())),void 0)}}),a.fn.select2=function(){var d,e,f,g,h,c=Array.prototype.slice.call(arguments,0),i=["val","destroy","opened","open","close","focus","isFocused","container","dropdown","onSortStart","onSortEnd","enable","disable","readonly","positionDropdown","data","search"],j=["opened","isFocused","container","dropdown"],k=["val","data"],l={search:"externalSearch"};return this.each(function(){if(0===c.length||"object"==typeof c[0])d=0===c.length?{}:a.extend({},c[0]),d.element=a(this),"select"===d.element.get(0).tagName.toLowerCase()?h=d.element.prop("multiple"):(h=d.multiple||!1,"tags"in d&&(d.multiple=h=!0)),e=h?new window.Select2["class"].multi:new window.Select2["class"].single,e.init(d);else{if("string"!=typeof c[0])throw"Invalid arguments to select2 plugin: "+c;if(p(c[0],i)<0)throw"Unknown method: "+c[0];if(g=b,e=a(this).data("select2"),e===b)return;if(f=c[0],"container"===f?g=e.container:"dropdown"===f?g=e.dropdown:(l[f]&&(f=l[f]),g=e[f].apply(e,c.slice(1))),p(c[0],j)>=0||p(c[0],k)>=0&&1==c.length)return!1}}),g===b?this:g},a.fn.select2.defaults={debug:!1,width:"copy",loadMorePadding:0,closeOnSelect:!0,openOnEnter:!0,containerCss:{},dropdownCss:{},containerCssClass:"",dropdownCssClass:"",formatResult:function(a,b,c,d){var e=[];return E(this.text(a),c.term,e,d),e.join("")},transformVal:function(b){return a.trim(b)},formatSelection:function(a,c,d){return a?d(this.text(a)):b},sortResults:function(a,b,c){return a},formatResultCssClass:function(a){return a.css},formatSelectionCssClass:function(a,c){return b},minimumResultsForSearch:0,minimumInputLength:0,maximumInputLength:null,maximumSelectionSize:0,id:function(a){return a==b?null:a.id},text:function(b){return b&&this.data&&this.data.text?a.isFunction(this.data.text)?this.data.text(b):b[this.data.text]:b.text},matcher:function(a,b){return o(""+b).toUpperCase().indexOf(o(""+a).toUpperCase())>=0},separator:",",tokenSeparators:[],tokenizer:M,escapeMarkup:F,blurOnChange:!1,selectOnBlur:!1,adaptContainerCssClass:function(a){return a},adaptDropdownCssClass:function(a){return null},nextSearchTerm:function(a,c){return b},searchInputPlaceholder:"",createSearchChoicePosition:"top",shouldFocusInput:function(a){var b="ontouchstart"in window||navigator.msMaxTouchPoints>0;return b&&a.opts.minimumResultsForSearch<0?!1:!0}},a.fn.select2.locales=[],a.fn.select2.locales.en={formatMatches:function(a){return 1===a?"One result is available, press enter to select it.":a+" results are available, use up and down arrow keys to navigate."},formatNoMatches:function(){return"No matches found"},formatAjaxError:function(a,b,c){return"Loading failed"},formatInputTooShort:function(a,b){var c=b-a.length;return"Please enter "+c+" or more character"+(1==c?"":"s")},formatInputTooLong:function(a,b){var c=a.length-b;return"Please delete "+c+" character"+(1==c?"":"s")},formatSelectionTooBig:function(a){return"You can only select "+a+" item"+(1==a?"":"s")},formatLoadMore:function(a){return"Loading more results\u2026"},formatSearching:function(){return"Searching\u2026"}},a.extend(a.fn.select2.defaults,a.fn.select2.locales.en),a.fn.select2.ajaxDefaults={transport:a.ajax,params:{type:"GET",cache:!1,dataType:"json"}},window.Select2={query:{ajax:G,local:H,tags:I},util:{debounce:w,markMatch:E,escapeMarkup:F,stripDiacritics:o},"class":{"abstract":c,single:d,multi:e}}}}(jQuery);
\ No newline at end of file
diff --git a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_ar.js b/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_ar.js
deleted file mode 100644
index e991b726c..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_ar.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * Select2 Arabic translation.
- *
- * Author: Adel KEDJOUR <adel@kedjour.com>
- */
-(function ($) {
-    "use strict";
-
-    $.fn.select2.locales['ar'] = {
-        formatNoMatches: function () { return "لم يتم العثور على مطابقات"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; if (n == 1){ return "الرجاء إدخال حرف واحد على الأكثر"; } return n == 2 ? "الرجاء إدخال حرفين على الأكثر" : "الرجاء إدخال " + n + " على الأكثر"; },
-        formatInputTooLong: function (input, max) { var n = input.length - max; if (n == 1){ return "الرجاء إدخال حرف واحد على الأقل"; } return n == 2 ? "الرجاء إدخال حرفين على الأقل" : "الرجاء إدخال " + n + " على الأقل "; },
-        formatSelectionTooBig: function (limit) { if (limit == 1){ return "يمكنك أن تختار إختيار واحد فقط"; } return limit == 2 ? "يمكنك أن تختار إختيارين فقط" : "يمكنك أن تختار " + limit + " إختيارات فقط"; },
-        formatLoadMore: function (pageNumber) { return "تحميل المزيد من النتائج…"; },
-        formatSearching: function () { return "البحث…"; }
-    };
-
-    $.extend($.fn.select2.defaults, $.fn.select2.locales['ar']);
-})(jQuery);
diff --git a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_az.js b/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_az.js
deleted file mode 100644
index 19fd95b7a..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_az.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * Select2 Azerbaijani translation.
- *
- * Author: Farhad Safarov <farhad.safarov@gmail.com>
- */
-(function ($) {
-    "use strict";
-
-     $.fn.select2.locales['az'] = {
-        formatMatches: function (matches) { return matches + " nəticə mövcuddur, hərəkət etdirmək üçün yuxarı və aşağı düymələrindən istifadə edin."; },
-        formatNoMatches: function () { return "Nəticə tapılmadı"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return n + " simvol daxil edin"; },
-        formatInputTooLong: function (input, max) { var n = input.length - max; return n + " simvol silin"; },
-        formatSelectionTooBig: function (limit) { return "Sadəcə " + limit + " element seçə bilərsiniz"; },
-        formatLoadMore: function (pageNumber) { return "Daha çox nəticə yüklənir…"; },
-        formatSearching: function () { return "Axtarılır…"; }
-    };
-
-    $.extend($.fn.select2.defaults, $.fn.select2.locales['az']);
-})(jQuery);
diff --git a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_bg.js b/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_bg.js
deleted file mode 100644
index 3283d0ae5..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_bg.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * Select2 Bulgarian translation.
- * 
- * @author  Lubomir Vikev <lubomirvikev@gmail.com>
- * @author  Uriy Efremochkin <efremochkin@uriy.me>
- */
-(function ($) {
-    "use strict";
-
-    $.fn.select2.locales['bg'] = {
-        formatNoMatches: function () { return "Няма намерени съвпадения"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "Моля въведете още " + n + " символ" + (n > 1 ? "а" : ""); },
-        formatInputTooLong: function (input, max) { var n = input.length - max; return "Моля въведете с " + n + " по-малко символ" + (n > 1 ? "а" : ""); },
-        formatSelectionTooBig: function (limit) { return "Можете да направите до " + limit + (limit > 1 ? " избора" : " избор"); },
-        formatLoadMore: function (pageNumber) { return "Зареждат се още…"; },
-        formatSearching: function () { return "Търсене…"; }
-    };
-
-    $.extend($.fn.select2.defaults, $.fn.select2.locales['bg']);
-})(jQuery);
diff --git a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_ca.js b/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_ca.js
deleted file mode 100644
index dbea39e93..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_ca.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * Select2 Catalan translation.
- * 
- * Author: David Planella <david.planella@gmail.com>
- */
-(function ($) {
-    "use strict";
-
-    $.fn.select2.locales['ca'] = {
-        formatNoMatches: function () { return "No s'ha trobat cap coincidència"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "Introduïu " + n + " caràcter" + (n == 1 ? "" : "s") + " més"; },
-        formatInputTooLong: function (input, max) { var n = input.length - max; return "Introduïu " + n + " caràcter" + (n == 1? "" : "s") + "menys"; },
-        formatSelectionTooBig: function (limit) { return "Només podeu seleccionar " + limit + " element" + (limit == 1 ? "" : "s"); },
-        formatLoadMore: function (pageNumber) { return "S'estan carregant més resultats…"; },
-        formatSearching: function () { return "S'està cercant…"; }
-    };
-
-    $.extend($.fn.select2.defaults, $.fn.select2.locales['ca']);
-})(jQuery);
diff --git a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_cs.js b/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_cs.js
deleted file mode 100644
index ef1218564..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_cs.js
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * Select2 Czech translation.
- * 
- * Author: Michal Marek <ahoj@michal-marek.cz>
- * Author - sklonovani: David Vallner <david@vallner.net>
- */
-(function ($) {
-    "use strict";
-    // use text for the numbers 2 through 4
-    var smallNumbers = {
-        2: function(masc) { return (masc ? "dva" : "dvě"); },
-        3: function() { return "tři"; },
-        4: function() { return "čtyři"; }
-    }
-    $.fn.select2.locales['cs'] = {
-        formatNoMatches: function () { return "Nenalezeny žádné položky"; },
-        formatInputTooShort: function (input, min) {
-            var n = min - input.length;
-            if (n == 1) {
-                return "Prosím zadejte ještě jeden znak";
-            } else if (n <= 4) {
-                return "Prosím zadejte ještě další "+smallNumbers[n](true)+" znaky";
-            } else {
-                return "Prosím zadejte ještě dalších "+n+" znaků";
-            }
-        },
-        formatInputTooLong: function (input, max) {
-            var n = input.length - max;
-            if (n == 1) {
-                return "Prosím zadejte o jeden znak méně";
-            } else if (n <= 4) {
-                return "Prosím zadejte o "+smallNumbers[n](true)+" znaky méně";
-            } else {
-                return "Prosím zadejte o "+n+" znaků méně";
-            }
-        },
-        formatSelectionTooBig: function (limit) {
-            if (limit == 1) {
-                return "Můžete zvolit jen jednu položku";
-            } else if (limit <= 4) {
-                return "Můžete zvolit maximálně "+smallNumbers[limit](false)+" položky";
-            } else {
-                return "Můžete zvolit maximálně "+limit+" položek";
-            }
-        },
-        formatLoadMore: function (pageNumber) { return "Načítají se další výsledky…"; },
-        formatSearching: function () { return "Vyhledávání…"; }
-    };
-
-	$.extend($.fn.select2.defaults, $.fn.select2.locales['cs']);
-})(jQuery);
diff --git a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_da.js b/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_da.js
deleted file mode 100644
index 702238b9a..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_da.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * Select2 Danish translation.
- *
- * Author: Anders Jenbo <anders@jenbo.dk>
- */
-(function ($) {
-    "use strict";
-
-    $.fn.select2.locales['da'] = {
-        formatNoMatches: function () { return "Ingen resultater fundet"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "Angiv venligst " + n + " tegn mere"; },
-        formatInputTooLong: function (input, max) { var n = input.length - max; return "Angiv venligst " + n + " tegn mindre"; },
-        formatSelectionTooBig: function (limit) { return "Du kan kun vælge " + limit + " emne" + (limit === 1 ? "" : "r"); },
-        formatLoadMore: function (pageNumber) { return "Indlæser flere resultater…"; },
-        formatSearching: function () { return "Søger…"; }
-    };
-
-    $.extend($.fn.select2.defaults, $.fn.select2.locales['da']);
-})(jQuery);
diff --git a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_de.js b/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_de.js
deleted file mode 100644
index e27541720..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_de.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * Select2 German translation
- */
-(function ($) {
-    "use strict";
-
-    $.fn.select2.locales['de'] = {
-        formatNoMatches: function () { return "Keine Übereinstimmungen gefunden"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "Bitte " + n + " Zeichen mehr eingeben"; },
-        formatInputTooLong: function (input, max) { var n = input.length - max; return "Bitte " + n + " Zeichen weniger eingeben"; },
-        formatSelectionTooBig: function (limit) { return "Sie können nur " + limit + " Eintr" + (limit === 1 ? "ag" : "äge") + " auswählen"; },
-        formatLoadMore: function (pageNumber) { return "Lade mehr Ergebnisse…"; },
-        formatSearching: function () { return "Suche…"; },
-        formatMatches: function (matches) { return matches + " Ergebnis " + (matches > 1 ? "se" : "") + " verfügbar, zum Navigieren die Hoch-/Runter-Pfeiltasten verwenden."; }
-    };
-
-    $.extend($.fn.select2.defaults, $.fn.select2.locales['de']);
-})(jQuery);
\ No newline at end of file
diff --git a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_el.js b/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_el.js
deleted file mode 100644
index d17459e1d..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_el.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * Select2 Greek translation.
- * 
- * @author  Uriy Efremochkin <efremochkin@uriy.me>
- */
-(function ($) {
-    "use strict";
-
-    $.fn.select2.locales['el'] = {
-        formatNoMatches: function () { return "Δεν βρέθηκαν αποτελέσματα"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "Παρακαλούμε εισάγετε " + n + " περισσότερο" + (n > 1 ? "υς" : "") + " χαρακτήρ" + (n > 1 ? "ες" : "α"); },
-        formatInputTooLong: function (input, max) { var n = input.length - max; return "Παρακαλούμε διαγράψτε " + n + " χαρακτήρ" + (n > 1 ? "ες" : "α"); },
-        formatSelectionTooBig: function (limit) { return "Μπορείτε να επιλέξετε μόνο " + limit + " αντικείμεν" + (limit > 1 ? "α" : "ο"); },
-        formatLoadMore: function (pageNumber) { return "Φόρτωση περισσότερων…"; },
-        formatSearching: function () { return "Αναζήτηση…"; }
-    };
-
-    $.extend($.fn.select2.defaults, $.fn.select2.locales['el']);
-})(jQuery);
\ No newline at end of file
diff --git a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_es.js b/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_es.js
deleted file mode 100644
index 92a19861e..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_es.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * Select2 Spanish translation
- */
-(function ($) {
-    "use strict";
-
-    $.fn.select2.locales['es'] = {
-    	formatMatches: function (matches) { if (matches === 1) { return "Un resultado disponible, presione enter para seleccionarlo."; } return matches + " resultados disponibles, use las teclas de dirección para navegar."; },
-        formatNoMatches: function () { return "No se encontraron resultados"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "Por favor, introduzca " + n + " car" + (n == 1? "ácter" : "acteres"); },
-        formatInputTooLong: function (input, max) { var n = input.length - max; return "Por favor, elimine " + n + " car" + (n == 1? "ácter" : "acteres"); },
-        formatSelectionTooBig: function (limit) { return "Sólo puede seleccionar " + limit + " elemento" + (limit == 1 ? "" : "s"); },
-        formatLoadMore: function (pageNumber) { return "Cargando más resultados…"; },
-        formatSearching: function () { return "Buscando…"; },
-        formatAjaxError: function() { return "La carga falló"; }
-    };
-
-    $.extend($.fn.select2.defaults, $.fn.select2.locales['es']);
-})(jQuery);
diff --git a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_et.js b/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_et.js
deleted file mode 100644
index 4d69f55e3..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_et.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * Select2 Estonian translation.
- *
- * Author: Kuldar Kalvik <kuldar@kalvik.ee>
- */
-(function ($) {
-    "use strict";
-
-    $.fn.select2.locales['et'] = {
-        formatNoMatches: function () { return "Tulemused puuduvad"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "Sisesta " + n + " täht" + (n == 1 ? "" : "e") + " rohkem"; },
-        formatInputTooLong: function (input, max) { var n = input.length - max; return "Sisesta " + n + " täht" + (n == 1? "" : "e") + " vähem"; },
-        formatSelectionTooBig: function (limit) { return "Saad vaid " + limit + " tulemus" + (limit == 1 ? "e" : "t") + " valida"; },
-        formatLoadMore: function (pageNumber) { return "Laen tulemusi.."; },
-        formatSearching: function () { return "Otsin.."; }
-    };
-
-    $.extend($.fn.select2.defaults, $.fn.select2.locales['et']);
-})(jQuery);
diff --git a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_eu.js b/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_eu.js
deleted file mode 100644
index 67ae8d05a..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_eu.js
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * Select2 Basque translation.
- *
- * Author: Julen Ruiz Aizpuru <julenx at gmail dot com>
- */
-(function ($) {
-    "use strict";
-
-    $.fn.select2.locales['eu'] = {
-        formatNoMatches: function () {
-          return "Ez da bat datorrenik aurkitu";
-        },
-        formatInputTooShort: function (input, min) {
-          var n = min - input.length;
-          if (n === 1) {
-            return "Idatzi karaktere bat gehiago";
-          } else {
-            return "Idatzi " + n + " karaktere gehiago";
-          }
-        },
-        formatInputTooLong: function (input, max) {
-          var n = input.length - max;
-          if (n === 1) {
-            return "Idatzi karaktere bat gutxiago";
-          } else {
-            return "Idatzi " + n + " karaktere gutxiago";
-          }
-        },
-        formatSelectionTooBig: function (limit) {
-          if (limit === 1 ) {
-            return "Elementu bakarra hauta dezakezu";
-          } else {
-            return limit + " elementu hauta ditzakezu soilik";
-          }
-        },
-        formatLoadMore: function (pageNumber) {
-          return "Emaitza gehiago kargatzen…";
-        },
-        formatSearching: function () {
-          return "Bilatzen…";
-        }
-    };
-
-    $.extend($.fn.select2.defaults, $.fn.select2.locales['eu']);
-})(jQuery);
diff --git a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_fa.js b/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_fa.js
deleted file mode 100644
index b3ffd8b7d..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_fa.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * Select2 Persian translation.
- * 
- * Author: Ali Choopan <choopan@arsh.co>
- * Author: Ebrahim Byagowi <ebrahim@gnu.org>
- */
-(function ($) {
-    "use strict";
-
-    $.fn.select2.locales['fa'] = {
-        formatMatches: function (matches) { return matches + " نتیجه موجود است، کلیدهای جهت بالا و پایین را برای گشتن استفاده کنید."; },
-        formatNoMatches: function () { return "نتیجه‌ای یافت نشد."; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "لطفاً " + n + " نویسه بیشتر وارد نمایید"; },
-        formatInputTooLong: function (input, max) { var n = input.length - max; return "لطفاً " + n + " نویسه را حذف کنید."; },
-        formatSelectionTooBig: function (limit) { return "شما فقط می‌توانید " + limit + " مورد را انتخاب کنید"; },
-        formatLoadMore: function (pageNumber) { return "در حال بارگیری موارد بیشتر…"; },
-        formatSearching: function () { return "در حال جستجو…"; }
-    };
-
-    $.extend($.fn.select2.defaults, $.fn.select2.locales['fa']);
-})(jQuery);
diff --git a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_fi.js b/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_fi.js
deleted file mode 100644
index 6487fbdad..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_fi.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * Select2 Finnish translation
- */
-(function ($) {
-    "use strict";
-    $.fn.select2.locales['fi'] = {
-        formatNoMatches: function () {
-            return "Ei tuloksia";
-        },
-        formatInputTooShort: function (input, min) {
-            var n = min - input.length;
-            return "Ole hyvä ja anna " + n + " merkkiä lisää";
-        },
-        formatInputTooLong: function (input, max) {
-            var n = input.length - max;
-            return "Ole hyvä ja anna " + n + " merkkiä vähemmän";
-        },
-        formatSelectionTooBig: function (limit) {
-            return "Voit valita ainoastaan " + limit + " kpl";
-        },
-        formatLoadMore: function (pageNumber) {
-            return "Ladataan lisää tuloksia…";
-        },
-        formatSearching: function () {
-            return "Etsitään…";
-        }
-    };
-
-    $.extend($.fn.select2.defaults, $.fn.select2.locales['fi']);
-})(jQuery);
diff --git a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_fr.js b/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_fr.js
deleted file mode 100644
index d5485d6be..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_fr.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * Select2 French translation
- */
-(function ($) {
-    "use strict";
-
-    $.fn.select2.locales['fr'] = {
-        formatMatches: function (matches) { return matches + " résultats sont disponibles, utilisez les flèches haut et bas pour naviguer."; },
-        formatNoMatches: function () { return "Aucun résultat trouvé"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "Saisissez " + n + " caractère" + (n == 1? "" : "s") + " supplémentaire" + (n == 1? "" : "s") ; },
-        formatInputTooLong: function (input, max) { var n = input.length - max; return "Supprimez " + n + " caractère" + (n == 1? "" : "s"); },
-        formatSelectionTooBig: function (limit) { return "Vous pouvez seulement sélectionner " + limit + " élément" + (limit == 1 ? "" : "s"); },
-        formatLoadMore: function (pageNumber) { return "Chargement de résultats supplémentaires…"; },
-        formatSearching: function () { return "Recherche en cours…"; }
-    };
-
-    $.extend($.fn.select2.defaults, $.fn.select2.locales['fr']);
-})(jQuery);
diff --git a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_gl.js b/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_gl.js
deleted file mode 100644
index 9335167da..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_gl.js
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * Select2 Galician translation
- * 
- * Author: Leandro Regueiro <leandro.regueiro@gmail.com>
- */
-(function ($) {
-    "use strict";
-
-    $.fn.select2.locales['gl'] = {
-        formatNoMatches: function () {
-            return "Non se atoparon resultados";
-        },
-        formatInputTooShort: function (input, min) {
-            var n = min - input.length;
-            if (n === 1) {
-                return "Engada un carácter";
-            } else {
-                return "Engada " + n + " caracteres";
-            }
-        },
-        formatInputTooLong: function (input, max) {
-            var n = input.length - max;
-            if (n === 1) {
-                return "Elimine un carácter";
-            } else {
-                return "Elimine " + n + " caracteres";
-            }
-        },
-        formatSelectionTooBig: function (limit) {
-            if (limit === 1 ) {
-                return "Só pode seleccionar un elemento";
-            } else {
-                return "Só pode seleccionar " + limit + " elementos";
-            }
-        },
-        formatLoadMore: function (pageNumber) {
-            return "Cargando máis resultados…";
-        },
-        formatSearching: function () {
-            return "Buscando…";
-        }
-    };
-
-    $.extend($.fn.select2.defaults, $.fn.select2.locales['gl']);
-})(jQuery);
diff --git a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_he.js b/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_he.js
deleted file mode 100644
index 789dcdcaa..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_he.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
-* Select2 Hebrew translation.
-*
-* Author: Yakir Sitbon <http://www.yakirs.net/>
-*/
-(function ($) {
-    "use strict";
-
-    $.fn.select2.locales['he'] = {
-        formatNoMatches: function () { return "לא נמצאו התאמות"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "נא להזין עוד " + n + " תווים נוספים"; },
-        formatInputTooLong: function (input, max) { var n = input.length - max; return "נא להזין פחות " + n + " תווים"; },
-        formatSelectionTooBig: function (limit) { return "ניתן לבחור " + limit + " פריטים"; },
-        formatLoadMore: function (pageNumber) { return "טוען תוצאות נוספות…"; },
-        formatSearching: function () { return "מחפש…"; }
-    };
-
-    $.extend($.fn.select2.defaults, $.fn.select2.locales['he']);
-})(jQuery);
diff --git a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_hr.js b/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_hr.js
deleted file mode 100644
index ce8051c78..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_hr.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * Select2 Croatian translation.
- *
- * @author  Edi Modrić <edi.modric@gmail.com>
- * @author  Uriy Efremochkin <efremochkin@uriy.me>
- */
-(function ($) {
-    "use strict";
-
-    $.fn.select2.locales['hr'] = {
-        formatNoMatches: function () { return "Nema rezultata"; },
-        formatInputTooShort: function (input, min) { return "Unesite još" + character(min - input.length); },
-        formatInputTooLong: function (input, max) { return "Unesite" + character(input.length - max) + " manje"; },
-        formatSelectionTooBig: function (limit) { return "Maksimalan broj odabranih stavki je " + limit; },
-        formatLoadMore: function (pageNumber) { return "Učitavanje rezultata…"; },
-        formatSearching: function () { return "Pretraga…"; }
-    };
-
-    $.extend($.fn.select2.defaults, $.fn.select2.locales['hr']);
-
-    function character (n) {
-        return " " + n + " znak" + (n%10 < 5 && n%10 > 0 && (n%100 < 5 || n%100 > 19) ? n%10 > 1 ? "a" : "" : "ova");
-    }
-})(jQuery);
diff --git a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_hu.js b/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_hu.js
deleted file mode 100644
index f431f2463..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_hu.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Select2 Hungarian translation
- */
-(function ($) {
-    "use strict";
-
-    $.fn.select2.locales['hu'] = {
-        formatNoMatches: function () { return "Nincs találat."; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "Túl rövid. Még " + n + " karakter hiányzik."; },
-        formatInputTooLong: function (input, max) { var n = input.length - max; return "Túl hosszú. " + n + " karakterrel több, mint kellene."; },
-        formatSelectionTooBig: function (limit) { return "Csak " + limit + " elemet lehet kiválasztani."; },
-        formatLoadMore: function (pageNumber) { return "Töltés…"; },
-        formatSearching: function () { return "Keresés…"; }
-    };
-
-    $.extend($.fn.select2.defaults, $.fn.select2.locales['hu']);
-})(jQuery);
diff --git a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_id.js b/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_id.js
deleted file mode 100644
index e7ea0ac62..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_id.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * Select2 Indonesian translation.
- * 
- * Author: Ibrahim Yusuf <ibrahim7usuf@gmail.com>
- * Author: Salahuddin Hairai <mr.od3n@gmail.com>
- */
-(function ($) {
-    "use strict";
-
-    $.fn.select2.locales['id'] = {
-        formatMatches: function (matches) { if (matches === 1) { return "Satu keputusan ditemui, tekan enter untuk memilih."; } return matches + " keputusan ditemui, gunakan kekunci anak panah ke atas dan ke bawah untuk menavigasi."; },
-        formatNoMatches: function () { return "Tidak ada data yang sesuai"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "Masukkan " + n + " huruf lagi"; },
-        formatInputTooLong: function (input, max) { var n = input.length - max; return "Hapuskan " + n + " huruf" ; },
-        formatSelectionTooBig: function (limit) { return "Anda hanya dapat memilih " + limit + " pilihan"; },
-        formatLoadMore: function (pageNumber) { return "Mengambil data…"; },
-        formatSearching: function () { return "Mencari…"; }
-    };
-
-    $.extend($.fn.select2.defaults, $.fn.select2.locales['id']);
-})(jQuery);
diff --git a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_is.js b/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_is.js
deleted file mode 100644
index 273f33de8..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_is.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Select2 Icelandic translation.
- */
-(function ($) {
-    "use strict";
-
-    $.fn.select2.locales['is'] = {
-        formatNoMatches: function () { return "Ekkert fannst"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "Vinsamlegast skrifið " + n + " staf" + (n > 1 ? "i" : "") + " í viðbót"; },
-        formatInputTooLong: function (input, max) { var n = input.length - max; return "Vinsamlegast styttið texta um " + n + " staf" + (n > 1 ? "i" : ""); },
-        formatSelectionTooBig: function (limit) { return "Þú getur aðeins valið " + limit + " atriði"; },
-        formatLoadMore: function (pageNumber) { return "Sæki fleiri niðurstöður…"; },
-        formatSearching: function () { return "Leita…"; }
-    };
-
-    $.extend($.fn.select2.defaults, $.fn.select2.locales['is']);
-})(jQuery);
diff --git a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_it.js b/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_it.js
deleted file mode 100644
index 6e2b8e237..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_it.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Select2 Italian translation
- */
-(function ($) {
-    "use strict";
-
-    $.fn.select2.locales['it'] = {
-        formatNoMatches: function () { return "Nessuna corrispondenza trovata"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "Inserisci ancora " + n + " caratter" + (n == 1? "e" : "i"); },
-        formatInputTooLong: function (input, max) { var n = input.length - max; return "Inserisci " + n + " caratter" + (n == 1? "e" : "i") + " in meno"; },
-        formatSelectionTooBig: function (limit) { return "Puoi selezionare solo " + limit + " element" + (limit == 1 ? "o" : "i"); },
-        formatLoadMore: function (pageNumber) { return "Caricamento in corso…"; },
-        formatSearching: function () { return "Ricerca…"; }
-    };
-
-    $.extend($.fn.select2.defaults, $.fn.select2.locales['it']);
-})(jQuery);
\ No newline at end of file
diff --git a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_ja.js b/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_ja.js
deleted file mode 100644
index 7dbd8d7ee..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_ja.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Select2 Japanese translation.
- */
-(function ($) {
-    "use strict";
-
-    $.fn.select2.locales['ja'] = {
-        formatNoMatches: function () { return "該当なし"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "後" + n + "文字入れてください"; },
-        formatInputTooLong: function (input, max) { var n = input.length - max; return "検索文字列が" + n + "文字長すぎます"; },
-        formatSelectionTooBig: function (limit) { return "最多で" + limit + "項目までしか選択できません"; },
-        formatLoadMore: function (pageNumber) { return "読込中･･･"; },
-        formatSearching: function () { return "検索中･･･"; }
-    };
-
-    $.extend($.fn.select2.defaults, $.fn.select2.locales['ja']);
-})(jQuery);
diff --git a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_ka.js b/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_ka.js
deleted file mode 100644
index 6cbe1d8f3..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_ka.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * Select2 Georgian (Kartuli) translation.
- * 
- * Author: Dimitri Kurashvili dimakura@gmail.com
- */
-(function ($) {
-    "use strict";
-
-    $.fn.select2.locales['ka'] = {
-        formatNoMatches: function () { return "ვერ მოიძებნა"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "გთხოვთ შეიყვანოთ კიდევ " + n + " სიმბოლო"; },
-        formatInputTooLong: function (input, max) { var n = input.length - max; return "გთხოვთ წაშალოთ " + n + " სიმბოლო"; },
-        formatSelectionTooBig: function (limit) { return "თქვენ შეგიძლიათ მხოლოდ " + limit + " ჩანაწერის მონიშვნა"; },
-        formatLoadMore: function (pageNumber) { return "შედეგის ჩატვირთვა…"; },
-        formatSearching: function () { return "ძებნა…"; }
-    };
-
-    $.extend($.fn.select2.defaults, $.fn.select2.locales['ka']);
-})(jQuery);
diff --git a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_ko.js b/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_ko.js
deleted file mode 100644
index bf036e09e..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_ko.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * Select2 Korean translation.
- * 
- * @author  Swen Mun <longfinfunnel@gmail.com>
- */
-(function ($) {
-    "use strict";
-
-    $.fn.select2.locales['ko'] = {
-        formatNoMatches: function () { return "결과 없음"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "너무 짧습니다. "+n+"글자 더 입력해주세요."; },
-        formatInputTooLong: function (input, max) { var n = input.length - max; return "너무 깁니다. "+n+"글자 지워주세요."; },
-        formatSelectionTooBig: function (limit) { return "최대 "+limit+"개까지만 선택하실 수 있습니다."; },
-        formatLoadMore: function (pageNumber) { return "불러오는 중…"; },
-        formatSearching: function () { return "검색 중…"; }
-    };
-
-    $.extend($.fn.select2.defaults, $.fn.select2.locales['ko']);
-})(jQuery);
diff --git a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_lt.js b/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_lt.js
deleted file mode 100644
index 7d7040f72..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_lt.js
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * Select2 Lithuanian translation.
- * 
- * @author  CRONUS Karmalakas <cronus dot karmalakas at gmail dot com>
- * @author  Uriy Efremochkin <efremochkin@uriy.me>
- */
-(function ($) {
-    "use strict";
-
-    $.fn.select2.locales['lt'] = {
-        formatNoMatches: function () { return "Atitikmenų nerasta"; },
-        formatInputTooShort: function (input, min) { return "Įrašykite dar" + character(min - input.length); },
-        formatInputTooLong: function (input, max) { return "Pašalinkite" + character(input.length - max); },
-        formatSelectionTooBig: function (limit) {
-        	return "Jūs galite pasirinkti tik " + limit + " element" + ((limit%100 > 9 && limit%100 < 21) || limit%10 == 0 ? "ų" : limit%10 > 1 ? "us" : "ą");
-        },
-        formatLoadMore: function (pageNumber) { return "Kraunama daugiau rezultatų…"; },
-        formatSearching: function () { return "Ieškoma…"; }
-    };
-
-    $.extend($.fn.select2.defaults, $.fn.select2.locales['lt']);
-
-    function character (n) {
-        return " " + n + " simbol" + ((n%100 > 9 && n%100 < 21) || n%10 == 0 ? "ių" : n%10 > 1 ? "ius" : "į");
-    }
-})(jQuery);
diff --git a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_lv.js b/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_lv.js
deleted file mode 100644
index 4afc5b41c..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_lv.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * Select2 Latvian translation.
- *
- * @author  Uriy Efremochkin <efremochkin@uriy.me>
- */
-(function ($) {
-    "use strict";
-
-    $.fn.select2.locales['lv'] = {
-        formatNoMatches: function () { return "Sakritību nav"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "Lūdzu ievadiet vēl " + n + " simbol" + (n == 11 ? "us" : n%10 == 1 ? "u" : "us"); },
-        formatInputTooLong: function (input, max) { var n = input.length - max; return "Lūdzu ievadiet par " + n + " simbol" + (n == 11 ? "iem" : n%10 == 1 ? "u" : "iem") + " mazāk"; },
-        formatSelectionTooBig: function (limit) { return "Jūs varat izvēlēties ne vairāk kā " + limit + " element" + (limit == 11 ? "us" : limit%10 == 1 ? "u" : "us"); },
-        formatLoadMore: function (pageNumber) { return "Datu ielāde…"; },
-        formatSearching: function () { return "Meklēšana…"; }
-    };
-
-    $.extend($.fn.select2.defaults, $.fn.select2.locales['lv']);
-})(jQuery);
diff --git a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_mk.js b/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_mk.js
deleted file mode 100644
index 8a51a9e0b..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_mk.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * Select2 Macedonian translation.
- * 
- * Author: Marko Aleksic <psybaron@gmail.com>
- */
-(function ($) {
-    "use strict";
-
-    $.fn.select2.locales['mk'] = {
-        formatNoMatches: function () { return "Нема пронајдено совпаѓања"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "Ве молиме внесете уште " + n + " карактер" + (n == 1 ? "" : "и"); },
-        formatInputTooLong: function (input, max) { var n = input.length - max; return "Ве молиме внесете " + n + " помалку карактер" + (n == 1? "" : "и"); },
-        formatSelectionTooBig: function (limit) { return "Можете да изберете само " + limit + " ставк" + (limit == 1 ? "а" : "и"); },
-        formatLoadMore: function (pageNumber) { return "Вчитување резултати…"; },
-        formatSearching: function () { return "Пребарување…"; }
-    };
-
-    $.extend($.fn.select2.defaults, $.fn.select2.locales['mk']);
-})(jQuery);
\ No newline at end of file
diff --git a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_ms.js b/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_ms.js
deleted file mode 100644
index 6447c0899..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_ms.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * Select2 Malay translation.
- * 
- * Author: Kepoweran <kepoweran@gmail.com>
- * Author: Salahuddin Hairai <mr.od3n@gmail.com>
- */
-(function ($) {
-    "use strict";
-
-    $.fn.select2.locales['ms'] = {
-        formatMatches: function (matches) { if (matches === 1) { return "Satu keputusan ditemui, tekan enter untuk memilih."; } return matches + " keputusan ditemui, gunakan kekunci anak panah ke atas dan ke bawah untuk menavigasi."; },
-        formatNoMatches: function () { return "Tiada padanan yang ditemui"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "Sila masukkan " + n + " aksara lagi"; },
-        formatInputTooLong: function (input, max) { var n = input.length - max; return "Sila hapuskan " + n + " aksara"; },
-        formatSelectionTooBig: function (limit) { return "Anda hanya boleh memilih " + limit + " pilihan"; },
-        formatLoadMore: function (pageNumber) { return "Sedang memuatkan keputusan…"; },
-        formatSearching: function () { return "Mencari…"; }
-    };
-
-    $.extend($.fn.select2.defaults, $.fn.select2.locales['ms']);
-})(jQuery);
diff --git a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_nb.js b/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_nb.js
deleted file mode 100644
index cb5dfaeef..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_nb.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Select2 Norwegian Bokmål translation.
- *
- * Author: Torgeir Veimo <torgeir.veimo@gmail.com>
- * Author: Bjørn Johansen <post@bjornjohansen.no>
- */
-(function ($) {
-    "use strict";
-
-    $.fn.select2.locales['nb'] = {
-        formatMatches: function (matches) { if (matches === 1) { return "Ett resultat er tilgjengelig, trykk enter for å velge det."; } return matches + " resultater er tilgjengelig. Bruk piltastene opp og ned for å navigere."; },
-        formatNoMatches: function () { return "Ingen treff"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "Vennligst skriv inn " + n + (n>1 ? " flere tegn" : " tegn til"); },
-        formatInputTooLong: function (input, max) { var n = input.length - max; return "Vennligst fjern " + n + " tegn"; },
-        formatSelectionTooBig: function (limit) { return "Du kan velge maks " + limit + " elementer"; },
-        formatLoadMore: function (pageNumber) { return "Laster flere resultater …"; },
-        formatSearching: function () { return "Søker …"; }
-    };
-
-    $.extend($.fn.select2.defaults, $.fn.select2.locales['no']);
-})(jQuery);
-
diff --git a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_nl.js b/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_nl.js
deleted file mode 100644
index 985741ec2..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_nl.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Select2 Dutch translation
- */
-(function ($) {
-    "use strict";
-
-    $.fn.select2.locales['nl'] = {
-        formatNoMatches: function () { return "Geen resultaten gevonden"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "Vul nog " + n + " karakter" + (n == 1? "" : "s") + " in"; },
-        formatInputTooLong: function (input, max) { var n = input.length - max; return "Haal " + n + " karakter" + (n == 1? "" : "s") + " weg"; },
-        formatSelectionTooBig: function (limit) { return "Maximaal " + limit + " item" + (limit == 1 ? "" : "s") + " toegestaan"; },
-        formatLoadMore: function (pageNumber) { return "Meer resultaten laden…"; },
-        formatSearching: function () { return "Zoeken…"; }
-    };
-
-    $.extend($.fn.select2.defaults, $.fn.select2.locales['nl']);
-})(jQuery);
diff --git a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_pl.js b/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_pl.js
deleted file mode 100644
index 87c261941..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_pl.js
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * Select2 Polish translation.
- *
- * @author  Jan Kondratowicz <jan@kondratowicz.pl>
- * @author  Uriy Efremochkin <efremochkin@uriy.me>
- * @author  Michał Połtyn <mike@poltyn.com>
- * @author  Damian Zajkowski <damian.zajkowski@gmail.com>
- */
-(function($) {
-    "use strict";
-
-    $.fn.select2.locales['pl'] = {
-        formatNoMatches: function() {
-            return "Brak wyników";
-        },
-        formatInputTooShort: function(input, min) {
-            return "Wpisz co najmniej" + character(min - input.length, "znak", "i");
-        },
-        formatInputTooLong: function(input, max) {
-            return "Wpisana fraza jest za długa o" + character(input.length - max, "znak", "i");
-        },
-        formatSelectionTooBig: function(limit) {
-            return "Możesz zaznaczyć najwyżej" + character(limit, "element", "y");
-        },
-        formatLoadMore: function(pageNumber) {
-            return "Ładowanie wyników…";
-        },
-        formatSearching: function() {
-            return "Szukanie…";
-        }
-    };
-
-    $.extend($.fn.select2.defaults, $.fn.select2.locales['pl']);
-
-    function character(n, word, pluralSuffix) {
-        //Liczba pojedyncza - brak suffiksu
-        //jeden znak
-        //jeden element
-        var suffix = '';
-        if (n > 1 && n < 5) {
-            //Liczaba mnoga ilość od 2 do 4 - własny suffiks
-            //Dwa znaki, trzy znaki, cztery znaki.
-            //Dwa elementy, trzy elementy, cztery elementy
-            suffix = pluralSuffix;
-        } else if (n == 0 || n >= 5) {
-            //Ilość 0 suffiks ów
-            //Liczaba mnoga w ilości 5 i więcej - suffiks ów (nie poprawny dla wszystkich wyrazów, np. 100 wiadomości)
-            //Zero znaków, Pięć znaków, sześć znaków, siedem znaków, osiem znaków.
-            //Zero elementów Pięć elementów, sześć elementów, siedem elementów, osiem elementów.
-            suffix = 'ów';
-        }
-        return " " + n + " " + word + suffix;
-    }
-})(jQuery);
diff --git a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_pt-BR.js b/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_pt-BR.js
deleted file mode 100644
index 51b037de5..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_pt-BR.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * Select2 Brazilian Portuguese translation
- */
-(function ($) {
-    "use strict";
-
-    $.fn.select2.locales['pt-BR'] = {
-        formatNoMatches: function () { return "Nenhum resultado encontrado"; },
-        formatAjaxError: function () { return "Erro na busca"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "Digite " + (min == 1 ? "" : "mais") + " " + n + " caracter" + (n == 1? "" : "es"); },
-        formatInputTooLong: function (input, max) { var n = input.length - max; return "Apague " + n + " caracter" + (n == 1? "" : "es"); },
-        formatSelectionTooBig: function (limit) { return "Só é possível selecionar " + limit + " elemento" + (limit == 1 ? "" : "s"); },
-        formatLoadMore: function (pageNumber) { return "Carregando mais resultados…"; },
-        formatSearching: function () { return "Buscando…"; }
-    };
-
-    $.extend($.fn.select2.defaults, $.fn.select2.locales['pt-BR']);
-})(jQuery);
diff --git a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_pt-PT.js b/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_pt-PT.js
deleted file mode 100644
index ae55a4fc4..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_pt-PT.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Select2 Portuguese (Portugal) translation
- */
-(function ($) {
-    "use strict";
-
-    $.fn.select2.locales['pt-PT'] = {
-        formatNoMatches: function () { return "Nenhum resultado encontrado"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "Introduza " + n + " car" + (n == 1 ? "ácter" : "acteres"); },
-        formatInputTooLong: function (input, max) { var n = input.length - max; return "Apague " + n + " car" + (n == 1 ? "ácter" : "acteres"); },
-        formatSelectionTooBig: function (limit) { return "Só é possível selecionar " + limit + " elemento" + (limit == 1 ? "" : "s"); },
-        formatLoadMore: function (pageNumber) { return "A carregar mais resultados…"; },
-        formatSearching: function () { return "A pesquisar…"; }
-    };
-
-    $.extend($.fn.select2.defaults, $.fn.select2.locales['pt-PT']);
-})(jQuery);
diff --git a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_ro.js b/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_ro.js
deleted file mode 100644
index 21b0cf181..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_ro.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Select2 Romanian translation.
- */
-(function ($) {
-    "use strict";
-
-    $.fn.select2.locales['ro'] = {
-        formatNoMatches: function () { return "Nu a fost găsit nimic"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "Vă rugăm să introduceți incă " + n + " caracter" + (n == 1 ? "" : "e"); },
-        formatInputTooLong: function (input, max) { var n = input.length - max; return "Vă rugăm să introduceți mai puțin de " + n + " caracter" + (n == 1? "" : "e"); },
-        formatSelectionTooBig: function (limit) { return "Aveți voie să selectați cel mult " + limit + " element" + (limit == 1 ? "" : "e"); },
-        formatLoadMore: function (pageNumber) { return "Se încarcă…"; },
-        formatSearching: function () { return "Căutare…"; }
-    };
-
-    $.extend($.fn.select2.defaults, $.fn.select2.locales['ro']);
-})(jQuery);
diff --git a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_rs.js b/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_rs.js
deleted file mode 100644
index 72c16389c..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_rs.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * Select2 Serbian translation.
- *
- * @author  Limon Monte <limon.monte@gmail.com>
- */
-(function ($) {
-    "use strict";
-
-    $.fn.select2.locales['rs'] = {
-        formatNoMatches: function () { return "Ništa nije pronađeno"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "Ukucajte bar još " + n + " simbol" + (n % 10 == 1 && n % 100 != 11 ? "" : "a"); },
-        formatInputTooLong: function (input, max) { var n = input.length - max; return "Obrišite " + n + " simbol" + (n % 10 == 1 && n % 100 != 11	 ? "" : "a"); },
-        formatSelectionTooBig: function (limit) { return "Možete izabrati samo " + limit + " stavk" + (limit % 10 == 1 && limit % 100 != 11	 ? "u" : (limit % 10 >= 2 && limit % 10 <= 4 && (limit % 100 < 12 || limit % 100 > 14)? "e" : "i")); },
-        formatLoadMore: function (pageNumber) { return "Preuzimanje još rezultata…"; },
-        formatSearching: function () { return "Pretraga…"; }
-    };
-
-    $.extend($.fn.select2.defaults, $.fn.select2.locales['rs']);
-})(jQuery);
diff --git a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_ru.js b/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_ru.js
deleted file mode 100644
index 2a6c7702c..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_ru.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * Select2 Russian translation.
- *
- * @author  Uriy Efremochkin <efremochkin@uriy.me>
- */
-(function ($) {
-    "use strict";
-
-    $.fn.select2.locales['ru'] = {
-        formatNoMatches: function () { return "Совпадений не найдено"; },
-        formatInputTooShort: function (input, min) { return "Пожалуйста, введите еще хотя бы" + character(min - input.length); },
-        formatInputTooLong: function (input, max) { return "Пожалуйста, введите на" + character(input.length - max) + " меньше"; },
-        formatSelectionTooBig: function (limit) { return "Вы можете выбрать не более " + limit + " элемент" + (limit%10 == 1 && limit%100 != 11 ? "а" : "ов"); },
-        formatLoadMore: function (pageNumber) { return "Загрузка данных…"; },
-        formatSearching: function () { return "Поиск…"; }
-    };
-
-    $.extend($.fn.select2.defaults, $.fn.select2.locales['ru']);
-
-    function character (n) {
-        return " " + n + " символ" + (n%10 < 5 && n%10 > 0 && (n%100 < 5 || n%100 > 20) ? n%10 > 1 ? "a" : "" : "ов");
-    }
-})(jQuery);
diff --git a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_sk.js b/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_sk.js
deleted file mode 100644
index 027530c93..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_sk.js
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * Select2 Slovak translation.
- *
- * Author: David Vallner <david@vallner.net>
- */
-(function ($) {
-    "use strict";
-    // use text for the numbers 2 through 4
-    var smallNumbers = {
-        2: function(masc) { return (masc ? "dva" : "dve"); },
-        3: function() { return "tri"; },
-        4: function() { return "štyri"; }
-    };
-    $.fn.select2.locales['sk'] = {
-        formatNoMatches: function () { return "Nenašli sa žiadne položky"; },
-        formatInputTooShort: function (input, min) {
-            var n = min - input.length;
-            if (n == 1) {
-                return "Prosím, zadajte ešte jeden znak";
-            } else if (n <= 4) {
-                return "Prosím, zadajte ešte ďalšie "+smallNumbers[n](true)+" znaky";
-            } else {
-                return "Prosím, zadajte ešte ďalších "+n+" znakov";
-            }
-        },
-        formatInputTooLong: function (input, max) {
-            var n = input.length - max;
-            if (n == 1) {
-                return "Prosím, zadajte o jeden znak menej";
-            } else if (n >= 2 && n <= 4) {
-                return "Prosím, zadajte o "+smallNumbers[n](true)+" znaky menej";
-            } else {
-                return "Prosím, zadajte o "+n+" znakov menej";
-            }
-        },
-        formatSelectionTooBig: function (limit) {
-            if (limit == 1) {
-                return "Môžete zvoliť len jednu položku";
-            } else if (limit >= 2 && limit <= 4) {
-                return "Môžete zvoliť najviac "+smallNumbers[limit](false)+" položky";
-            } else {
-                return "Môžete zvoliť najviac "+limit+" položiek";
-            }
-        },
-        formatLoadMore: function (pageNumber) { return "Načítavajú sa ďalšie výsledky…"; },
-        formatSearching: function () { return "Vyhľadávanie…"; }
-    };
-
-	$.extend($.fn.select2.defaults, $.fn.select2.locales['sk']);
-})(jQuery);
diff --git a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_sv.js b/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_sv.js
deleted file mode 100644
index 96f8c0a88..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_sv.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * Select2 Swedish translation.
- *
- * Author: Jens Rantil <jens.rantil@telavox.com>
- */
-(function ($) {
-    "use strict";
-
-    $.fn.select2.locales['sv'] = {
-        formatNoMatches: function () { return "Inga träffar"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "Var god skriv in " + n + (n>1 ? " till tecken" : " tecken till"); },
-        formatInputTooLong: function (input, max) { var n = input.length - max; return "Var god sudda ut " + n + " tecken"; },
-        formatSelectionTooBig: function (limit) { return "Du kan max välja " + limit + " element"; },
-        formatLoadMore: function (pageNumber) { return "Laddar fler resultat…"; },
-        formatSearching: function () { return "Söker…"; }
-    };
-
-    $.extend($.fn.select2.defaults, $.fn.select2.locales['sv']);
-})(jQuery);
diff --git a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_th.js b/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_th.js
deleted file mode 100644
index 7f3e6ef8c..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_th.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * Select2 Thai translation.
- *
- * Author: Atsawin Chaowanakritsanakul <joke@nakhon.net>
- */
-(function ($) {
-    "use strict";
-
-    $.fn.select2.locales['th'] = {
-        formatNoMatches: function () { return "ไม่พบข้อมูล"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "โปรดพิมพ์เพิ่มอีก " + n + " ตัวอักษร"; },
-        formatInputTooLong: function (input, max) { var n = input.length - max; return "โปรดลบออก " + n + " ตัวอักษร"; },
-        formatSelectionTooBig: function (limit) { return "คุณสามารถเลือกได้ไม่เกิน " + limit + " รายการ"; },
-        formatLoadMore: function (pageNumber) { return "กำลังค้นข้อมูลเพิ่ม…"; },
-        formatSearching: function () { return "กำลังค้นข้อมูล…"; }
-    };
-
-    $.extend($.fn.select2.defaults, $.fn.select2.locales['th']);
-})(jQuery);
diff --git a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_tr.js b/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_tr.js
deleted file mode 100644
index 2330bc205..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_tr.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * Select2 Turkish translation.
- * 
- * Author: Salim KAYABAŞI <salim.kayabasi@gmail.com>
- */
-(function ($) {
-    "use strict";
-
-    $.fn.select2.locales['tr'] = {
-        formatMatches: function (matches) { if (matches === 1) { return "Sadece bir sonuç bulundu, seçmek için enter tuşuna basabilirsiniz."; } return matches + " sonuç bulundu, yukarı ve aşağı tuşları ile seçebilirsiniz."; },
-        formatNoMatches: function () { return "Sonuç bulunamadı"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "En az " + n + " karakter daha girmelisiniz"; },
-        formatInputTooLong: function (input, max) { var n = input.length - max; return n + " karakter azaltmalısınız"; },
-        formatSelectionTooBig: function (limit) { return "Sadece " + limit + " seçim yapabilirsiniz"; },
-        formatLoadMore: function (pageNumber) { return "Daha fazla…"; },
-        formatSearching: function () { return "Aranıyor…"; }
-    };
-
-    $.extend($.fn.select2.defaults, $.fn.select2.locales['tr']);
-})(jQuery);
diff --git a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_ug-CN.js b/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_ug-CN.js
deleted file mode 100644
index 579588a7a..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_ug-CN.js
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * Select2 Uyghur translation
- */
-(function ($) {
-    "use strict";
-    $.fn.select2.locales['ug-CN'] = {
-        formatNoMatches: function () { return "ماس كېلىدىغان ئۇچۇر تېپىلمىدى"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "يەنە " + n + " ھەرپ كىرگۈزۈڭ";},
-        formatInputTooLong: function (input, max) { var n = input.length - max; return "" + n + "ھەرپ ئۆچۈرۈڭ";},
-        formatSelectionTooBig: function (limit) { return "ئەڭ كۆپ بولغاندا" + limit + " تال ئۇچۇر تاللىيالايسىز"; },
-        formatLoadMore: function (pageNumber) { return "ئۇچۇرلار ئوقۇلىۋاتىدۇ…"; },
-        formatSearching: function () { return "ئىزدەۋاتىدۇ…"; }
-    };
-
-    $.extend($.fn.select2.defaults, $.fn.select2.locales['ug-CN']);
-})(jQuery);
diff --git a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_uk.js b/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_uk.js
deleted file mode 100644
index b5bd0e02d..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_uk.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * Select2 Ukrainian translation.
- * 
- * @author  bigmihail <bigmihail@bigmir.net>
- * @author  Uriy Efremochkin <efremochkin@uriy.me>
- */
-(function ($) {
-    "use strict";
-
-    $.fn.select2.locales['uk'] = {
-        formatMatches: function (matches) { return character(matches, "результат") + " знайдено, використовуйте клавіші зі стрілками вверх та вниз для навігації."; },
-        formatNoMatches: function () { return "Нічого не знайдено"; },
-        formatInputTooShort: function (input, min) { return "Введіть буль ласка ще " + character(min - input.length, "символ"); },
-        formatInputTooLong: function (input, max) { return "Введіть буль ласка на " + character(input.length - max, "символ") + " менше"; },
-        formatSelectionTooBig: function (limit) { return "Ви можете вибрати лише " + character(limit, "елемент"); },
-        formatLoadMore: function (pageNumber) { return "Завантаження даних…"; },
-        formatSearching: function () { return "Пошук…"; }
-    };
-
-    $.extend($.fn.select2.defaults, $.fn.select2.locales['uk']);
-
-    function character (n, word) {
-        return n + " " + word + (n%10 < 5 && n%10 > 0 && (n%100 < 5 || n%100 > 19) ? n%10 > 1 ? "и" : "" : "ів");
-    }
-})(jQuery);
diff --git a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_vi.js b/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_vi.js
deleted file mode 100644
index 9517cb6bd..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_vi.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * Select2 Vietnamese translation.
- * 
- * Author: Long Nguyen <olragon@gmail.com>, Nguyen Chien Cong
- */
-(function ($) {
-    "use strict";
-
-    $.fn.select2.locales['vi'] = {
-        formatNoMatches: function () { return "Không tìm thấy kết quả"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "Vui lòng nhập nhiều hơn " + n + " ký tự"; },
-        formatInputTooLong: function (input, max) { var n = input.length - max; return "Vui lòng nhập ít hơn " + n + " ký tự"; },
-        formatSelectionTooBig: function (limit) { return "Chỉ có thể chọn được " + limit + " lựa chọn"; },
-        formatLoadMore: function (pageNumber) { return "Đang lấy thêm kết quả…"; },
-        formatSearching: function () { return "Đang tìm…"; }
-    };
-
-    $.extend($.fn.select2.defaults, $.fn.select2.locales['vi']);
-})(jQuery);
-
diff --git a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_zh-CN.js b/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_zh-CN.js
deleted file mode 100644
index e988dac1a..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_zh-CN.js
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * Select2 Chinese translation
- */
-(function ($) {
-    "use strict";
-    $.fn.select2.locales['zh-CN'] = {
-        formatNoMatches: function () { return "没有找到匹配项"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "请再输入" + n + "个字符";},
-        formatInputTooLong: function (input, max) { var n = input.length - max; return "请删掉" + n + "个字符";},
-        formatSelectionTooBig: function (limit) { return "你只能选择最多" + limit + "项"; },
-        formatLoadMore: function (pageNumber) { return "加载结果中…"; },
-        formatSearching: function () { return "搜索中…"; }
-    };
-
-    $.extend($.fn.select2.defaults, $.fn.select2.locales['zh-CN']);
-})(jQuery);
diff --git a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_zh-TW.js b/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_zh-TW.js
deleted file mode 100644
index 85dbd5afc..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/js/select2/select2_locale_zh-TW.js
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * Select2 Traditional Chinese translation
- */
-(function ($) {
-    "use strict";
-    $.fn.select2.locales['zh-TW'] = {
-        formatNoMatches: function () { return "沒有找到相符的項目"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "請再輸入" + n + "個字元";},
-        formatInputTooLong: function (input, max) { var n = input.length - max; return "請刪掉" + n + "個字元";},
-        formatSelectionTooBig: function (limit) { return "你只能選擇最多" + limit + "項"; },
-        formatLoadMore: function (pageNumber) { return "載入中…"; },
-        formatSearching: function () { return "搜尋中…"; }
-    };
-
-    $.extend($.fn.select2.defaults, $.fn.select2.locales['zh-TW']);
-})(jQuery);
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/breadcrumb/index.js b/src/Bundle/ChillMainBundle/Resources/public/lib/breadcrumb/index.js
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/breadcrumb/index.js
rename to src/Bundle/ChillMainBundle/Resources/public/lib/breadcrumb/index.js
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/breadcrumb/layout.scss b/src/Bundle/ChillMainBundle/Resources/public/lib/breadcrumb/layout.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/breadcrumb/layout.scss
rename to src/Bundle/ChillMainBundle/Resources/public/lib/breadcrumb/layout.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/lib/collection/collection.scss b/src/Bundle/ChillMainBundle/Resources/public/lib/collection/collection.scss
new file mode 100644
index 000000000..283f6c585
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/lib/collection/collection.scss
@@ -0,0 +1,25 @@
+div.chill-collection {
+   padding: 1em;
+
+   ul.list-entry {
+      list-style: none;
+      padding: 0;
+      margin-bottom: 1.5rem;
+
+      li.entry {
+         padding: 1em;
+         border: 1px solid var(--bs-chill-light-gray);
+         
+         &:nth-child(even) {
+            background-color: var(--bs-chill-light-gray);
+         }
+      }
+
+      button.remove-entry {
+         margin-left: 0.5rem;
+      }
+   }
+
+   button.add-entry {
+   }
+}
diff --git a/src/Bundle/ChillMainBundle/Resources/public/js/collection/collections.js b/src/Bundle/ChillMainBundle/Resources/public/lib/collection/index.js
similarity index 95%
rename from src/Bundle/ChillMainBundle/Resources/public/js/collection/collections.js
rename to src/Bundle/ChillMainBundle/Resources/public/lib/collection/index.js
index 395f24412..0a4955207 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/js/collection/collections.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/lib/collection/index.js
@@ -54,7 +54,7 @@ var handleAdd = function(button) {
         ;
     content = prototype.replace(new RegExp('__name__', 'g'), counter);
     entry.innerHTML = content;
-    entry.classList.add('chill-collection__list__entry');
+    entry.classList.add('entry');
     initializeRemove(collection, entry);
     collection.appendChild(entry);
     
@@ -75,7 +75,7 @@ var initializeRemove = function(collection, entry) {
         return;
     }
     
-    button.classList.add('sc-button', 'bt-delete', 'chill-collection__list__remove-entry');
+    button.classList.add('btn', 'btn-delete', 'remove-entry');
     button.textContent = content;
     
     button.addEventListener('click', function(e) {
@@ -110,6 +110,3 @@ window.addEventListener('load', function() {
         }
     }
 });
-
-
-
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/download-report/download-report.js b/src/Bundle/ChillMainBundle/Resources/public/lib/download-report/download-report.js
similarity index 97%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/download-report/download-report.js
rename to src/Bundle/ChillMainBundle/Resources/public/lib/download-report/download-report.js
index 1900c04cf..c7b7bb59a 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/modules/download-report/download-report.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/lib/download-report/download-report.js
@@ -46,7 +46,7 @@ var download_report = (url, container) => {
             extension = mime.extension(type);
 
             link.appendChild(document.createTextNode(download_text));
-            link.classList.add("sc-button", "btn-action");
+            link.classList.add("btn", "btn-action");
             link.href = content;
             link.download = alias;
             if (extension !== false) {
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/download-report/index.js b/src/Bundle/ChillMainBundle/Resources/public/lib/download-report/index.js
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/download-report/index.js
rename to src/Bundle/ChillMainBundle/Resources/public/lib/download-report/index.js
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/entity/comment_embeddable.scss b/src/Bundle/ChillMainBundle/Resources/public/lib/entity/comment_embeddable.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/entity/comment_embeddable.scss
rename to src/Bundle/ChillMainBundle/Resources/public/lib/entity/comment_embeddable.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/entity/index.js b/src/Bundle/ChillMainBundle/Resources/public/lib/entity/index.js
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/entity/index.js
rename to src/Bundle/ChillMainBundle/Resources/public/lib/entity/index.js
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/export-list/export-list.scss b/src/Bundle/ChillMainBundle/Resources/public/lib/export-list/export-list.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/export-list/export-list.scss
rename to src/Bundle/ChillMainBundle/Resources/public/lib/export-list/export-list.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/lib/export-list/index.js b/src/Bundle/ChillMainBundle/Resources/public/lib/export-list/index.js
new file mode 100644
index 000000000..49e1a5b20
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/lib/export-list/index.js
@@ -0,0 +1 @@
+require('./export-list.scss');
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/select_interactive_loading/index.js b/src/Bundle/ChillMainBundle/Resources/public/lib/select_interactive_loading/index.js
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/select_interactive_loading/index.js
rename to src/Bundle/ChillMainBundle/Resources/public/lib/select_interactive_loading/index.js
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/show_hide/index.js b/src/Bundle/ChillMainBundle/Resources/public/lib/show_hide/index.js
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/show_hide/index.js
rename to src/Bundle/ChillMainBundle/Resources/public/lib/show_hide/index.js
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/show_hide/show_hide.js b/src/Bundle/ChillMainBundle/Resources/public/lib/show_hide/show_hide.js
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/show_hide/show_hide.js
rename to src/Bundle/ChillMainBundle/Resources/public/lib/show_hide/show_hide.js
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/tabs/index.js b/src/Bundle/ChillMainBundle/Resources/public/lib/tabs/index.js
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/tabs/index.js
rename to src/Bundle/ChillMainBundle/Resources/public/lib/tabs/index.js
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/tabs/tabs.js b/src/Bundle/ChillMainBundle/Resources/public/lib/tabs/tabs.js
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/tabs/tabs.js
rename to src/Bundle/ChillMainBundle/Resources/public/lib/tabs/tabs.js
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/tabs/tabs.scss b/src/Bundle/ChillMainBundle/Resources/public/lib/tabs/tabs.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/tabs/tabs.scss
rename to src/Bundle/ChillMainBundle/Resources/public/lib/tabs/tabs.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/main.js b/src/Bundle/ChillMainBundle/Resources/public/main.js
deleted file mode 100644
index 41618d245..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/main.js
+++ /dev/null
@@ -1,39 +0,0 @@
-
-// import jQuery
-const $ = require('jquery');
-
-// create global $ and jQuery variables
-global.$ = global.jQuery = $;
-
-const select2 = require('select2');
-global.select2 = select2;
-
-// import js
-import {chill} from './js/chill.js';
-global.chill = chill;
-
-
-/*
- * load requirements in chill entrypoint
- */
-require('./scss/chillmain.scss');
-require('./css/chillmain.css');
-
-require('./js/collection/collections.js');
-
-// from node-modules
-require('select2/dist/css/select2.css');
-
-require('./modules/breadcrumb/index.js');
-require('./modules/download-report/index.js');
-require('./modules/select_interactive_loading/index.js');
-require('./modules/export-list/export-list.scss');
-require('./modules/entity/index.js');
-//require('./modules/tabs/index.js');
-
-/*
- * load img
- */
-require('./img/favicon.ico');
-require('./img/logo-chill-sans-slogan_white.png');
-require('./img/logo-chill-outil-accompagnement_white.png');
diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/_custom.scss b/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/_custom.scss
new file mode 100644
index 000000000..17ca68d49
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/_custom.scss
@@ -0,0 +1,284 @@
+/*
+ *  These custom styles will override bootstrap enabled stylesheets
+ */
+
+/// chill buttons
+@import 'custom/_buttons';
+
+// chill record_actions
+@import 'custom/_record_actions';
+
+/// titles 
+h1, h2, .h1, .h2 {
+   font-weight: $headings-font-weight + 200;
+}
+
+/// typography
+.open_sansbold {
+   font-weight: bold;
+}
+
+/// forms
+
+@mixin title_in_form {
+   font-size: 1.438em;
+   font-weight: 700;
+   width: 100%;
+   border-bottom: 3px solid $gray-200;
+   margin-bottom: 1em;
+   display: block;
+}
+
+.col-form-label {
+   padding-top: .5em;
+   padding-bottom: .5em;
+   font-weight: 700;
+   margin-bottom: .375em;
+}
+
+form {
+   /* avoid useless html in first level of the custom fields row loop in forms
+   * (better should to improve the loop)
+   */
+   & > div.container-fluid {
+      & > div.row > .parent {
+         padding: 0;
+         & div.cf-fields span.cf-title {
+            margin: 1em -15px 0;
+            width: calc(100% + 30px);
+            @include title_in_form;
+         }
+      }
+   }
+   fieldset {
+      margin-top: 1em;
+      & > legend {
+         @include title_in_form;
+      }
+   }
+   label {
+      display: inline;
+      &.required:after {
+         content: " *";
+         color: $red;
+      }
+   }
+}
+
+/// table 
+
+table.table-bordered {
+   thead, thead * {
+      border: 0 !important;
+      text-align: center;
+   }
+}
+
+/// chill elements of design 
+
+.sticky-form-buttons {
+   margin-top: 4em;
+   background-color: $beige;
+   position: sticky;
+   bottom: 0.3em;
+   text-align: center;
+   display: flex;
+   padding: 0.8em 1.6em;
+   border-radius: 0;
+}
+
+.chill-user-quote {
+   border-left: 10px solid $yellow;
+   margin: 1.5em 10px;
+   padding: 0.5em 15px;
+   quotes: "\201C" "\201D" "\2018" "\2019";
+   background-color: $gray-200;
+   blockquote {
+      border-left: 0.4em solid $gray-400;
+      padding-left: 0.9em;
+      margin-left: 0.9em;
+      font-style: italic;
+   }
+}
+
+div.chill_address {
+   div.chill_address_address {
+      margin: 0.7em 0;
+      font-size: 98%;
+      font-variant: small-caps;
+      p {
+         display: inline-block;
+         margin: 0 0 0 1.5em;
+         text-indent: -1.5em;
+      }
+   }
+}
+
+/// base layout positions
+
+body {
+   display: flex;
+   flex-direction: column;
+   min-height: 100vh;
+   footer {
+      margin-top: auto;
+   }
+}
+
+header {
+   nav.navbar {
+      padding: 0;
+      a.navbar-brand img {
+         height: 50px;
+         margin: 8px 0;
+      }
+      div.navbar-collapse {
+         float: right;
+      }
+      ul.navbar-nav {
+         display: flex;
+         align-items: stretch;
+         li.nav-item {
+            display: flex;
+            &.btn {
+               padding-top: 0;
+               padding-bottom: 0;
+            }
+            & > a {
+               align-self: center;
+            }
+            form.form-inline {
+               align-self: center;
+               display: flex;
+               input.form-control {
+                  align-self: center;
+                  height: 32px;
+               }
+            }
+         }
+      }
+      div.dropdown-menu {
+         margin: 0;
+         padding: 0;
+         border-radius: 0;
+         a.dropdown-item {
+            width: 120%;
+            border: 0;
+            border-bottom: 1px solid $gray-200;
+            font-size: smaller;
+            i { 
+               float: right; }
+            &:hover { 
+               color: $gray-500 !important; }
+         }
+      }
+      
+      // fullwidth menu when navbar is collapsed
+      @media (max-width: 767px) {
+         & {
+            position: relative; 
+         }
+         button.navbar-toggler {
+            float: right;
+         }
+         div.navbar-collapse {
+            float: none;
+            position: absolute;
+            top: 4em;
+            left: 0; 
+            right: 0;
+            z-index: 2;
+            padding: 1em;
+            border-top: 1px solid shade-color($primary, 25%);
+            ul.navbar-nav {
+               display: grid;
+               grid-template-areas: 
+                  "sear sear sear"
+                  "sect user lang";
+               li.nav-item {
+                  flex-direction: column;
+                  border: 0;
+                  a.nav-link {}
+                  &.navigation-search {
+                     grid-area: sear;
+                     margin-bottom: 1em;
+                     form {
+                        width: 100%;
+                        input.form-control {}
+                        button.btn {}
+                     }
+                  }
+                  &.nav-section  { grid-area: sect; } 
+                  &.nav-user     { grid-area: user; }
+                  &.nav-language { grid-area: lang; }
+               }
+               li.dropdown {
+                  &, & > * {
+                     background-color: transparent !important;
+                  }
+                  a.dropdown-toggle {}
+                  div.dropdown-menu {
+                     display: block;
+                     border: 0;
+                     a.dropdown-item {
+                        width: 100%;
+                        border: 0;
+                        border-top: 1px dotted $gray-200;
+                        background-color: transparent !important;
+                     }
+                  }
+               }   
+            }
+         }
+      }
+            
+   }
+}
+
+div.banner {
+   div.header-name, 
+   div.header-details {
+      div.row > div:first-child {
+         @media (min-width: 576px) { 
+            //margin-left: 1.5em;
+         }
+      }
+   }
+   a {
+      text-decoration: none;
+   }
+}
+
+div.vertical-menu {
+   border-radius: 0;
+   margin-top: 0.5rem;
+   a.list-group-item { 
+      background-color: $chill-yellow;
+      border: 0;
+      margin-bottom: 0.25rem;
+      &:hover {
+         background-color: tint-color($chill-yellow, 20%)
+      }
+   }
+}
+
+footer.footer {
+   background: $dark;
+   padding-top: 10px;
+   padding-bottom: 10px;
+   width: 100%;
+   p {
+      font-family: Open Sans;
+      font-weight: 300;
+      clear: both;
+      color: $white;
+      font-size: 0.9em;
+      line-height: 1.5em;
+      margin: auto;
+      max-width: 35em;
+      text-align: center;
+      a, a:hover {
+         text-decoration: underline;
+      }
+   }
+}
diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/bootstrap.scss b/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/bootstrap.scss
new file mode 100644
index 000000000..cf36a9a54
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/bootstrap.scss
@@ -0,0 +1,55 @@
+/*!
+ * Bootstrap v5.0.1 (https://getbootstrap.com/)
+ * Copyright 2011-2021 The Bootstrap Authors
+ * Copyright 2011-2021 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
+ *
+ * Enable / disable bootstrap assets
+ */
+
+// Bootstrap configuration files are shared with chill entrypoint
+@import "shared";
+
+// scss-docs-start import-stack
+// Layout & components
+@import "bootstrap/scss/root";
+@import "bootstrap/scss/reboot";
+@import "bootstrap/scss/type";
+@import "bootstrap/scss/images";
+@import "bootstrap/scss/containers";
+@import "bootstrap/scss/grid";
+@import "bootstrap/scss/tables";
+@import "bootstrap/scss/forms";
+@import "bootstrap/scss/buttons";
+@import "bootstrap/scss/transitions";
+@import "bootstrap/scss/dropdown";
+@import "bootstrap/scss/button-group";
+@import "bootstrap/scss/nav";
+@import "bootstrap/scss/navbar";
+@import "bootstrap/scss/card";
+@import "bootstrap/scss/accordion";
+@import "bootstrap/scss/breadcrumb";
+@import "bootstrap/scss/pagination";
+@import "bootstrap/scss/badge";
+@import "bootstrap/scss/alert";
+@import "bootstrap/scss/progress";
+@import "bootstrap/scss/list-group";
+@import "bootstrap/scss/close";
+@import "bootstrap/scss/toasts";
+@import "bootstrap/scss/modal";
+@import "bootstrap/scss/tooltip";
+@import "bootstrap/scss/popover";
+@import "bootstrap/scss/carousel";
+@import "bootstrap/scss/spinners";
+@import "bootstrap/scss/offcanvas";
+
+// Helpers
+@import "bootstrap/scss/helpers";
+
+// Utilities
+@import "bootstrap/scss/utilities/api";
+// scss-docs-end import-stack
+
+// CHILL custom
+@import "custom";
+@import "custom/_debug";
diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/custom/_buttons.scss b/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/custom/_buttons.scss
new file mode 100644
index 000000000..6264a3a95
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/custom/_buttons.scss
@@ -0,0 +1,103 @@
+/// buttons
+
+// adding special chill actions buttons
+$chill-theme-buttons: (
+   "submit":        $chill-green,
+   "save":          $chill-green,
+   "create":        $chill-green,
+   "new":           $chill-green,
+   "duplicate":     $chill-green,
+   "not-duplicate": $chill-green,
+   "reset":         $chill-red,
+   "delete":        $chill-red,
+   "danger":        $chill-red,
+   "remove":        $chill-red,
+   "action":        $chill-orange,
+   "edit":          $chill-orange,
+   "update":        $chill-orange,
+   "show":          $chill-blue,
+   "view":          $chill-blue,
+   "misc":          $chill-light-gray,
+   "cancel":        $chill-light-gray,
+);
+
+@each $button, $color in $chill-theme-buttons {
+  .btn-#{$button} {
+    @include button-variant($color, $color);
+  }
+}
+
+@each $button, $color in $chill-theme-buttons {
+  .btn-outline-#{$button} {
+    @include button-outline-variant($color);
+  }
+}
+
+.btn {
+   &.btn-submit,
+   &.btn-save,
+   &.btn-create,
+   &.btn-new,
+   &.btn-duplicate,
+   &.btn-not-duplicate,
+   &.btn-reset,
+   &.btn-delete,
+   &.btn-danger,
+   &.btn-remove,
+   &.btn-action,
+   &.btn-edit,
+   &.btn-update {
+       &, &:hover {
+          color: $light;
+       }
+   }
+}
+
+.btn {
+   &.btn-new::before,
+   &.btn-create::before,
+   &.btn-edit::before,
+   &.btn-update::before,
+   &.btn-show::before,
+   &.btn-view::before,
+   &.btn-save::before,
+   &.btn-duplicate::before,
+      &.btn-not-duplicate::before,
+      &.btn-submit::before,
+      &.btn-reset::before,
+      &.btn-action::before,
+   &.btn-delete::before,
+   &.btn-remove::before,
+   &.btn-cancel::before {
+      font: normal normal normal 14px/1 ForkAwesome;
+      margin-right: 0.5em;
+   }
+   &[class*='btn-']:empty {
+      &::before {
+         margin-right: 0;         
+      }
+   }
+}
+
+.btn {
+   &.btn-new::before,
+   &.btn-create::before    { content: "\f067"; } // fa-plus 
+   &.btn-edit::before, 
+   &.btn-update::before    { content: "\f040"; } // fa-pencil
+   &.btn-show::before, 
+   &.btn-view::before      { content: "\f06e"; } // fa-eye
+   &.btn-save::before      { content: "\f0c7"; } // fa-floppy-o
+   &.btn-duplicate::before { content: "\f24d"; } // fa-clone  // f0c5 fa-files-o
+   &.btn-delete::before    { content: "\f1f8"; } // fa-trash
+   &.btn-remove::before    { content: "\f00d"; } // fa-times
+   &.btn-cancel::before    { content: "\f060"; } // fa-arrow-left
+}
+
+
+/// fix text color on themes buttons
+.btn-success,
+.btn-warning {
+   &, &:hover {
+      color: $light;
+   }
+}
diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/custom/_debug.scss b/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/custom/_debug.scss
new file mode 100644
index 000000000..61d66e53d
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/custom/_debug.scss
@@ -0,0 +1,19 @@
+body {
+    position: relative;
+    div.responsive {
+        position: fixed;
+        top: 0;
+        left: 50%;
+        background-color: #4a4d50;
+        color: white;
+        padding: 0.5em;
+        z-index: 10000;
+
+        @media (max-width: 576px) { &::after { content: 'XS'; }}
+        @media (min-width: 576px) { &::after { content: 'SM'; }}
+        @media (min-width: 768px) { &::after { content: 'MD'; }}
+        @media (min-width: 992px) { &::after { content: 'LG'; }}
+        @media (min-width: 1200px) { &::after { content: 'XL'; }}
+        @media (min-width: 1400px) { &::after { content: 'XXL'; }}
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/custom/_record_actions.scss b/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/custom/_record_actions.scss
new file mode 100644
index 000000000..8ddc1b009
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/custom/_record_actions.scss
@@ -0,0 +1,86 @@
+ul.record_actions,
+ul.record_actions_column {
+   display: flex;
+   justify-content: flex-end;
+
+   &.record_actions--left {
+      justify-content: flex-start;
+   }
+   padding: 0.5em 0;
+   flex-wrap: wrap-reverse;
+
+   li {
+      display: inline-block;
+      list-style-type: none;
+      margin-right: 1em;
+      order: 99;
+
+      &:last-child {
+         margin-right: 0;
+      }
+   }
+
+   li.cancel {
+      order: 1;
+      margin-right: auto;
+   }
+}
+
+ul.record_actions {
+   flex-direction: row;
+}
+
+ul.record_actions_column {
+   flex-direction: column;
+}
+
+ul.record_actions.sticky-form-buttons {
+   padding-left: 1em;
+   padding-right: 1em;
+}
+
+// inside table exceptions
+table {
+
+   td ul.record_actions,
+   ul.record_actions_small {
+      li {
+         margin-right: 0.2em;
+      }
+   }
+
+   ul.record_actions {
+      margin: 0;
+      padding: 0.5em;
+   }
+}
+
+// inside alert exceptions
+div.alert.alert-with-actions {
+   display: flex;
+   flex-direction: row;
+
+   ul.record_actions {
+      display: flex;
+      flex-direction: column;
+      padding: 0;
+      margin: 0;
+
+      li:nth-child(1n+2) {
+         margin-top: 0.5rem;
+      }
+
+      li {
+         margin-right: 0;
+      }
+   }
+
+   @media screen and (max-width: 1050px) {
+      flex-direction: column;
+
+      ul.record_actions {
+         margin-top: 1rem;
+         text-align: center;
+      }
+   }
+}
diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/custom/_variables.scss b/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/custom/_variables.scss
new file mode 100644
index 000000000..dc2a722cf
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/custom/_variables.scss
@@ -0,0 +1,1475 @@
+// Variables
+//
+// Variables should follow the `$component-state-property-size` formula for
+// consistent naming. Ex: $nav-link-disabled-color and $modal-content-box-shadow-xs.
+
+// Color system
+
+// scss-docs-start gray-color-variables
+$white:    #fff !default;
+$gray-100: #f3f3f3 !default;
+$gray-200: #e6e6e6 !default;
+$gray-300: #dee2e6 !default;
+$gray-400: #ced4da !default;
+$gray-500: #b2b2b2 !default;
+$gray-600: #6c757d !default;
+$gray-700: #495057 !default;
+$gray-800: #333333 !default;
+$gray-900: #212529 !default;
+$black:    #111 !default;
+// scss-docs-end gray-color-variables
+
+// fusv-disable
+// scss-docs-start gray-colors-map
+$grays: (
+  "100": $gray-100,
+  "200": $gray-200,   /* = $chill-light-gray, $chill-gray */
+  "300": $gray-300,
+  "400": $gray-400,
+  "500": $gray-500,   /* = $chill-light-gray */
+  "600": $gray-600,
+  "700": $gray-700,
+  "800": $gray-800,   /* = $chill-dark-gray */
+  "900": $gray-900
+) !default;
+// scss-docs-end gray-colors-map
+// fusv-enable
+
+/*
+ *  CHILL Theme colors
+ *  (apply chill colors, add missing colors, trust in bootstrap grey scale)
+*/
+// scss-docs-start color-variables
+$blue:        #334d5c !default;
+$green:       #43b29d !default;
+$yellow:      #eec84a !default;
+$orange:      #e2793d !default;
+$red:         #df4949 !default;
+$pink:        #dd506d !default;
+$beige:       #cabb9f !default;
+// scss-docs-end color-variables
+
+// fusv-disable
+$blue-100: tint-color($blue, 80%) !default;
+$blue-200: tint-color($blue, 60%) !default;
+$blue-300: tint-color($blue, 40%) !default;
+$blue-400: tint-color($blue, 20%) !default;
+$blue-500: $blue !default;
+$blue-600: shade-color($blue, 20%) !default;
+$blue-700: shade-color($blue, 40%) !default;
+$blue-800: shade-color($blue, 60%) !default;
+$blue-900: shade-color($blue, 80%) !default;
+
+$beige-100: tint-color($beige, 80%) !default;
+$beige-200: tint-color($beige, 60%) !default;
+$beige-300: tint-color($beige, 40%) !default;
+$beige-400: tint-color($beige, 20%) !default;
+$beige-500: $beige !default;
+$beige-600: shade-color($beige, 20%) !default;
+$beige-700: shade-color($beige, 40%) !default;
+$beige-800: shade-color($beige, 60%) !default;
+$beige-900: shade-color($beige, 80%) !default;
+
+$pink-100: tint-color($pink, 80%) !default;
+$pink-200: tint-color($pink, 60%) !default;
+$pink-300: tint-color($pink, 40%) !default;
+$pink-400: tint-color($pink, 20%) !default;
+$pink-500: $pink !default;
+$pink-600: shade-color($pink, 20%) !default;
+$pink-700: shade-color($pink, 40%) !default;
+$pink-800: shade-color($pink, 60%) !default;
+$pink-900: shade-color($pink, 80%) !default;
+
+$red-100: tint-color($red, 80%) !default;
+$red-200: tint-color($red, 60%) !default;
+$red-300: tint-color($red, 40%) !default;
+$red-400: tint-color($red, 20%) !default;
+$red-500: $red !default;
+$red-600: shade-color($red, 20%) !default;
+$red-700: shade-color($red, 40%) !default;
+$red-800: shade-color($red, 60%) !default;
+$red-900: shade-color($red, 80%) !default;
+
+$orange-100: tint-color($orange, 80%) !default;
+$orange-200: tint-color($orange, 60%) !default;
+$orange-300: tint-color($orange, 40%) !default;
+$orange-400: tint-color($orange, 20%) !default;
+$orange-500: $orange !default;
+$orange-600: shade-color($orange, 20%) !default;
+$orange-700: shade-color($orange, 40%) !default;
+$orange-800: shade-color($orange, 60%) !default;
+$orange-900: shade-color($orange, 80%) !default;
+
+$yellow-100: tint-color($yellow, 80%) !default;
+$yellow-200: tint-color($yellow, 60%) !default;
+$yellow-300: tint-color($yellow, 40%) !default;
+$yellow-400: tint-color($yellow, 20%) !default;
+$yellow-500: $yellow !default;
+$yellow-600: shade-color($yellow, 20%) !default;
+$yellow-700: shade-color($yellow, 40%) !default;
+$yellow-800: shade-color($yellow, 60%) !default;
+$yellow-900: shade-color($yellow, 80%) !default;
+
+$green-100: tint-color($green, 80%) !default;
+$green-200: tint-color($green, 60%) !default;
+$green-300: tint-color($green, 40%) !default;
+$green-400: tint-color($green, 20%) !default;
+$green-500: $green !default;
+$green-600: shade-color($green, 20%) !default;
+$green-700: shade-color($green, 40%) !default;
+$green-800: shade-color($green, 60%) !default;
+$green-900: shade-color($green, 80%) !default;
+// fusv-enable
+
+// scss-docs-start colors-map
+$colors: (
+  "blue":       $blue,
+  "green":      $green,
+  "green-dark": $green-600,
+  "yellow":     $yellow,
+  "orange":     $orange,
+  "red":        $red,
+  "pink":       $pink,
+  "beige":      $beige,
+  "white":      $white,
+  "gray":       $gray-600,
+  "dark":       $gray-800,
+  "black":      $black
+) !default;
+// scss-docs-end colors-map
+
+// scss-docs-start theme-color-variables
+$primary:       $blue;
+$secondary:     $gray-500;
+$success:       $green;
+$info:          $yellow;
+$warning:       $orange;
+$danger:        $red;
+$light:         $gray-100;
+$dark:          $gray-800;
+$black:         $black;
+
+$chill-blue:         $blue;
+$chill-green:        $green;
+$chill-green-dark:   $green-600;
+$chill-orange:       $orange;
+$chill-yellow:       $yellow;
+$chill-red:          $red;
+$chill-beige:        $beige;
+$chill-pink:         $pink;
+$chill-gray:         $gray-600;
+$chill-dark-gray:    $gray-800;
+$chill-light-gray:   $gray-200;
+$chill-llight-gray:  $gray-100;     
+// scss-docs-end theme-color-variables
+
+// scss-docs-start theme-colors-map
+$theme-colors: (
+  "primary":    $primary,
+  "secondary":  $secondary,
+  "success":    $success,
+  "info":       $info,
+  "warning":    $warning,
+  "danger":     $danger,
+  "light":      $light,
+  "dark":       $dark,
+) !default;
+// scss-docs-end theme-colors-map
+
+$chill-colors: (  
+  "chill-blue":         $chill-blue,
+  "chill-green":        $chill-green,
+  "chill-green-dark":   $chill-green-dark,
+  "chill-orange":       $chill-orange,
+  "chill-yellow":       $chill-yellow,
+  "chill-red":          $chill-red,
+  "chill-beige":        $chill-beige,
+  "chill-pink":         $chill-pink,
+  "chill-gray":         $chill-gray,
+  "chill-dark-gray":    $chill-dark-gray,
+  "chill-light-gray":   $chill-light-gray,
+  "chill-llight-gray":  $chill-llight-gray,
+);
+
+// Merge the maps
+$theme-colors: map-merge($theme-colors, $chill-colors);
+
+// Chill color classes
+@each $color, $value in $chill-colors {
+  .#{$color} {
+    color: $value;
+  }
+}
+
+
+
+// The contrast ratio to reach against white, to determine if color changes from "light" to "dark". Acceptable values for WCAG 2.0 are 3, 4.5 and 7.
+// See https://www.w3.org/TR/WCAG20/#visual-audio-contrast-contrast
+$min-contrast-ratio:   4.5 !default;
+
+// Customize the light and dark text colors for use in our color contrast function.
+$color-contrast-dark:      $black !default;
+$color-contrast-light:     $white !default;
+
+// Characters which are escaped by the escape-svg function
+$escaped-characters: (
+  ("<", "%3c"),
+  (">", "%3e"),
+  ("#", "%23"),
+  ("(", "%28"),
+  (")", "%29"),
+) !default;
+
+// Options
+//
+// Quickly modify global styling by enabling or disabling optional features.
+
+$enable-caret:                true !default;
+$enable-rounded:              true !default;
+$enable-shadows:              false !default;
+$enable-gradients:            false !default;
+$enable-transitions:          true !default;
+$enable-reduced-motion:       true !default;
+$enable-smooth-scroll:        true !default;
+$enable-grid-classes:         true !default;
+$enable-button-pointers:      true !default;
+$enable-rfs:                  true !default;
+$enable-validation-icons:     true !default;
+$enable-negative-margins:     false !default;
+$enable-deprecation-messages: true !default;
+$enable-important-utilities:  true !default;
+
+// Prefix for :root CSS variables
+
+$variable-prefix:             bs- !default;
+
+// Gradient
+//
+// The gradient which is added to components if `$enable-gradients` is `true`
+// This gradient is also added to elements with `.bg-gradient`
+// scss-docs-start variable-gradient
+$gradient: linear-gradient(180deg, rgba($white, .15), rgba($white, 0)) !default;
+// scss-docs-end variable-gradient
+
+// Spacing
+//
+// Control the default styling of most Bootstrap elements by modifying these
+// variables. Mostly focused on spacing.
+// You can add more entries to the $spacers map, should you need more variation.
+
+// scss-docs-start spacer-variables-maps
+$spacer: 1rem !default;
+$spacers: (
+  0: 0,
+  1: $spacer / 4,
+  2: $spacer / 2,
+  3: $spacer,
+  4: $spacer * 1.5,
+  5: $spacer * 3,
+) !default;
+
+$negative-spacers: if($enable-negative-margins, negativify-map($spacers), null) !default;
+// scss-docs-end spacer-variables-maps
+
+// Position
+//
+// Define the edge positioning anchors of the position utilities.
+
+// scss-docs-start position-map
+$position-values: (
+  0: 0,
+  50: 50%,
+  100: 100%
+) !default;
+// scss-docs-end position-map
+
+// Body
+//
+// Settings for the `<body>` element.
+
+$body-bg:                   $white !default;
+$body-color:                $gray-900 !default;
+$body-text-align:           null !default;
+
+
+// Links
+//
+// Style anchor elements.
+
+$link-color:                              $primary !default;
+$link-decoration:                         underline !default;
+$link-shade-percentage:                   20% !default;
+$link-hover-color:                        shift-color($link-color, $link-shade-percentage) !default;
+$link-hover-decoration:                   null !default;
+
+$stretched-link-pseudo-element:           after !default;
+$stretched-link-z-index:                  1 !default;
+
+// Paragraphs
+//
+// Style p element.
+
+$paragraph-margin-bottom:   1rem !default;
+
+
+// Grid breakpoints
+//
+// Define the minimum dimensions at which your layout will change,
+// adapting to different screen sizes, for use in media queries.
+
+// scss-docs-start grid-breakpoints
+$grid-breakpoints: (
+  xs: 0,
+  sm: 576px,
+  md: 768px,
+  lg: 992px,
+  xl: 1200px,
+  xxl: 1400px
+) !default;
+// scss-docs-end grid-breakpoints
+
+@include _assert-ascending($grid-breakpoints, "$grid-breakpoints");
+@include _assert-starts-at-zero($grid-breakpoints, "$grid-breakpoints");
+
+
+// Grid containers
+//
+// Define the maximum width of `.container` for different screen sizes.
+
+// scss-docs-start container-max-widths
+$container-max-widths: (
+  sm: 540px,
+  md: 720px,
+  lg: 960px,
+  xl: 1140px,
+  xxl: 1320px
+) !default;
+// scss-docs-end container-max-widths
+
+@include _assert-ascending($container-max-widths, "$container-max-widths");
+
+
+// Grid columns
+//
+// Set the number of columns and specify the width of the gutters.
+
+$grid-columns:                12 !default;
+$grid-gutter-width:           1.5rem !default;
+$grid-row-columns:            6 !default;
+
+$gutters: $spacers !default;
+
+// Container padding
+
+$container-padding-x: $grid-gutter-width / 2 !default;
+
+
+// Components
+//
+// Define common padding and border radius sizes and more.
+
+// scss-docs-start border-variables
+$border-width:                1px !default;
+$border-widths: (
+  1: 1px,
+  2: 2px,
+  3: 3px,
+  4: 4px,
+  5: 5px
+) !default;
+
+$border-color:                $gray-300 !default;
+// scss-docs-end border-variables
+
+// scss-docs-start border-radius-variables
+$border-radius:               .25rem !default;  // <== 
+$border-radius-sm:            .2rem !default;
+$border-radius-lg:            .3rem !default;
+$border-radius-pill:          50rem !default;
+// scss-docs-end border-radius-variables
+
+// scss-docs-start box-shadow-variables
+$box-shadow:                  0 .5rem 1rem rgba($black, .15) !default;
+$box-shadow-sm:               0 .125rem .25rem rgba($black, .075) !default;
+$box-shadow-lg:               0 1rem 3rem rgba($black, .175) !default;
+$box-shadow-inset:            inset 0 1px 2px rgba($black, .075) !default;
+// scss-docs-end box-shadow-variables
+
+$component-active-color:      $white !default;
+$component-active-bg:         $primary !default;
+
+// scss-docs-start caret-variables
+$caret-width:                 .3em !default;
+$caret-vertical-align:        $caret-width * .85 !default;
+$caret-spacing:               $caret-width * .85 !default;
+// scss-docs-end caret-variables
+
+$transition-base:             all .2s ease-in-out !default;
+$transition-fade:             opacity .15s linear !default;
+// scss-docs-start collapse-transition
+$transition-collapse:         height .35s ease !default;
+// scss-docs-end collapse-transition
+
+// stylelint-disable function-disallowed-list
+// scss-docs-start aspect-ratios
+$aspect-ratios: (
+  "1x1": 100%,
+  "4x3": calc(3 / 4 * 100%),
+  "16x9": calc(9 / 16 * 100%),
+  "21x9": calc(9 / 21 * 100%)
+) !default;
+// scss-docs-end aspect-ratios
+// stylelint-enable function-disallowed-list
+
+// Typography
+//
+// Font, line-height, and color for body text, headings, and more.
+
+// scss-docs-start font-variables
+// stylelint-disable value-keyword-case
+$font-family-sans-serif:      'Open Sans';
+$font-family-monospace:       SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace !default;
+// stylelint-enable value-keyword-case
+$font-family-base:            var(--#{$variable-prefix}font-sans-serif) !default;
+$font-family-code:            var(--#{$variable-prefix}font-monospace) !default;
+
+// $font-size-root effects the value of `rem`, which is used for as well font sizes, paddings and margins
+// $font-size-base effects the font size of the body text
+$font-size-root:              null !default;
+$font-size-base:              1rem !default; // Assumes the browser default, typically `16px`
+$font-size-sm:                $font-size-base * .875 !default;
+$font-size-lg:                $font-size-base * 1.25 !default;
+
+$font-weight-lighter:         lighter !default;
+$font-weight-light:           300 !default;
+$font-weight-normal:          400 !default;
+$font-weight-bold:            700 !default;
+$font-weight-bolder:          bolder !default;
+
+$font-weight-base:            $font-weight-normal !default;
+
+$line-height-base:            1.5 !default;
+$line-height-sm:              1.25 !default;
+$line-height-lg:              2 !default;
+
+$h1-font-size:                $font-size-base * 2.0 !default;
+$h2-font-size:                $font-size-base * 1.5 !default;
+$h3-font-size:                $font-size-base * 1.25 !default;
+$h4-font-size:                $font-size-base * 1.15 !default;
+$h5-font-size:                $font-size-base * 1.05 !default;
+$h6-font-size:                $font-size-base !default;
+// scss-docs-end font-variables
+
+// scss-docs-start font-sizes
+$font-sizes: (
+  1: $h1-font-size,
+  2: $h2-font-size,
+  3: $h3-font-size,
+  4: $h4-font-size,
+  5: $h5-font-size,
+  6: $h6-font-size
+) !default;
+// scss-docs-end font-sizes
+
+// scss-docs-start headings-variables
+$headings-margin-bottom:      $spacer / 2 !default;
+$headings-font-family:        null !default;
+$headings-font-style:         null !default;
+$headings-font-weight:        500 !default;
+$headings-line-height:        1.2 !default;
+$headings-color:              null !default;
+// scss-docs-end headings-variables
+
+// scss-docs-start display-headings
+$display-font-sizes: (
+  1: 5rem,
+  2: 4.5rem,
+  3: 4rem,
+  4: 3.5rem,
+  5: 3rem,
+  6: 2.5rem
+) !default;
+
+$display-font-weight: 300 !default;
+$display-line-height: $headings-line-height !default;
+// scss-docs-end display-headings
+
+// scss-docs-start type-variables
+$lead-font-size:              $font-size-base * 1.25 !default;
+$lead-font-weight:            300 !default;
+
+$small-font-size:             .875em !default;
+
+$sub-sup-font-size:           .75em !default;
+
+$text-muted:                  $gray-600 !default;
+
+$initialism-font-size:        $small-font-size !default;
+
+$blockquote-margin-y:         $spacer !default;
+$blockquote-font-size:        $font-size-base * 1.25 !default;
+$blockquote-footer-color:     $gray-600 !default;
+$blockquote-footer-font-size: $small-font-size !default;
+
+$hr-margin-y:                 $spacer !default;
+$hr-color:                    inherit !default;
+$hr-height:                   $border-width !default;
+$hr-opacity:                  .25 !default;
+
+$legend-margin-bottom:        .5rem !default;
+$legend-font-size:            1.5rem !default;
+$legend-font-weight:          null !default;
+
+$mark-padding:                .2em !default;
+
+$dt-font-weight:              $font-weight-bold !default;
+
+$nested-kbd-font-weight:      $font-weight-bold !default;
+
+$list-inline-padding:         .5rem !default;
+
+$mark-bg:                     #fcf8e3 !default;
+// scss-docs-end type-variables
+
+
+// Tables
+//
+// Customizes the `.table` component with basic values, each used across all table variations.
+
+// scss-docs-start table-variables
+$table-cell-padding-y:        .5rem !default;
+$table-cell-padding-x:        .5rem !default;
+$table-cell-padding-y-sm:     .25rem !default;
+$table-cell-padding-x-sm:     .25rem !default;
+
+$table-cell-vertical-align:   top !default;
+
+$table-color:                 $body-color !default;
+$table-bg:                    transparent !default;
+
+$table-th-font-weight:        null !default;
+
+$table-striped-color:         $table-color !default;
+$table-striped-bg-factor:     .10 !default;
+$table-striped-bg:            rgba($black, $table-striped-bg-factor) !default;
+
+$table-active-color:          $table-color !default;
+$table-active-bg-factor:      .15 !default;
+$table-active-bg:             rgba($black, $table-active-bg-factor) !default;
+
+$table-hover-color:           $table-color !default;
+$table-hover-bg-factor:       .125 !default;
+$table-hover-bg:              rgba($black, $table-hover-bg-factor) !default;
+
+$table-border-factor:         .15 !default;
+$table-border-width:          $border-width !default;
+$table-border-color:          $border-color !default;
+
+$table-striped-order:         odd !default;
+
+$table-group-separator-color: currentColor !default;
+
+$table-caption-color:         $text-muted !default;
+
+$table-bg-scale:              -80% !default;
+// scss-docs-end table-variables
+
+// scss-docs-start table-loop
+$table-variants: (
+  "primary":    shift-color($primary, $table-bg-scale),
+  "secondary":  shift-color($secondary, $table-bg-scale),
+  "success":    shift-color($success, $table-bg-scale),
+  "info":       shift-color($info, $table-bg-scale),
+  "warning":    shift-color($warning, $table-bg-scale),
+  "danger":     shift-color($danger, $table-bg-scale),
+  "light":      $light,
+  "dark":       $dark,
+) !default;
+// scss-docs-end table-loop
+
+
+// Buttons + Forms
+//
+// Shared variables that are reassigned to `$input-` and `$btn-` specific variables.
+
+// scss-docs-start input-btn-variables
+$input-btn-padding-y:         .375rem !default;
+$input-btn-padding-x:         .75rem !default;
+$input-btn-font-family:       null !default;
+$input-btn-font-size:         $font-size-base !default;
+$input-btn-line-height:       $line-height-base !default;
+
+$input-btn-focus-width:         .25rem !default;
+$input-btn-focus-color-opacity: .25 !default;
+$input-btn-focus-color:         rgba($component-active-bg, $input-btn-focus-color-opacity) !default;
+$input-btn-focus-blur:          0 !default;
+$input-btn-focus-box-shadow:    0 0 $input-btn-focus-blur $input-btn-focus-width $input-btn-focus-color !default;
+
+$input-btn-padding-y-sm:      .25rem !default;
+$input-btn-padding-x-sm:      .5rem !default;
+$input-btn-font-size-sm:      $font-size-sm !default;
+
+$input-btn-padding-y-lg:      .5rem !default;
+$input-btn-padding-x-lg:      1rem !default;
+$input-btn-font-size-lg:      $font-size-lg !default;
+
+$input-btn-border-width:      $border-width !default;
+// scss-docs-end input-btn-variables
+
+
+// Buttons
+//
+// For each of Bootstrap's buttons, define text, background, and border color.
+
+// scss-docs-start btn-variables
+$btn-padding-y:               $input-btn-padding-y !default;
+$btn-padding-x:               $input-btn-padding-x !default;
+$btn-font-family:             $input-btn-font-family !default;
+$btn-font-size:               $input-btn-font-size !default;
+$btn-line-height:             $input-btn-line-height !default;
+$btn-white-space:             null !default; // Set to `nowrap` to prevent text wrapping
+
+$btn-padding-y-sm:            $input-btn-padding-y-sm !default;
+$btn-padding-x-sm:            $input-btn-padding-x-sm !default;
+$btn-font-size-sm:            $input-btn-font-size-sm !default;
+
+$btn-padding-y-lg:            $input-btn-padding-y-lg !default;
+$btn-padding-x-lg:            $input-btn-padding-x-lg !default;
+$btn-font-size-lg:            $input-btn-font-size-lg !default;
+
+$btn-border-width:            $input-btn-border-width !default;
+
+$btn-font-weight:             $font-weight-normal !default;
+$btn-box-shadow:              inset 0 1px 0 rgba($white, .15), 0 1px 1px rgba($black, .075) !default;
+$btn-focus-width:             $input-btn-focus-width !default;
+$btn-focus-box-shadow:        $input-btn-focus-box-shadow !default;
+$btn-disabled-opacity:        .65 !default;
+$btn-active-box-shadow:       inset 0 3px 5px rgba($black, .125) !default;
+
+$btn-link-color:              $link-color !default;
+$btn-link-hover-color:        $link-hover-color !default;
+$btn-link-disabled-color:     $gray-600 !default;
+
+// Allows for customizing button radius independently from global border radius
+$btn-border-radius:           0 !default; // $border-radius !default; (only disabled for button)
+$btn-border-radius-sm:        0 !default; // $border-radius-sm !default;
+$btn-border-radius-lg:        0 !default; // $border-radius-lg !default;
+
+$btn-transition:              color .15s ease-in-out, background-color .15s ease-in-out, border-color .15s ease-in-out, box-shadow .15s ease-in-out !default;
+
+$btn-hover-bg-shade-amount:       15% !default;
+$btn-hover-bg-tint-amount:        15% !default;
+$btn-hover-border-shade-amount:   20% !default;
+$btn-hover-border-tint-amount:    10% !default;
+$btn-active-bg-shade-amount:      20% !default;
+$btn-active-bg-tint-amount:       20% !default;
+$btn-active-border-shade-amount:  25% !default;
+$btn-active-border-tint-amount:   10% !default;
+// scss-docs-end btn-variables
+
+
+// Forms
+
+// scss-docs-start form-text-variables
+$form-text-margin-top:                  .25rem !default;
+$form-text-font-size:                   $small-font-size !default;
+$form-text-font-style:                  null !default;
+$form-text-font-weight:                 null !default;
+$form-text-color:                       $text-muted !default;
+// scss-docs-end form-text-variables
+
+// scss-docs-start form-label-variables
+$form-label-margin-bottom:              .5rem !default;
+$form-label-font-size:                  null !default;
+$form-label-font-style:                 null !default;
+$form-label-font-weight:                null !default;
+$form-label-color:                      null !default;
+// scss-docs-end form-label-variables
+
+// scss-docs-start form-input-variables
+$input-padding-y:                       $input-btn-padding-y !default;
+$input-padding-x:                       $input-btn-padding-x !default;
+$input-font-family:                     $input-btn-font-family !default;
+$input-font-size:                       $input-btn-font-size !default;
+$input-font-weight:                     $font-weight-base !default;
+$input-line-height:                     $input-btn-line-height !default;
+
+$input-padding-y-sm:                    $input-btn-padding-y-sm !default;
+$input-padding-x-sm:                    $input-btn-padding-x-sm !default;
+$input-font-size-sm:                    $input-btn-font-size-sm !default;
+
+$input-padding-y-lg:                    $input-btn-padding-y-lg !default;
+$input-padding-x-lg:                    $input-btn-padding-x-lg !default;
+$input-font-size-lg:                    $input-btn-font-size-lg !default;
+
+$input-bg:                              $white !default;
+$input-disabled-bg:                     $gray-200 !default;
+$input-disabled-border-color:           null !default;
+
+$input-color:                           $body-color !default;
+$input-border-color:                    $gray-400 !default;
+$input-border-width:                    $input-btn-border-width !default;
+$input-box-shadow:                      $box-shadow-inset !default;
+
+$input-border-radius:                   $border-radius !default;
+$input-border-radius-sm:                $border-radius-sm !default;
+$input-border-radius-lg:                $border-radius-lg !default;
+
+$input-focus-bg:                        $input-bg !default;
+$input-focus-border-color:              tint-color($component-active-bg, 50%) !default;
+$input-focus-color:                     $input-color !default;
+$input-focus-width:                     $input-btn-focus-width !default;
+$input-focus-box-shadow:                $input-btn-focus-box-shadow !default;
+
+$input-placeholder-color:               $gray-600 !default;
+$input-plaintext-color:                 $body-color !default;
+
+$input-height-border:                   $input-border-width * 2 !default;
+
+$input-height-inner:                    add($input-line-height * 1em, $input-padding-y * 2) !default;
+$input-height-inner-half:               add($input-line-height * .5em, $input-padding-y) !default;
+$input-height-inner-quarter:            add($input-line-height * .25em, $input-padding-y / 2) !default;
+
+$input-height:                          add($input-line-height * 1em, add($input-padding-y * 2, $input-height-border, false)) !default;
+$input-height-sm:                       add($input-line-height * 1em, add($input-padding-y-sm * 2, $input-height-border, false)) !default;
+$input-height-lg:                       add($input-line-height * 1em, add($input-padding-y-lg * 2, $input-height-border, false)) !default;
+
+$input-transition:                      border-color .15s ease-in-out, box-shadow .15s ease-in-out !default;
+// scss-docs-end form-input-variables
+
+// scss-docs-start form-check-variables
+$form-check-input-width:                  1em !default;
+$form-check-min-height:                   $font-size-base * $line-height-base !default;
+$form-check-padding-start:                $form-check-input-width + .5em !default;
+$form-check-margin-bottom:                .125rem !default;
+$form-check-label-color:                  null !default;
+$form-check-label-cursor:                 null !default;
+$form-check-transition:                   null !default;
+
+$form-check-input-active-filter:          brightness(90%) !default;
+
+$form-check-input-bg:                     $input-bg !default;
+$form-check-input-border:                 1px solid rgba($black, .25) !default;
+$form-check-input-border-radius:          .25em !default;
+$form-check-radio-border-radius:          50% !default;
+$form-check-input-focus-border:           $input-focus-border-color !default;
+$form-check-input-focus-box-shadow:       $input-btn-focus-box-shadow !default;
+
+$form-check-input-checked-color:          $component-active-color !default;
+$form-check-input-checked-bg-color:       $component-active-bg !default;
+$form-check-input-checked-border-color:   $form-check-input-checked-bg-color !default;
+$form-check-input-checked-bg-image:       url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 20 20'><path fill='none' stroke='#{$form-check-input-checked-color}' stroke-linecap='round' stroke-linejoin='round' stroke-width='3' d='M6 10l3 3l6-6'/></svg>") !default;
+$form-check-radio-checked-bg-image:       url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'><circle r='2' fill='#{$form-check-input-checked-color}'/></svg>") !default;
+
+$form-check-input-indeterminate-color:          $component-active-color !default;
+$form-check-input-indeterminate-bg-color:       $component-active-bg !default;
+$form-check-input-indeterminate-border-color:   $form-check-input-indeterminate-bg-color !default;
+$form-check-input-indeterminate-bg-image:       url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 20 20'><path fill='none' stroke='#{$form-check-input-indeterminate-color}' stroke-linecap='round' stroke-linejoin='round' stroke-width='3' d='M6 10h8'/></svg>") !default;
+
+$form-check-input-disabled-opacity:        .5 !default;
+$form-check-label-disabled-opacity:        $form-check-input-disabled-opacity !default;
+$form-check-btn-check-disabled-opacity:    $btn-disabled-opacity !default;
+
+$form-check-inline-margin-end:    1rem !default;
+// scss-docs-end form-check-variables
+
+// scss-docs-start form-switch-variables
+$form-switch-color:               rgba(0, 0, 0, .25) !default;
+$form-switch-width:               2em !default;
+$form-switch-padding-start:       $form-switch-width + .5em !default;
+$form-switch-bg-image:            url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'><circle r='3' fill='#{$form-switch-color}'/></svg>") !default;
+$form-switch-border-radius:       $form-switch-width !default;
+$form-switch-transition:          background-position .15s ease-in-out !default;
+
+$form-switch-focus-color:         $input-focus-border-color !default;
+$form-switch-focus-bg-image:      url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'><circle r='3' fill='#{$form-switch-focus-color}'/></svg>") !default;
+
+$form-switch-checked-color:       $component-active-color !default;
+$form-switch-checked-bg-image:    url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'><circle r='3' fill='#{$form-switch-checked-color}'/></svg>") !default;
+$form-switch-checked-bg-position: right center !default;
+// scss-docs-end form-switch-variables
+
+// scss-docs-start input-group-variables
+$input-group-addon-padding-y:           $input-padding-y !default;
+$input-group-addon-padding-x:           $input-padding-x !default;
+$input-group-addon-font-weight:         $input-font-weight !default;
+$input-group-addon-color:               $input-color !default;
+$input-group-addon-bg:                  $gray-200 !default;
+$input-group-addon-border-color:        $input-border-color !default;
+// scss-docs-end input-group-variables
+
+// scss-docs-start form-select-variables
+$form-select-padding-y:             $input-padding-y !default;
+$form-select-padding-x:             $input-padding-x !default;
+$form-select-font-family:           $input-font-family !default;
+$form-select-font-size:             $input-font-size !default;
+$form-select-indicator-padding:     $form-select-padding-x * 3 !default; // Extra padding for background-image
+$form-select-font-weight:           $input-font-weight !default;
+$form-select-line-height:           $input-line-height !default;
+$form-select-color:                 $input-color !default;
+$form-select-bg:                    $input-bg !default;
+$form-select-disabled-color:        null !default;
+$form-select-disabled-bg:           $gray-200 !default;
+$form-select-disabled-border-color: $input-disabled-border-color !default;
+$form-select-bg-position:           right $form-select-padding-x center !default;
+$form-select-bg-size:               16px 12px !default; // In pixels because image dimensions
+$form-select-indicator-color:       $gray-800 !default;
+$form-select-indicator:             url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'><path fill='none' stroke='#{$form-select-indicator-color}' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='M2 5l6 6 6-6'/></svg>") !default;
+
+$form-select-feedback-icon-padding-end: $form-select-padding-x * 2.5 + $form-select-indicator-padding !default;
+$form-select-feedback-icon-position:    center right $form-select-indicator-padding !default;
+$form-select-feedback-icon-size:        $input-height-inner-half $input-height-inner-half !default;
+
+$form-select-border-width:        $input-border-width !default;
+$form-select-border-color:        $input-border-color !default;
+$form-select-border-radius:       $border-radius !default;
+$form-select-box-shadow:          $box-shadow-inset !default;
+
+$form-select-focus-border-color:  $input-focus-border-color !default;
+$form-select-focus-width:         $input-focus-width !default;
+$form-select-focus-box-shadow:    0 0 0 $form-select-focus-width $input-btn-focus-color !default;
+
+$form-select-padding-y-sm:        $input-padding-y-sm !default;
+$form-select-padding-x-sm:        $input-padding-x-sm !default;
+$form-select-font-size-sm:        $input-font-size-sm !default;
+
+$form-select-padding-y-lg:        $input-padding-y-lg !default;
+$form-select-padding-x-lg:        $input-padding-x-lg !default;
+$form-select-font-size-lg:        $input-font-size-lg !default;
+// scss-docs-end form-select-variables
+
+// scss-docs-start form-range-variables
+$form-range-track-width:          100% !default;
+$form-range-track-height:         .5rem !default;
+$form-range-track-cursor:         pointer !default;
+$form-range-track-bg:             $gray-300 !default;
+$form-range-track-border-radius:  1rem !default;
+$form-range-track-box-shadow:     $box-shadow-inset !default;
+
+$form-range-thumb-width:                   1rem !default;
+$form-range-thumb-height:                  $form-range-thumb-width !default;
+$form-range-thumb-bg:                      $component-active-bg !default;
+$form-range-thumb-border:                  0 !default;
+$form-range-thumb-border-radius:           1rem !default;
+$form-range-thumb-box-shadow:              0 .1rem .25rem rgba($black, .1) !default;
+$form-range-thumb-focus-box-shadow:        0 0 0 1px $body-bg, $input-focus-box-shadow !default;
+$form-range-thumb-focus-box-shadow-width:  $input-focus-width !default; // For focus box shadow issue in Edge
+$form-range-thumb-active-bg:               tint-color($component-active-bg, 70%) !default;
+$form-range-thumb-disabled-bg:             $gray-500 !default;
+$form-range-thumb-transition:              background-color .15s ease-in-out, border-color .15s ease-in-out, box-shadow .15s ease-in-out !default;
+// scss-docs-end form-range-variables
+
+// scss-docs-start form-file-variables
+$form-file-button-color:          $input-color !default;
+$form-file-button-bg:             $input-group-addon-bg !default;
+$form-file-button-hover-bg:       shade-color($form-file-button-bg, 5%) !default;
+// scss-docs-end form-file-variables
+
+// scss-docs-start form-floating-variables
+$form-floating-height:            add(3.5rem, $input-height-border) !default;
+$form-floating-padding-x:         $input-padding-x !default;
+$form-floating-padding-y:         1rem !default;
+$form-floating-input-padding-t:   1.625rem !default;
+$form-floating-input-padding-b:   .625rem !default;
+$form-floating-label-opacity:     .65 !default;
+$form-floating-label-transform:   scale(.85) translateY(-.5rem) translateX(.15rem) !default;
+$form-floating-transition:        opacity .1s ease-in-out, transform .1s ease-in-out !default;
+// scss-docs-end form-floating-variables
+
+// Form validation
+
+// scss-docs-start form-feedback-variables
+$form-feedback-margin-top:          $form-text-margin-top !default;
+$form-feedback-font-size:           $form-text-font-size !default;
+$form-feedback-font-style:          $form-text-font-style !default;
+$form-feedback-valid-color:         $success !default;
+$form-feedback-invalid-color:       $danger !default;
+
+$form-feedback-icon-valid-color:    $form-feedback-valid-color !default;
+$form-feedback-icon-valid:          url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'><path fill='#{$form-feedback-icon-valid-color}' d='M2.3 6.73L.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/></svg>") !default;
+$form-feedback-icon-invalid-color:  $form-feedback-invalid-color !default;
+$form-feedback-icon-invalid:        url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 12 12' width='12' height='12' fill='none' stroke='#{$form-feedback-icon-invalid-color}'><circle cx='6' cy='6' r='4.5'/><path stroke-linejoin='round' d='M5.8 3.6h.4L6 6.5z'/><circle cx='6' cy='8.2' r='.6' fill='#{$form-feedback-icon-invalid-color}' stroke='none'/></svg>") !default;
+// scss-docs-end form-feedback-variables
+
+// scss-docs-start form-validation-states
+$form-validation-states: (
+  "valid": (
+    "color": $form-feedback-valid-color,
+    "icon": $form-feedback-icon-valid
+  ),
+  "invalid": (
+    "color": $form-feedback-invalid-color,
+    "icon": $form-feedback-icon-invalid
+  )
+) !default;
+// scss-docs-end form-validation-states
+
+// Z-index master list
+//
+// Warning: Avoid customizing these values. They're used for a bird's eye view
+// of components dependent on the z-axis and are designed to all work together.
+
+// scss-docs-start zindex-stack
+$zindex-dropdown:                   1000 !default;
+$zindex-sticky:                     1020 !default;
+$zindex-fixed:                      1030 !default;
+$zindex-modal-backdrop:             1040 !default;
+$zindex-offcanvas:                  1050 !default;
+$zindex-modal:                      1060 !default;
+$zindex-popover:                    1070 !default;
+$zindex-tooltip:                    1080 !default;
+// scss-docs-end zindex-stack
+
+
+// Navs
+
+// scss-docs-start nav-variables
+$nav-link-padding-y:                .5rem !default;
+$nav-link-padding-x:                1rem !default;
+$nav-link-font-size:                null !default;
+$nav-link-font-weight:              null !default;
+$nav-link-color:                    $link-color !default;
+$nav-link-hover-color:              $link-hover-color !default;
+$nav-link-transition:               color .15s ease-in-out, background-color .15s ease-in-out, border-color .15s ease-in-out !default;
+$nav-link-disabled-color:           $gray-600 !default;
+
+$nav-tabs-border-color:             $gray-300 !default;
+$nav-tabs-border-width:             $border-width !default;
+$nav-tabs-border-radius:            $border-radius !default;
+$nav-tabs-link-hover-border-color:  $gray-200 $gray-200 $nav-tabs-border-color !default;
+$nav-tabs-link-active-color:        $gray-700 !default;
+$nav-tabs-link-active-bg:           $body-bg !default;
+$nav-tabs-link-active-border-color: $gray-300 $gray-300 $nav-tabs-link-active-bg !default;
+
+$nav-pills-border-radius:           $border-radius !default;
+$nav-pills-link-active-color:       $component-active-color !default;
+$nav-pills-link-active-bg:          $component-active-bg !default;
+// scss-docs-end nav-variables
+
+
+// Navbar
+
+// scss-docs-start navbar-variables
+$navbar-padding-y:                  $spacer / 2 !default;
+$navbar-padding-x:                  null !default;
+
+$navbar-nav-link-padding-x:         .5rem !default;
+
+$navbar-brand-font-size:            $font-size-lg !default;
+// Compute the navbar-brand padding-y so the navbar-brand will have the same height as navbar-text and nav-link
+$nav-link-height:                   $font-size-base * $line-height-base + $nav-link-padding-y * 2 !default;
+$navbar-brand-height:               $navbar-brand-font-size * $line-height-base !default;
+$navbar-brand-padding-y:            ($nav-link-height - $navbar-brand-height) / 2 !default;
+$navbar-brand-margin-end:           1rem !default;
+
+$navbar-toggler-padding-y:          .25rem !default;
+$navbar-toggler-padding-x:          .75rem !default;
+$navbar-toggler-font-size:          $font-size-lg !default;
+$navbar-toggler-border-radius:      $btn-border-radius !default;
+$navbar-toggler-focus-width:        $btn-focus-width !default;
+$navbar-toggler-transition:         box-shadow .15s ease-in-out !default;
+// scss-docs-end navbar-variables
+
+// scss-docs-start navbar-theme-variables
+$navbar-dark-color:                 rgba($white, .55) !default;
+$navbar-dark-hover-color:           rgba($white, .75) !default;
+$navbar-dark-active-color:          $white !default;
+$navbar-dark-disabled-color:        rgba($white, .25) !default;
+$navbar-dark-toggler-icon-bg:       url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 30 30'><path stroke='#{$navbar-dark-color}' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/></svg>") !default;
+$navbar-dark-toggler-border-color:  rgba($white, .1) !default;
+
+$navbar-light-color:                rgba($black, .55) !default;
+$navbar-light-hover-color:          rgba($black, .7) !default;
+$navbar-light-active-color:         rgba($black, .9) !default;
+$navbar-light-disabled-color:       rgba($black, .3) !default;
+$navbar-light-toggler-icon-bg:      url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 30 30'><path stroke='#{$navbar-light-color}' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/></svg>") !default;
+$navbar-light-toggler-border-color: rgba($black, .1) !default;
+
+$navbar-light-brand-color:                $navbar-light-active-color !default;
+$navbar-light-brand-hover-color:          $navbar-light-active-color !default;
+$navbar-dark-brand-color:                 $navbar-dark-active-color !default;
+$navbar-dark-brand-hover-color:           $navbar-dark-active-color !default;
+// scss-docs-end navbar-theme-variables
+
+
+// Dropdowns
+//
+// Dropdown menu container and contents.
+
+// scss-docs-start dropdown-variables
+$dropdown-min-width:                10rem !default;
+$dropdown-padding-x:                0 !default;
+$dropdown-padding-y:                .5rem !default;
+$dropdown-spacer:                   .125rem !default;
+$dropdown-font-size:                $font-size-base !default;
+$dropdown-color:                    $body-color !default;
+$dropdown-bg:                       $white !default;
+$dropdown-border-color:             rgba($black, .15) !default;
+$dropdown-border-radius:            $border-radius !default;
+$dropdown-border-width:             $border-width !default;
+$dropdown-inner-border-radius:      subtract($dropdown-border-radius, $dropdown-border-width) !default;
+$dropdown-divider-bg:               $dropdown-border-color !default;
+$dropdown-divider-margin-y:         $spacer / 2 !default;
+$dropdown-box-shadow:               $box-shadow !default;
+
+$dropdown-link-color:               $gray-900 !default;
+$dropdown-link-hover-color:         shade-color($gray-900, 10%) !default;
+$dropdown-link-hover-bg:            $gray-200 !default;
+
+$dropdown-link-active-color:        $component-active-color !default;
+$dropdown-link-active-bg:           $component-active-bg !default;
+
+$dropdown-link-disabled-color:      $gray-500 !default;
+
+$dropdown-item-padding-y:           $spacer / 4 !default;
+$dropdown-item-padding-x:           $spacer !default;
+
+$dropdown-header-color:             $gray-600 !default;
+$dropdown-header-padding:           $dropdown-padding-y $dropdown-item-padding-x !default;
+// scss-docs-end dropdown-variables
+
+// scss-docs-start dropdown-dark-variables
+$dropdown-dark-color:               $gray-300 !default;
+$dropdown-dark-bg:                  $gray-800 !default;
+$dropdown-dark-border-color:        $dropdown-border-color !default;
+$dropdown-dark-divider-bg:          $dropdown-divider-bg !default;
+$dropdown-dark-box-shadow:          null !default;
+$dropdown-dark-link-color:          $dropdown-dark-color !default;
+$dropdown-dark-link-hover-color:    $white !default;
+$dropdown-dark-link-hover-bg:       rgba($white, .15) !default;
+$dropdown-dark-link-active-color:   $dropdown-link-active-color !default;
+$dropdown-dark-link-active-bg:      $dropdown-link-active-bg !default;
+$dropdown-dark-link-disabled-color: $gray-500 !default;
+$dropdown-dark-header-color:        $gray-500 !default;
+// scss-docs-end dropdown-dark-variables
+
+
+// Pagination
+
+// scss-docs-start pagination-variables
+$pagination-padding-y:              .375rem !default;
+$pagination-padding-x:              .75rem !default;
+$pagination-padding-y-sm:           .25rem !default;
+$pagination-padding-x-sm:           .5rem !default;
+$pagination-padding-y-lg:           .75rem !default;
+$pagination-padding-x-lg:           1.5rem !default;
+
+$pagination-color:                  $link-color !default;
+$pagination-bg:                     $white !default;
+$pagination-border-width:           $border-width !default;
+$pagination-border-radius:          $border-radius !default;
+$pagination-margin-start:           -$pagination-border-width !default;
+$pagination-border-color:           $gray-300 !default;
+
+$pagination-focus-color:            $link-hover-color !default;
+$pagination-focus-bg:               $gray-200 !default;
+$pagination-focus-box-shadow:       $input-btn-focus-box-shadow !default;
+$pagination-focus-outline:          0 !default;
+
+$pagination-hover-color:            $link-hover-color !default;
+$pagination-hover-bg:               $gray-200 !default;
+$pagination-hover-border-color:     $gray-300 !default;
+
+$pagination-active-color:           $component-active-color !default;
+$pagination-active-bg:              $component-active-bg !default;
+$pagination-active-border-color:    $pagination-active-bg !default;
+
+$pagination-disabled-color:         $gray-600 !default;
+$pagination-disabled-bg:            $white !default;
+$pagination-disabled-border-color:  $gray-300 !default;
+
+$pagination-transition:              color .15s ease-in-out, background-color .15s ease-in-out, border-color .15s ease-in-out, box-shadow .15s ease-in-out !default;
+
+$pagination-border-radius-sm:       $border-radius-sm !default;
+$pagination-border-radius-lg:       $border-radius-lg !default;
+// scss-docs-end pagination-variables
+
+
+// Cards
+
+// scss-docs-start card-variables
+$card-spacer-y:                     $spacer !default;
+$card-spacer-x:                     $spacer !default;
+$card-title-spacer-y:               $spacer / 2 !default;
+$card-border-width:                 $border-width !default;
+$card-border-radius:                $border-radius !default;
+$card-border-color:                 rgba($black, .125) !default;
+$card-inner-border-radius:          subtract($card-border-radius, $card-border-width) !default;
+$card-cap-padding-y:                $card-spacer-y / 2 !default;
+$card-cap-padding-x:                $card-spacer-x !default;
+$card-cap-bg:                       rgba($black, .03) !default;
+$card-cap-color:                    null !default;
+$card-height:                       null !default;
+$card-color:                        null !default;
+$card-bg:                           $white !default;
+$card-img-overlay-padding:          $spacer !default;
+$card-group-margin:                 $grid-gutter-width / 2 !default;
+// scss-docs-end card-variables
+
+// Accordion
+
+// scss-docs-start accordion-variables
+$accordion-padding-y:                     1rem !default;
+$accordion-padding-x:                     1.25rem !default;
+$accordion-color:                         $body-color !default;
+$accordion-bg:                            $body-bg !default;
+$accordion-border-width:                  $border-width !default;
+$accordion-border-color:                  rgba($black, .125) !default;
+$accordion-border-radius:                 $border-radius !default;
+$accordion-inner-border-radius:           subtract($accordion-border-radius, $accordion-border-width) !default;
+
+$accordion-body-padding-y:                $accordion-padding-y !default;
+$accordion-body-padding-x:                $accordion-padding-x !default;
+
+$accordion-button-padding-y:              $accordion-padding-y !default;
+$accordion-button-padding-x:              $accordion-padding-x !default;
+$accordion-button-color:                  $accordion-color !default;
+$accordion-button-bg:                     $accordion-bg !default;
+$accordion-transition:                    $btn-transition, border-radius .15s ease !default;
+$accordion-button-active-bg:              tint-color($component-active-bg, 90%) !default;
+$accordion-button-active-color:           shade-color($primary, 10%) !default;
+
+$accordion-button-focus-border-color:     $input-focus-border-color !default;
+$accordion-button-focus-box-shadow:       $btn-focus-box-shadow !default;
+
+$accordion-icon-width:                    1.25rem !default;
+$accordion-icon-color:                    $accordion-color !default;
+$accordion-icon-active-color:             $accordion-button-active-color !default;
+$accordion-icon-transition:               transform .2s ease-in-out !default;
+$accordion-icon-transform:                rotate(-180deg) !default;
+
+$accordion-button-icon:         url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='#{$accordion-icon-color}'><path fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z'/></svg>") !default;
+$accordion-button-active-icon:  url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='#{$accordion-icon-active-color}'><path fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z'/></svg>") !default;
+// scss-docs-end accordion-variables
+
+// Tooltips
+
+// scss-docs-start tooltip-variables
+$tooltip-font-size:                 $font-size-sm !default;
+$tooltip-max-width:                 200px !default;
+$tooltip-color:                     $white !default;
+$tooltip-bg:                        $black !default;
+$tooltip-border-radius:             $border-radius !default;
+$tooltip-opacity:                   .9 !default;
+$tooltip-padding-y:                 $spacer / 4 !default;
+$tooltip-padding-x:                 $spacer / 2 !default;
+$tooltip-margin:                    0 !default;
+
+$tooltip-arrow-width:               .8rem !default;
+$tooltip-arrow-height:              .4rem !default;
+$tooltip-arrow-color:               $tooltip-bg !default;
+// scss-docs-end tooltip-variables
+
+// Form tooltips must come after regular tooltips
+// scss-docs-start tooltip-feedback-variables
+$form-feedback-tooltip-padding-y:     $tooltip-padding-y !default;
+$form-feedback-tooltip-padding-x:     $tooltip-padding-x !default;
+$form-feedback-tooltip-font-size:     $tooltip-font-size !default;
+$form-feedback-tooltip-line-height:   null !default;
+$form-feedback-tooltip-opacity:       $tooltip-opacity !default;
+$form-feedback-tooltip-border-radius: $tooltip-border-radius !default;
+// scss-docs-start tooltip-feedback-variables
+
+
+// Popovers
+
+// scss-docs-start popover-variables
+$popover-font-size:                 $font-size-sm !default;
+$popover-bg:                        $white !default;
+$popover-max-width:                 276px !default;
+$popover-border-width:              $border-width !default;
+$popover-border-color:              rgba($black, .2) !default;
+$popover-border-radius:             $border-radius-lg !default;
+$popover-inner-border-radius:       subtract($popover-border-radius, $popover-border-width) !default;
+$popover-box-shadow:                $box-shadow !default;
+
+$popover-header-bg:                 shade-color($popover-bg, 6%) !default;
+$popover-header-color:              $headings-color !default;
+$popover-header-padding-y:          .5rem !default;
+$popover-header-padding-x:          $spacer !default;
+
+$popover-body-color:                $body-color !default;
+$popover-body-padding-y:            $spacer !default;
+$popover-body-padding-x:            $spacer !default;
+
+$popover-arrow-width:               1rem !default;
+$popover-arrow-height:              .5rem !default;
+$popover-arrow-color:               $popover-bg !default;
+
+$popover-arrow-outer-color:         fade-in($popover-border-color, .05) !default;
+// scss-docs-end popover-variables
+
+
+// Toasts
+
+// scss-docs-start toast-variables
+$toast-max-width:                   350px !default;
+$toast-padding-x:                   .75rem !default;
+$toast-padding-y:                   .5rem !default;
+$toast-font-size:                   .875rem !default;
+$toast-color:                       null !default;
+$toast-background-color:            rgba($white, .85) !default;
+$toast-border-width:                1px !default;
+$toast-border-color:                rgba(0, 0, 0, .1) !default;
+$toast-border-radius:               $border-radius !default;
+$toast-box-shadow:                  $box-shadow !default;
+$toast-spacing:                     $container-padding-x !default;
+
+$toast-header-color:                $gray-600 !default;
+$toast-header-background-color:     rgba($white, .85) !default;
+$toast-header-border-color:         rgba(0, 0, 0, .05) !default;
+// scss-docs-end toast-variables
+
+
+// Badges
+
+// scss-docs-start badge-variables
+$badge-font-size:                   .75em !default;
+$badge-font-weight:                 $font-weight-bold !default;
+$badge-color:                       $white !default;
+$badge-padding-y:                   .35em !default;
+$badge-padding-x:                   .65em !default;
+$badge-border-radius:               $border-radius !default;
+// scss-docs-end badge-variables
+
+
+// Modals
+
+// scss-docs-start modal-variables
+$modal-inner-padding:               $spacer !default;
+
+$modal-footer-margin-between:       .5rem !default;
+
+$modal-dialog-margin:               .5rem !default;
+$modal-dialog-margin-y-sm-up:       1.75rem !default;
+
+$modal-title-line-height:           $line-height-base !default;
+
+$modal-content-color:               null !default;
+$modal-content-bg:                  $white !default;
+$modal-content-border-color:        rgba($black, .2) !default;
+$modal-content-border-width:        $border-width !default;
+$modal-content-border-radius:       $border-radius-lg !default;
+$modal-content-inner-border-radius: subtract($modal-content-border-radius, $modal-content-border-width) !default;
+$modal-content-box-shadow-xs:       $box-shadow-sm !default;
+$modal-content-box-shadow-sm-up:    $box-shadow !default;
+
+$modal-backdrop-bg:                 $black !default;
+$modal-backdrop-opacity:            .5 !default;
+$modal-header-border-color:         $border-color !default;
+$modal-footer-border-color:         $modal-header-border-color !default;
+$modal-header-border-width:         $modal-content-border-width !default;
+$modal-footer-border-width:         $modal-header-border-width !default;
+$modal-header-padding-y:            $modal-inner-padding !default;
+$modal-header-padding-x:            $modal-inner-padding !default;
+$modal-header-padding:              $modal-header-padding-y $modal-header-padding-x !default; // Keep this for backwards compatibility
+
+$modal-sm:                          300px !default;
+$modal-md:                          500px !default;
+$modal-lg:                          800px !default;
+$modal-xl:                          1140px !default;
+
+$modal-fade-transform:              translate(0, -50px) !default;
+$modal-show-transform:              none !default;
+$modal-transition:                  transform .3s ease-out !default;
+$modal-scale-transform:             scale(1.02) !default;
+// scss-docs-end modal-variables
+
+
+// Alerts
+//
+// Define alert colors, border radius, and padding.
+
+// scss-docs-start alert-variables
+$alert-padding-y:               $spacer !default;
+$alert-padding-x:               $spacer !default;
+$alert-margin-bottom:           1rem !default;
+$alert-border-radius:           0 !default; //$border-radius !default;
+$alert-link-font-weight:        $font-weight-bold !default;
+$alert-border-width:            0 !default; //$border-width !default;
+$alert-bg-scale:                -80% !default;
+$alert-border-scale:            -70% !default;
+$alert-color-scale:             40% !default;
+$alert-dismissible-padding-r:   $alert-padding-x * 3 !default; // 3x covers width of x plus default padding on either side
+// scss-docs-end alert-variables
+
+
+// Progress bars
+
+// scss-docs-start progress-variables
+$progress-height:                   1rem !default;
+$progress-font-size:                $font-size-base * .75 !default;
+$progress-bg:                       $gray-200 !default;
+$progress-border-radius:            $border-radius !default;
+$progress-box-shadow:               $box-shadow-inset !default;
+$progress-bar-color:                $white !default;
+$progress-bar-bg:                   $primary !default;
+$progress-bar-animation-timing:     1s linear infinite !default;
+$progress-bar-transition:           width .6s ease !default;
+// scss-docs-end progress-variables
+
+
+// List group
+
+// scss-docs-start list-group-variables
+$list-group-color:                  $gray-900 !default;
+$list-group-bg:                     $white !default;
+$list-group-border-color:           rgba($black, .125) !default;
+$list-group-border-width:           $border-width !default;
+$list-group-border-radius:          $border-radius !default;
+
+$list-group-item-padding-y:         $spacer / 2 !default;
+$list-group-item-padding-x:         $spacer !default;
+$list-group-item-bg-scale:          -80% !default;
+$list-group-item-color-scale:       40% !default;
+
+$list-group-hover-bg:               $gray-100 !default;
+$list-group-active-color:           $component-active-color !default;
+$list-group-active-bg:              $component-active-bg !default;
+$list-group-active-border-color:    $list-group-active-bg !default;
+
+$list-group-disabled-color:         $gray-600 !default;
+$list-group-disabled-bg:            $list-group-bg !default;
+
+$list-group-action-color:           $gray-700 !default;
+$list-group-action-hover-color:     $list-group-action-color !default;
+
+$list-group-action-active-color:    $body-color !default;
+$list-group-action-active-bg:       $gray-200 !default;
+// scss-docs-end list-group-variables
+
+
+// Image thumbnails
+
+// scss-docs-start thumbnail-variables
+$thumbnail-padding:                 .25rem !default;
+$thumbnail-bg:                      $body-bg !default;
+$thumbnail-border-width:            $border-width !default;
+$thumbnail-border-color:            $gray-300 !default;
+$thumbnail-border-radius:           $border-radius !default;
+$thumbnail-box-shadow:              $box-shadow-sm !default;
+// scss-docs-end thumbnail-variables
+
+
+// Figures
+
+// scss-docs-start figure-variables
+$figure-caption-font-size:          $small-font-size !default;
+$figure-caption-color:              $gray-600 !default;
+// scss-docs-end figure-variables
+
+
+// Breadcrumbs
+
+// scss-docs-start breadcrumb-variables
+$breadcrumb-font-size:              null !default;
+$breadcrumb-padding-y:              0 !default;
+$breadcrumb-padding-x:              0 !default;
+$breadcrumb-item-padding-x:         .5rem !default;
+$breadcrumb-margin-bottom:          1rem !default;
+$breadcrumb-bg:                     null !default;
+$breadcrumb-divider-color:          $gray-600 !default;
+$breadcrumb-active-color:           $gray-600 !default;
+$breadcrumb-divider:                quote("/") !default;
+$breadcrumb-divider-flipped:        $breadcrumb-divider !default;
+$breadcrumb-border-radius:          null !default;
+// scss-docs-end breadcrumb-variables
+
+// Carousel
+
+// scss-docs-start carousel-variables
+$carousel-control-color:             $white !default;
+$carousel-control-width:             15% !default;
+$carousel-control-opacity:           .5 !default;
+$carousel-control-hover-opacity:     .9 !default;
+$carousel-control-transition:        opacity .15s ease !default;
+
+$carousel-indicator-width:           30px !default;
+$carousel-indicator-height:          3px !default;
+$carousel-indicator-hit-area-height: 10px !default;
+$carousel-indicator-spacer:          3px !default;
+$carousel-indicator-opacity:         .5 !default;
+$carousel-indicator-active-bg:       $white !default;
+$carousel-indicator-active-opacity:  1 !default;
+$carousel-indicator-transition:      opacity .6s ease !default;
+
+$carousel-caption-width:             70% !default;
+$carousel-caption-color:             $white !default;
+$carousel-caption-padding-y:         1.25rem !default;
+$carousel-caption-spacer:            1.25rem !default;
+
+$carousel-control-icon-width:        2rem !default;
+
+$carousel-control-prev-icon-bg:      url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='#{$carousel-control-color}'><path d='M11.354 1.646a.5.5 0 0 1 0 .708L5.707 8l5.647 5.646a.5.5 0 0 1-.708.708l-6-6a.5.5 0 0 1 0-.708l6-6a.5.5 0 0 1 .708 0z'/></svg>") !default;
+$carousel-control-next-icon-bg:      url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='#{$carousel-control-color}'><path d='M4.646 1.646a.5.5 0 0 1 .708 0l6 6a.5.5 0 0 1 0 .708l-6 6a.5.5 0 0 1-.708-.708L10.293 8 4.646 2.354a.5.5 0 0 1 0-.708z'/></svg>") !default;
+
+$carousel-transition-duration:       .6s !default;
+$carousel-transition:                transform $carousel-transition-duration ease-in-out !default; // Define transform transition first if using multiple transitions (e.g., `transform 2s ease, opacity .5s ease-out`)
+
+$carousel-dark-indicator-active-bg:  $black !default;
+$carousel-dark-caption-color:        $black !default;
+$carousel-dark-control-icon-filter:  invert(1) grayscale(100) !default;
+// scss-docs-end carousel-variables
+
+
+// Spinners
+
+// scss-docs-start spinner-variables
+$spinner-width:           2rem !default;
+$spinner-height:          $spinner-width !default;
+$spinner-vertical-align:  -.125em !default;
+$spinner-border-width:    .25em !default;
+$spinner-animation-speed: .75s !default;
+
+$spinner-width-sm:        1rem !default;
+$spinner-height-sm:       $spinner-width-sm !default;
+$spinner-border-width-sm: .2em !default;
+// scss-docs-end spinner-variables
+
+
+// Close
+
+// scss-docs-start close-variables
+$btn-close-width:            1em !default;
+$btn-close-height:           $btn-close-width !default;
+$btn-close-padding-x:        .25em !default;
+$btn-close-padding-y:        $btn-close-padding-x !default;
+$btn-close-color:            $black !default;
+$btn-close-bg:               url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='#{$btn-close-color}'><path d='M.293.293a1 1 0 011.414 0L8 6.586 14.293.293a1 1 0 111.414 1.414L9.414 8l6.293 6.293a1 1 0 01-1.414 1.414L8 9.414l-6.293 6.293a1 1 0 01-1.414-1.414L6.586 8 .293 1.707a1 1 0 010-1.414z'/></svg>") !default;
+$btn-close-focus-shadow:     $input-btn-focus-box-shadow !default;
+$btn-close-opacity:          .5 !default;
+$btn-close-hover-opacity:    .75 !default;
+$btn-close-focus-opacity:    1 !default;
+$btn-close-disabled-opacity: .25 !default;
+$btn-close-white-filter:     invert(1) grayscale(100%) brightness(200%) !default;
+// scss-docs-end close-variables
+
+
+// Offcanvas
+
+// scss-docs-start offcanvas-variables
+$offcanvas-padding-y:               $modal-inner-padding !default;
+$offcanvas-padding-x:               $modal-inner-padding !default;
+$offcanvas-horizontal-width:        400px !default;
+$offcanvas-vertical-height:         30vh !default;
+$offcanvas-transition-duration:     .3s !default;
+$offcanvas-border-color:            $modal-content-border-color !default;
+$offcanvas-border-width:            $modal-content-border-width !default;
+$offcanvas-title-line-height:       $modal-title-line-height !default;
+$offcanvas-bg-color:                $modal-content-bg !default;
+$offcanvas-color:                   $modal-content-color !default;
+$offcanvas-box-shadow:              $modal-content-box-shadow-xs !default;
+// scss-docs-end offcanvas-variables
+
+// Code
+
+$code-font-size:                    $small-font-size !default;
+$code-color:                        $pink !default;
+
+$kbd-padding-y:                     .2rem !default;
+$kbd-padding-x:                     .4rem !default;
+$kbd-font-size:                     $code-font-size !default;
+$kbd-color:                         $white !default;
+$kbd-bg:                            $gray-900 !default;
+
+$pre-color:                         null !default;
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/index.js b/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/index.js
similarity index 84%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/index.js
rename to src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/index.js
index e75a810c2..daff13a55 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/index.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/index.js
@@ -4,8 +4,7 @@
 // Or compile bootstrap only enabled assets
 require('./bootstrap.scss');
 
-
 // You can specify which plugins you need
-//import { Tooltip, Toast, Popover } from 'bootstrap';
+import Dropdown from 'bootstrap/js/src/dropdown';
 import Modal from 'bootstrap/js/dist/modal';
 import Collapse from 'bootstrap/js/src/collapse';
diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/shared.scss b/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/shared.scss
new file mode 100644
index 000000000..21e1ceca0
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/shared.scss
@@ -0,0 +1,14 @@
+// Configuration
+@import "bootstrap/scss/functions";
+
+/*
+*  Replaced by CHILL variables
+*  it is necessary to keep the possibility of making a diff with original !
+*  original: "bootstrap/scss/variables";
+*/
+@import "custom/_variables";
+
+@import "bootstrap/scss/mixins";
+@import "bootstrap/scss/utilities";
+
+
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/ckeditor5/index.js b/src/Bundle/ChillMainBundle/Resources/public/module/ckeditor5/index.js
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/ckeditor5/index.js
rename to src/Bundle/ChillMainBundle/Resources/public/module/ckeditor5/index.js
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/ckeditor5/index.scss b/src/Bundle/ChillMainBundle/Resources/public/module/ckeditor5/index.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/ckeditor5/index.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/ckeditor5/index.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/forkawesome/index.js b/src/Bundle/ChillMainBundle/Resources/public/module/forkawesome/index.js
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/forkawesome/index.js
rename to src/Bundle/ChillMainBundle/Resources/public/module/forkawesome/index.js
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/_custom.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/_custom.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/_custom.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/_custom.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/config/_buttons.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/config/_buttons.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/config/_buttons.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/config/_buttons.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/config/_colors.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/config/_colors.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/config/_colors.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/config/_colors.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/config/_variables.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/config/_variables.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/config/_variables.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/config/_variables.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/_bourbon-deprecated-upcoming.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/_bourbon-deprecated-upcoming.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/_bourbon-deprecated-upcoming.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/_bourbon-deprecated-upcoming.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/_bourbon.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/_bourbon.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/_bourbon.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/_bourbon.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/addons/_border-color.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/addons/_border-color.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/addons/_border-color.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/addons/_border-color.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/addons/_border-radius.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/addons/_border-radius.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/addons/_border-radius.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/addons/_border-radius.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/addons/_border-style.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/addons/_border-style.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/addons/_border-style.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/addons/_border-style.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/addons/_border-width.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/addons/_border-width.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/addons/_border-width.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/addons/_border-width.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/addons/_buttons.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/addons/_buttons.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/addons/_buttons.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/addons/_buttons.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/addons/_clearfix.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/addons/_clearfix.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/addons/_clearfix.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/addons/_clearfix.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/addons/_ellipsis.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/addons/_ellipsis.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/addons/_ellipsis.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/addons/_ellipsis.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/addons/_font-stacks.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/addons/_font-stacks.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/addons/_font-stacks.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/addons/_font-stacks.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/addons/_hide-text.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/addons/_hide-text.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/addons/_hide-text.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/addons/_hide-text.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/addons/_margin.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/addons/_margin.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/addons/_margin.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/addons/_margin.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/addons/_padding.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/addons/_padding.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/addons/_padding.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/addons/_padding.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/addons/_position.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/addons/_position.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/addons/_position.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/addons/_position.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/addons/_prefixer.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/addons/_prefixer.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/addons/_prefixer.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/addons/_prefixer.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/addons/_retina-image.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/addons/_retina-image.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/addons/_retina-image.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/addons/_retina-image.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/addons/_size.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/addons/_size.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/addons/_size.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/addons/_size.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/addons/_text-inputs.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/addons/_text-inputs.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/addons/_text-inputs.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/addons/_text-inputs.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/addons/_timing-functions.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/addons/_timing-functions.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/addons/_timing-functions.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/addons/_timing-functions.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/addons/_triangle.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/addons/_triangle.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/addons/_triangle.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/addons/_triangle.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/addons/_word-wrap.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/addons/_word-wrap.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/addons/_word-wrap.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/addons/_word-wrap.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/css3/_animation.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/css3/_animation.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/css3/_animation.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/css3/_animation.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/css3/_appearance.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/css3/_appearance.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/css3/_appearance.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/css3/_appearance.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/css3/_backface-visibility.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/css3/_backface-visibility.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/css3/_backface-visibility.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/css3/_backface-visibility.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/css3/_background-image.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/css3/_background-image.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/css3/_background-image.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/css3/_background-image.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/css3/_background.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/css3/_background.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/css3/_background.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/css3/_background.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/css3/_border-image.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/css3/_border-image.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/css3/_border-image.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/css3/_border-image.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/css3/_calc.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/css3/_calc.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/css3/_calc.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/css3/_calc.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/css3/_columns.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/css3/_columns.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/css3/_columns.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/css3/_columns.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/css3/_filter.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/css3/_filter.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/css3/_filter.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/css3/_filter.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/css3/_flex-box.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/css3/_flex-box.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/css3/_flex-box.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/css3/_flex-box.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/css3/_font-face.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/css3/_font-face.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/css3/_font-face.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/css3/_font-face.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/css3/_font-feature-settings.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/css3/_font-feature-settings.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/css3/_font-feature-settings.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/css3/_font-feature-settings.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/css3/_hidpi-media-query.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/css3/_hidpi-media-query.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/css3/_hidpi-media-query.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/css3/_hidpi-media-query.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/css3/_hyphens.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/css3/_hyphens.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/css3/_hyphens.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/css3/_hyphens.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/css3/_image-rendering.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/css3/_image-rendering.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/css3/_image-rendering.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/css3/_image-rendering.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/css3/_keyframes.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/css3/_keyframes.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/css3/_keyframes.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/css3/_keyframes.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/css3/_linear-gradient.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/css3/_linear-gradient.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/css3/_linear-gradient.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/css3/_linear-gradient.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/css3/_perspective.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/css3/_perspective.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/css3/_perspective.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/css3/_perspective.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/css3/_placeholder.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/css3/_placeholder.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/css3/_placeholder.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/css3/_placeholder.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/css3/_radial-gradient.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/css3/_radial-gradient.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/css3/_radial-gradient.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/css3/_radial-gradient.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/css3/_selection.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/css3/_selection.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/css3/_selection.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/css3/_selection.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/css3/_text-decoration.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/css3/_text-decoration.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/css3/_text-decoration.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/css3/_text-decoration.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/css3/_transform.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/css3/_transform.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/css3/_transform.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/css3/_transform.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/css3/_transition.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/css3/_transition.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/css3/_transition.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/css3/_transition.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/css3/_user-select.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/css3/_user-select.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/css3/_user-select.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/css3/_user-select.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/functions/_assign-inputs.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/functions/_assign-inputs.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/functions/_assign-inputs.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/functions/_assign-inputs.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/functions/_contains-falsy.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/functions/_contains-falsy.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/functions/_contains-falsy.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/functions/_contains-falsy.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/functions/_contains.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/functions/_contains.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/functions/_contains.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/functions/_contains.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/functions/_is-length.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/functions/_is-length.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/functions/_is-length.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/functions/_is-length.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/functions/_is-light.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/functions/_is-light.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/functions/_is-light.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/functions/_is-light.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/functions/_is-number.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/functions/_is-number.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/functions/_is-number.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/functions/_is-number.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/functions/_is-size.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/functions/_is-size.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/functions/_is-size.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/functions/_is-size.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/functions/_modular-scale.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/functions/_modular-scale.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/functions/_modular-scale.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/functions/_modular-scale.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/functions/_px-to-em.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/functions/_px-to-em.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/functions/_px-to-em.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/functions/_px-to-em.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/functions/_px-to-rem.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/functions/_px-to-rem.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/functions/_px-to-rem.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/functions/_px-to-rem.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/functions/_shade.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/functions/_shade.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/functions/_shade.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/functions/_shade.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/functions/_strip-units.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/functions/_strip-units.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/functions/_strip-units.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/functions/_strip-units.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/functions/_tint.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/functions/_tint.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/functions/_tint.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/functions/_tint.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/functions/_transition-property-name.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/functions/_transition-property-name.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/functions/_transition-property-name.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/functions/_transition-property-name.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/functions/_unpack.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/functions/_unpack.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/functions/_unpack.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/functions/_unpack.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/helpers/_convert-units.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/helpers/_convert-units.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/helpers/_convert-units.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/helpers/_convert-units.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/helpers/_directional-values.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/helpers/_directional-values.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/helpers/_directional-values.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/helpers/_directional-values.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/helpers/_font-source-declaration.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/helpers/_font-source-declaration.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/helpers/_font-source-declaration.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/helpers/_font-source-declaration.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/helpers/_gradient-positions-parser.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/helpers/_gradient-positions-parser.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/helpers/_gradient-positions-parser.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/helpers/_gradient-positions-parser.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/helpers/_linear-angle-parser.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/helpers/_linear-angle-parser.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/helpers/_linear-angle-parser.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/helpers/_linear-angle-parser.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/helpers/_linear-gradient-parser.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/helpers/_linear-gradient-parser.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/helpers/_linear-gradient-parser.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/helpers/_linear-gradient-parser.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/helpers/_linear-positions-parser.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/helpers/_linear-positions-parser.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/helpers/_linear-positions-parser.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/helpers/_linear-positions-parser.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/helpers/_linear-side-corner-parser.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/helpers/_linear-side-corner-parser.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/helpers/_linear-side-corner-parser.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/helpers/_linear-side-corner-parser.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/helpers/_radial-arg-parser.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/helpers/_radial-arg-parser.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/helpers/_radial-arg-parser.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/helpers/_radial-arg-parser.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/helpers/_radial-gradient-parser.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/helpers/_radial-gradient-parser.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/helpers/_radial-gradient-parser.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/helpers/_radial-gradient-parser.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/helpers/_radial-positions-parser.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/helpers/_radial-positions-parser.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/helpers/_radial-positions-parser.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/helpers/_radial-positions-parser.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/helpers/_render-gradients.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/helpers/_render-gradients.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/helpers/_render-gradients.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/helpers/_render-gradients.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/helpers/_shape-size-stripper.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/helpers/_shape-size-stripper.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/helpers/_shape-size-stripper.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/helpers/_shape-size-stripper.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/helpers/_str-to-num.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/helpers/_str-to-num.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/helpers/_str-to-num.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/helpers/_str-to-num.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/settings/_asset-pipeline.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/settings/_asset-pipeline.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/settings/_asset-pipeline.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/settings/_asset-pipeline.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/settings/_prefixer.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/settings/_prefixer.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/settings/_prefixer.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/settings/_prefixer.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/settings/_px-to-em.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/settings/_px-to-em.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/bourbon/settings/_px-to-em.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/settings/_px-to-em.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/gridle/_grid-settings.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/gridle/_grid-settings.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/gridle/_grid-settings.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/gridle/_grid-settings.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/gridle/grid-bootstrap.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/gridle/grid-bootstrap.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/gridle/grid-bootstrap.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/gridle/grid-bootstrap.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/gridle/grid.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/gridle/grid.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/gridle/grid.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/gridle/grid.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/gridle/gridle/_common-mixins.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/gridle/gridle/_common-mixins.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/gridle/gridle/_common-mixins.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/gridle/gridle/_common-mixins.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/gridle/gridle/_default-states.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/gridle/gridle/_default-states.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/gridle/gridle/_default-states.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/gridle/gridle/_default-states.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/gridle/gridle/_functions.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/gridle/gridle/_functions.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/gridle/gridle/_functions.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/gridle/gridle/_functions.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/gridle/gridle/_generate-mixins.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/gridle/gridle/_generate-mixins.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/gridle/gridle/_generate-mixins.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/gridle/gridle/_generate-mixins.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/gridle/gridle/_gridle.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/gridle/gridle/_gridle.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/gridle/gridle/_gridle.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/gridle/gridle/_gridle.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/gridle/gridle/_mixins.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/gridle/gridle/_mixins.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/gridle/gridle/_mixins.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/gridle/gridle/_mixins.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/gridle/gridle/_settings-mixins.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/gridle/gridle/_settings-mixins.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/gridle/gridle/_settings-mixins.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/gridle/gridle/_settings-mixins.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/gridle/gridle/_settings.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/gridle/gridle/_settings.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/gridle/gridle/_settings.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/gridle/gridle/_settings.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/gridle/gridle/_silent-classes.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/gridle/gridle/_silent-classes.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/gridle/gridle/_silent-classes.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/gridle/gridle/_silent-classes.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/gridle/style-bootstrap.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/gridle/style-bootstrap.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/gridle/style-bootstrap.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/gridle/style-bootstrap.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/gridle/style.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/gridle/style.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/gridle/style.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/gridle/style.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/gridle/tests.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/gridle/tests.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/gridle/tests.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/gridle/tests.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/normalize/_normalize.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/normalize/_normalize.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/contrib/normalize/_normalize.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/normalize/_normalize.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/custom/_address.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/custom/_address.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/custom/_address.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/custom/_address.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/custom/_box.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/custom/_box.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/custom/_box.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/custom/_box.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/custom/_custom-fields.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/custom/_custom-fields.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/custom/_custom-fields.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/custom/_custom-fields.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/custom/_flash_messages.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/custom/_flash_messages.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/custom/_flash_messages.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/custom/_flash_messages.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/custom/_fonts.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/custom/_fonts.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/custom/_fonts.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/custom/_fonts.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/custom/_pagination.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/custom/_pagination.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/custom/_pagination.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/custom/_pagination.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/custom/_person.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/custom/_person.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/custom/_person.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/custom/_person.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/custom/_record_actions.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/custom/_record_actions.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/custom/_record_actions.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/custom/_record_actions.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/custom/_report.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/custom/_report.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/custom/_report.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/custom/_report.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/custom/_timeline.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/custom/_timeline.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/custom/_timeline.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/custom/_timeline.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/custom/config/_colors.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/custom/config/_colors.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/custom/config/_colors.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/custom/config/_colors.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/custom/config/_variables.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/custom/config/_variables.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/custom/config/_variables.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/custom/config/_variables.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/custom/mixins/entity.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/custom/mixins/entity.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/custom/mixins/entity.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/custom/mixins/entity.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/custom/modules/_buttons.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/custom/modules/_buttons.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/custom/modules/_buttons.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/custom/modules/_buttons.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/custom/modules/_forms.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/custom/modules/_forms.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/custom/modules/_forms.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/custom/modules/_forms.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/custom/modules/_navigation.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/custom/modules/_navigation.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/custom/modules/_navigation.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/custom/modules/_navigation.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/custom/modules/copy-solid.svg b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/custom/modules/copy-solid.svg
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/custom/modules/copy-solid.svg
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/custom/modules/copy-solid.svg
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/custom/modules/users-slash-solid.svg b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/custom/modules/users-slash-solid.svg
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/custom/modules/users-slash-solid.svg
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/custom/modules/users-slash-solid.svg
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/index.js b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/index.js
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/index.js
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/index.js
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/mixins/_alerts.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/mixins/_alerts.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/mixins/_alerts.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/mixins/_alerts.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/mixins/_buttons.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/mixins/_buttons.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/mixins/_buttons.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/mixins/_buttons.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/modules/_alerts.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/modules/_alerts.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/modules/_alerts.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/modules/_alerts.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/modules/_buttons.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/modules/_buttons.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/modules/_buttons.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/modules/_buttons.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/modules/_content.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/modules/_content.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/modules/_content.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/modules/_content.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/modules/_footer.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/modules/_footer.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/modules/_footer.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/modules/_footer.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/modules/_forms.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/modules/_forms.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/modules/_forms.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/modules/_forms.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/modules/_navigation.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/modules/_navigation.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/modules/_navigation.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/modules/_navigation.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/modules/_table.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/modules/_table.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/modules/_table.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/modules/_table.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/modules/_tabs.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/modules/_tabs.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/modules/_tabs.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/modules/_tabs.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/modules/_typography.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/modules/_typography.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/modules/_typography.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/modules/_typography.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/scratch/scratch.scss b/src/Bundle/ChillMainBundle/Resources/public/module/scratch/scratch.scss
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/scratch/scratch.scss
rename to src/Bundle/ChillMainBundle/Resources/public/module/scratch/scratch.scss
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/_custom.scss b/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/_custom.scss
deleted file mode 100644
index f47043fe2..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/_custom.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-/*
- *  These custom styles will override bootstrap enabled stylesheets
- */
-
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/bootstrap.scss b/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/bootstrap.scss
deleted file mode 100644
index 6b91d1bf0..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/bootstrap.scss
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- *  Enable / disable bootstrap assets
- */
-
-@import "bootstrap/scss/functions";
-
-/* replace variables */
-// @import "bootstrap/scss/variables";
-@import "custom/_variables";
-
-@import "bootstrap/scss/mixins";
-// @import "bootstrap/scss/root";
-// @import "bootstrap/scss/reboot";
-// @import "bootstrap/scss/type";
-// @import "bootstrap/scss/images";
-// @import "bootstrap/scss/code";
-// @import "bootstrap/scss/grid";
-// @import "bootstrap/scss/tables";
-// @import "bootstrap/scss/forms";
-@import "bootstrap/scss/buttons";
-@import "bootstrap/scss/transitions";
-// @import "bootstrap/scss/dropdown";
-// @import "bootstrap/scss/button-group";
-// @import "bootstrap/scss/input-group";
-// @import "bootstrap/scss/custom-forms";
-@import "bootstrap/scss/nav";
-// @import "bootstrap/scss/navbar";
-// @import "bootstrap/scss/card";
-// @import "bootstrap/scss/breadcrumb";
-// @import "bootstrap/scss/pagination";
-@import "bootstrap/scss/badge";
-// @import "bootstrap/scss/jumbotron";
-@import "bootstrap/scss/alert";
-// @import "bootstrap/scss/progress";
-// @import "bootstrap/scss/media";
-// @import "bootstrap/scss/list-group";
-// @import "bootstrap/scss/close";
-// @import "bootstrap/scss/toasts";
-@import "bootstrap/scss/modal";
-// @import "bootstrap/scss/tooltip";
-// @import "bootstrap/scss/popover";
-// @import "bootstrap/scss/carousel";
-// @import "bootstrap/scss/spinners";
-@import "bootstrap/scss/utilities";
-// @import "bootstrap/scss/print";
-
-@import "custom";
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/custom/_variables.scss b/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/custom/_variables.scss
deleted file mode 100644
index 31912030a..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/custom/_variables.scss
+++ /dev/null
@@ -1,1153 +0,0 @@
-/*
- *  Variables
- *  =========
- *  Variables should follow the `$component-state-property-size` formula for
- *  consistent naming. Ex: $nav-link-disabled-color and $modal-content-box-shadow-xs.
- */
-
-/*
- *  Color system
- */
-
-$white:    #fff !default;
-$gray-100: #f3f3f3 !default;
-$gray-200: #e6e6e6 !default;
-$gray-300: #dee2e6 !default;
-$gray-400: #ced4da !default;
-$gray-500: #b2b2b2 !default;
-$gray-600: #6c757d !default;
-$gray-700: #495057 !default;
-$gray-800: #333333 !default;
-$gray-900: #212529 !default;
-$black:    #111 !default;
-
-$grays: () !default;
-$grays: map-merge(
-  (
-    "100": $gray-100,
-    "200": $gray-200,   /* = $chill-llight-gray, $chill-gray */
-    "300": $gray-300,
-    "400": $gray-400,
-    "500": $gray-500,   /* = $chill-light-gray */
-    "600": $gray-600,
-    "700": $gray-700,
-    "800": $gray-800,   /* = $chill-dark-gray */
-    "900": $gray-900
-  ),
-  $grays
-);
-
-/*
- *  CHILL Theme colors
- *  (apply chill colors, add missing colors, trust in bootstrap grey scale)
-*/
-
-$blue:        #334d5c !default;
-$green:       #43b29d !default;
-$yellow:      #eec84a !default;
-$orange:      #e2793d !default;
-$red:         #df4949 !default;
-$pink:        #dd506d !default;
-$green-dark:  #328474 !default;
-$beige:       #cabb9f !default;
-
-$colors: ();
-$colors: map-merge(
-  (
-    "blue":       $blue,
-    "green":      $green,
-    "yellow":     $yellow,
-    "orange":     $orange,
-    "red":        $red,
-    "pink":       $pink,
-    "green-dark": $green-dark,
-    "beige":      $beige,
-    "white":      $white,
-    "gray":       $gray-600,
-    "gray-dark":  $gray-800
-  ),
-  $colors
-);
-
-$primary:       $blue;
-$secondary:     $gray-200;
-$success:       $green;
-$info:          $yellow;
-$warning:       $orange;
-$danger:        $red;
-$light:         $gray-100;
-$dark:          $gray-800;
-
-$theme-colors: ();
-$theme-colors: map-merge(
-  (
-    "primary":    $primary,
-    "secondary":  $secondary,
-    "success":    $success,
-    "info":       $info,
-    "warning":    $warning,
-    "danger":     $danger,
-    "light":      $light,
-    "dark":       $dark
-  ),
-  $theme-colors
-);
-
-
-// Set a specific jump point for requesting color jumps
-$theme-color-interval:      8% !default;
-
-// The yiq lightness value that determines when the lightness of color changes from "dark" to "light". Acceptable values are between 0 and 255.
-$yiq-contrasted-threshold:  150 !default;
-
-// Customize the light and dark text colors for use in our YIQ color contrast function.
-$yiq-text-dark:             $gray-900 !default;
-$yiq-text-light:            $white !default;
-
-// Characters which are escaped by the escape-svg function
-$escaped-characters: (
-  ("<", "%3c"),
-  (">", "%3e"),
-  ("#", "%23"),
-  ("(", "%28"),
-  (")", "%29"),
-) !default;
-
-
-// Options
-//
-// Quickly modify global styling by enabling or disabling optional features.
-
-$enable-caret:                                true !default;
-$enable-rounded:                              true !default;
-$enable-shadows:                              false !default;
-$enable-gradients:                            false !default;
-$enable-transitions:                          true !default;
-$enable-prefers-reduced-motion-media-query:   true !default;
-$enable-hover-media-query:                    false !default; // Deprecated, no longer affects any compiled CSS
-$enable-grid-classes:                         true !default;
-$enable-pointer-cursor-for-buttons:           true !default;
-$enable-print-styles:                         true !default;
-$enable-responsive-font-sizes:                true !default;
-$enable-validation-icons:                     true !default;
-$enable-deprecation-messages:                 true !default;
-
-
-// Spacing
-//
-// Control the default styling of most Bootstrap elements by modifying these
-// variables. Mostly focused on spacing.
-// You can add more entries to the $spacers map, should you need more variation.
-
-$spacer: 1rem !default;
-$spacers: () !default;
-$spacers: map-merge(
-  (
-    0: 0,
-    1: ($spacer * .25),
-    2: ($spacer * .5),
-    3: $spacer,
-    4: ($spacer * 1.5),
-    5: ($spacer * 3)
-  ),
-  $spacers
-);
-
-// This variable affects the `.h-*` and `.w-*` classes.
-$sizes: () !default;
-$sizes: map-merge(
-  (
-    25: 25%,
-    50: 50%,
-    75: 75%,
-    100: 100%,
-    auto: auto
-  ),
-  $sizes
-);
-
-
-// Body
-//
-// Settings for the `<body>` element.
-
-$body-bg:                   $white !default;
-$body-color:                $gray-900 !default;
-
-
-// Links
-//
-// Style anchor elements.
-
-$link-color:            theme-color("primary") !default;
-$link-decoration:       none !default;
-$link-hover-color:      darken($link-color, 15%) !default;
-$link-hover-decoration: none !default;
-
-// Darken percentage for links with `.text-*` class (e.g. `.text-success`)
-$emphasized-link-hover-darken-percentage: 15% !default;
-
-// Paragraphs
-//
-// Style p element.
-
-$paragraph-margin-bottom:   1rem !default;
-
-
-// Grid breakpoints
-//
-// Define the minimum dimensions at which your layout will change,
-// adapting to different screen sizes, for use in media queries.
-
-$grid-breakpoints: (
-  xs: 0,
-  sm: 576px,
-  md: 768px,
-  lg: 992px,
-  xl: 1200px
-) !default;
-
-@include _assert-ascending($grid-breakpoints, "$grid-breakpoints");
-@include _assert-starts-at-zero($grid-breakpoints, "$grid-breakpoints");
-
-
-// Grid containers
-//
-// Define the maximum width of `.container` for different screen sizes.
-
-$container-max-widths: (
-  sm: 540px,
-  md: 720px,
-  lg: 960px,
-  xl: 1140px
-) !default;
-
-@include _assert-ascending($container-max-widths, "$container-max-widths");
-
-
-// Grid columns
-//
-// Set the number of columns and specify the width of the gutters.
-
-$grid-columns:                12 !default;
-$grid-gutter-width:           30px !default;
-$grid-row-columns:            6 !default;
-
-
-// Components
-//
-// Define common padding and border radius sizes and more.
-
-$line-height-lg:              1.5 !default;
-$line-height-sm:              1.5 !default;
-
-$border-width:                1px !default;
-$border-color:                $gray-300 !default;
-
-$border-radius:               .25rem !default;
-$border-radius-lg:            .3rem !default;
-$border-radius-sm:            .2rem !default;
-
-$rounded-pill:                50rem !default;
-
-$box-shadow-sm:               0 .125rem .25rem rgba($black, .075) !default;
-$box-shadow:                  0 .5rem 1rem rgba($black, .15) !default;
-$box-shadow-lg:               0 1rem 3rem rgba($black, .175) !default;
-
-$component-active-color:      $white !default;
-$component-active-bg:         theme-color("primary") !default;
-
-$caret-width:                 .3em !default;
-$caret-vertical-align:        $caret-width * .85 !default;
-$caret-spacing:               $caret-width * .85 !default;
-
-$transition-base:             all .2s ease-in-out !default;
-$transition-fade:             opacity .15s linear !default;
-$transition-collapse:         height .35s ease !default;
-
-$embed-responsive-aspect-ratios: () !default;
-$embed-responsive-aspect-ratios: join(
-  (
-    (21 9),
-    (16 9),
-    (4 3),
-    (1 1),
-  ),
-  $embed-responsive-aspect-ratios
-);
-
-// Typography
-//
-// Font, line-height, and color for body text, headings, and more.
-
-// stylelint-disable value-keyword-case
-$font-family-sans-serif:      'Open Sans';
-$font-family-monospace:       SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace !default;
-$font-family-base:            $font-family-sans-serif !default;
-// stylelint-enable value-keyword-case
-
-$font-size-base:              1rem !default; // Assumes the browser default, typically `16px`
-$font-size-lg:                $font-size-base * 1.25 !default;
-$font-size-sm:                $font-size-base * .875 !default;
-
-$font-weight-lighter:         lighter !default;
-$font-weight-light:           300 !default;
-$font-weight-normal:          400 !default;
-$font-weight-bold:            700 !default;
-$font-weight-bolder:          bolder !default;
-
-$font-weight-base:            $font-weight-normal !default;
-$line-height-base:            1.5 !default;
-
-$h1-font-size:                $font-size-base * 2.0 !default;
-$h2-font-size:                $font-size-base * 1.5 !default;
-$h3-font-size:                $font-size-base * 1.75 !default;
-$h4-font-size:                $font-size-base * 1.5 !default;
-$h5-font-size:                $font-size-base * 1.25 !default;
-$h6-font-size:                $font-size-base !default;
-
-$headings-margin-bottom:      $spacer / 2 !default;
-$headings-font-family:        null !default;
-$headings-font-weight:        500 !default;
-$headings-line-height:        1.2 !default;
-$headings-color:              null !default;
-
-$display1-size:               6rem !default;
-$display2-size:               5.5rem !default;
-$display3-size:               4.5rem !default;
-$display4-size:               3.5rem !default;
-
-$display1-weight:             300 !default;
-$display2-weight:             300 !default;
-$display3-weight:             300 !default;
-$display4-weight:             300 !default;
-$display-line-height:         $headings-line-height !default;
-
-$lead-font-size:              $font-size-base * 1.25 !default;
-$lead-font-weight:            300 !default;
-
-$small-font-size:             80% !default;
-
-$text-muted:                  $gray-600 !default;
-
-$blockquote-small-color:      $gray-600 !default;
-$blockquote-small-font-size:  $small-font-size !default;
-$blockquote-font-size:        $font-size-base * 1.25 !default;
-
-$hr-border-color:             rgba($black, .1) !default;
-$hr-border-width:             $border-width !default;
-
-$mark-padding:                .2em !default;
-
-$dt-font-weight:              $font-weight-bold !default;
-
-$kbd-box-shadow:              inset 0 -.1rem 0 rgba($black, .25) !default;
-$nested-kbd-font-weight:      $font-weight-bold !default;
-
-$list-inline-padding:         .5rem !default;
-
-$mark-bg:                     #fcf8e3 !default;
-
-$hr-margin-y:                 $spacer !default;
-
-
-// Tables
-//
-// Customizes the `.table` component with basic values, each used across all table variations.
-
-$table-cell-padding:          .75rem !default;
-$table-cell-padding-sm:       .3rem !default;
-
-$table-color:                 $body-color !default;
-$table-bg:                    null !default;
-$table-accent-bg:             rgba($black, .05) !default;
-$table-hover-color:           $table-color !default;
-$table-hover-bg:              rgba($black, .075) !default;
-$table-active-bg:             $table-hover-bg !default;
-
-$table-border-width:          $border-width !default;
-$table-border-color:          $border-color !default;
-
-$table-head-bg:               $gray-200 !default;
-$table-head-color:            $gray-700 !default;
-$table-th-font-weight:        null !default;
-
-$table-dark-color:            $white !default;
-$table-dark-bg:               $gray-800 !default;
-$table-dark-accent-bg:        rgba($white, .05) !default;
-$table-dark-hover-color:      $table-dark-color !default;
-$table-dark-hover-bg:         rgba($white, .075) !default;
-$table-dark-border-color:     lighten($table-dark-bg, 7.5%) !default;
-
-$table-striped-order:         odd !default;
-
-$table-caption-color:         $text-muted !default;
-
-$table-bg-level:              -9 !default;
-$table-border-level:          -6 !default;
-
-
-// Buttons + Forms
-//
-// Shared variables that are reassigned to `$input-` and `$btn-` specific variables.
-
-$input-btn-padding-y:         .375rem !default;
-$input-btn-padding-x:         .75rem !default;
-$input-btn-font-family:       null !default;
-$input-btn-font-size:         $font-size-base !default;
-$input-btn-line-height:       $line-height-base !default;
-
-$input-btn-focus-width:       .2rem !default;
-$input-btn-focus-color:       rgba($component-active-bg, .25) !default;
-$input-btn-focus-box-shadow:  0 0 0 $input-btn-focus-width $input-btn-focus-color !default;
-
-$input-btn-padding-y-sm:      .25rem !default;
-$input-btn-padding-x-sm:      .5rem !default;
-$input-btn-font-size-sm:      $font-size-sm !default;
-$input-btn-line-height-sm:    $line-height-sm !default;
-
-$input-btn-padding-y-lg:      .5rem !default;
-$input-btn-padding-x-lg:      1rem !default;
-$input-btn-font-size-lg:      $font-size-lg !default;
-$input-btn-line-height-lg:    $line-height-lg !default;
-
-$input-btn-border-width:      $border-width !default;
-
-
-// Buttons
-//
-// For each of Bootstrap's buttons, define text, background, and border color.
-
-$btn-padding-y:               $input-btn-padding-y !default;
-$btn-padding-x:               $input-btn-padding-x !default;
-$btn-font-family:             $input-btn-font-family !default;
-$btn-font-size:               $input-btn-font-size !default;
-$btn-line-height:             $input-btn-line-height !default;
-$btn-white-space:             null !default; // Set to `nowrap` to prevent text wrapping
-
-$btn-padding-y-sm:            $input-btn-padding-y-sm !default;
-$btn-padding-x-sm:            $input-btn-padding-x-sm !default;
-$btn-font-size-sm:            $input-btn-font-size-sm !default;
-$btn-line-height-sm:          $input-btn-line-height-sm !default;
-
-$btn-padding-y-lg:            $input-btn-padding-y-lg !default;
-$btn-padding-x-lg:            $input-btn-padding-x-lg !default;
-$btn-font-size-lg:            $input-btn-font-size-lg !default;
-$btn-line-height-lg:          $input-btn-line-height-lg !default;
-
-$btn-border-width:            $input-btn-border-width !default;
-
-$btn-font-weight:             $font-weight-normal !default;
-$btn-box-shadow:              inset 0 1px 0 rgba($white, .15), 0 1px 1px rgba($black, .075) !default;
-$btn-focus-width:             $input-btn-focus-width !default;
-$btn-focus-box-shadow:        $input-btn-focus-box-shadow !default;
-$btn-disabled-opacity:        .65 !default;
-$btn-active-box-shadow:       inset 0 3px 5px rgba($black, .125) !default;
-
-$btn-link-disabled-color:     $gray-600 !default;
-
-$btn-block-spacing-y:         .5rem !default;
-
-// Allows for customizing button radius independently from global border radius
-$btn-border-radius:           0 !default;
-$btn-border-radius-lg:        0 !default;
-$btn-border-radius-sm:        0 !default;
-
-$btn-transition:              color .15s ease-in-out, background-color .15s ease-in-out, border-color .15s ease-in-out, box-shadow .15s ease-in-out !default;
-
-
-// Forms
-
-$label-margin-bottom:                   .5rem !default;
-
-$input-padding-y:                       $input-btn-padding-y !default;
-$input-padding-x:                       $input-btn-padding-x !default;
-$input-font-family:                     $input-btn-font-family !default;
-$input-font-size:                       $input-btn-font-size !default;
-$input-font-weight:                     $font-weight-base !default;
-$input-line-height:                     $input-btn-line-height !default;
-
-$input-padding-y-sm:                    $input-btn-padding-y-sm !default;
-$input-padding-x-sm:                    $input-btn-padding-x-sm !default;
-$input-font-size-sm:                    $input-btn-font-size-sm !default;
-$input-line-height-sm:                  $input-btn-line-height-sm !default;
-
-$input-padding-y-lg:                    $input-btn-padding-y-lg !default;
-$input-padding-x-lg:                    $input-btn-padding-x-lg !default;
-$input-font-size-lg:                    $input-btn-font-size-lg !default;
-$input-line-height-lg:                  $input-btn-line-height-lg !default;
-
-$input-bg:                              $white !default;
-$input-disabled-bg:                     $gray-200 !default;
-
-$input-color:                           $gray-700 !default;
-$input-border-color:                    $gray-400 !default;
-$input-border-width:                    $input-btn-border-width !default;
-$input-box-shadow:                      inset 0 1px 1px rgba($black, .075) !default;
-
-$input-border-radius:                   $border-radius !default;
-$input-border-radius-lg:                $border-radius-lg !default;
-$input-border-radius-sm:                $border-radius-sm !default;
-
-$input-focus-bg:                        $input-bg !default;
-$input-focus-border-color:              lighten($component-active-bg, 25%) !default;
-$input-focus-color:                     $input-color !default;
-$input-focus-width:                     $input-btn-focus-width !default;
-$input-focus-box-shadow:                $input-btn-focus-box-shadow !default;
-
-$input-placeholder-color:               $gray-600 !default;
-$input-plaintext-color:                 $body-color !default;
-
-$input-height-border:                   $input-border-width * 2 !default;
-
-$input-height-inner:                    add($input-line-height * 1em, $input-padding-y * 2) !default;
-$input-height-inner-half:               add($input-line-height * .5em, $input-padding-y) !default;
-$input-height-inner-quarter:            add($input-line-height * .25em, $input-padding-y / 2) !default;
-
-$input-height:                          add($input-line-height * 1em, add($input-padding-y * 2, $input-height-border, false)) !default;
-$input-height-sm:                       add($input-line-height-sm * 1em, add($input-padding-y-sm * 2, $input-height-border, false)) !default;
-$input-height-lg:                       add($input-line-height-lg * 1em, add($input-padding-y-lg * 2, $input-height-border, false)) !default;
-
-$input-transition:                      border-color .15s ease-in-out, box-shadow .15s ease-in-out !default;
-
-$form-text-margin-top:                  .25rem !default;
-
-$form-check-input-gutter:               1.25rem !default;
-$form-check-input-margin-y:             .3rem !default;
-$form-check-input-margin-x:             .25rem !default;
-
-$form-check-inline-margin-x:            .75rem !default;
-$form-check-inline-input-margin-x:      .3125rem !default;
-
-$form-grid-gutter-width:                10px !default;
-$form-group-margin-bottom:              1rem !default;
-
-$input-group-addon-color:               $input-color !default;
-$input-group-addon-bg:                  $gray-200 !default;
-$input-group-addon-border-color:        $input-border-color !default;
-
-$custom-forms-transition:               background-color .15s ease-in-out, border-color .15s ease-in-out, box-shadow .15s ease-in-out !default;
-
-$custom-control-gutter:                 .5rem !default;
-$custom-control-spacer-x:               1rem !default;
-$custom-control-cursor:                 null !default;
-
-$custom-control-indicator-size:         1rem !default;
-$custom-control-indicator-bg:           $input-bg !default;
-
-$custom-control-indicator-bg-size:      50% 50% !default;
-$custom-control-indicator-box-shadow:   $input-box-shadow !default;
-$custom-control-indicator-border-color: $gray-500 !default;
-$custom-control-indicator-border-width: $input-border-width !default;
-
-$custom-control-label-color:            null !default;
-
-$custom-control-indicator-disabled-bg:          $input-disabled-bg !default;
-$custom-control-label-disabled-color:           $gray-600 !default;
-
-$custom-control-indicator-checked-color:        $component-active-color !default;
-$custom-control-indicator-checked-bg:           $component-active-bg !default;
-$custom-control-indicator-checked-disabled-bg:  rgba(theme-color("primary"), .5) !default;
-$custom-control-indicator-checked-box-shadow:   null !default;
-$custom-control-indicator-checked-border-color: $custom-control-indicator-checked-bg !default;
-
-$custom-control-indicator-focus-box-shadow:     $input-focus-box-shadow !default;
-$custom-control-indicator-focus-border-color:   $input-focus-border-color !default;
-
-$custom-control-indicator-active-color:         $component-active-color !default;
-$custom-control-indicator-active-bg:            lighten($component-active-bg, 35%) !default;
-$custom-control-indicator-active-box-shadow:    null !default;
-$custom-control-indicator-active-border-color:  $custom-control-indicator-active-bg !default;
-
-$custom-checkbox-indicator-border-radius:       $border-radius !default;
-$custom-checkbox-indicator-icon-checked:        url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' width='8' height='8' viewBox='0 0 8 8'><path fill='#{$custom-control-indicator-checked-color}' d='M6.564.75l-3.59 3.612-1.538-1.55L0 4.26l2.974 2.99L8 2.193z'/></svg>") !default;
-
-$custom-checkbox-indicator-indeterminate-bg:           $component-active-bg !default;
-$custom-checkbox-indicator-indeterminate-color:        $custom-control-indicator-checked-color !default;
-$custom-checkbox-indicator-icon-indeterminate:         url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' width='4' height='4' viewBox='0 0 4 4'><path stroke='#{$custom-checkbox-indicator-indeterminate-color}' d='M0 2h4'/></svg>") !default;
-$custom-checkbox-indicator-indeterminate-box-shadow:   null !default;
-$custom-checkbox-indicator-indeterminate-border-color: $custom-checkbox-indicator-indeterminate-bg !default;
-
-$custom-radio-indicator-border-radius:          50% !default;
-$custom-radio-indicator-icon-checked:           url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' width='12' height='12' viewBox='-4 -4 8 8'><circle r='3' fill='#{$custom-control-indicator-checked-color}'/></svg>") !default;
-
-$custom-switch-width:                           $custom-control-indicator-size * 1.75 !default;
-$custom-switch-indicator-border-radius:         $custom-control-indicator-size / 2 !default;
-$custom-switch-indicator-size:                  subtract($custom-control-indicator-size, $custom-control-indicator-border-width * 4) !default;
-
-$custom-select-padding-y:           $input-padding-y !default;
-$custom-select-padding-x:           $input-padding-x !default;
-$custom-select-font-family:         $input-font-family !default;
-$custom-select-font-size:           $input-font-size !default;
-$custom-select-height:              $input-height !default;
-$custom-select-indicator-padding:   1rem !default; // Extra padding to account for the presence of the background-image based indicator
-$custom-select-font-weight:         $input-font-weight !default;
-$custom-select-line-height:         $input-line-height !default;
-$custom-select-color:               $input-color !default;
-$custom-select-disabled-color:      $gray-600 !default;
-$custom-select-bg:                  $input-bg !default;
-$custom-select-disabled-bg:         $gray-200 !default;
-$custom-select-bg-size:             8px 10px !default; // In pixels because image dimensions
-$custom-select-indicator-color:     $gray-800 !default;
-$custom-select-indicator:           url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' width='4' height='5' viewBox='0 0 4 5'><path fill='#{$custom-select-indicator-color}' d='M2 0L0 2h4zm0 5L0 3h4z'/></svg>") !default;
-$custom-select-background:          escape-svg($custom-select-indicator) right $custom-select-padding-x center / $custom-select-bg-size no-repeat !default; // Used so we can have multiple background elements (e.g., arrow and feedback icon)
-
-$custom-select-feedback-icon-padding-right: add(1em * .75, (2 * $custom-select-padding-y * .75) + $custom-select-padding-x + $custom-select-indicator-padding) !default;
-$custom-select-feedback-icon-position:      center right ($custom-select-padding-x + $custom-select-indicator-padding) !default;
-$custom-select-feedback-icon-size:          $input-height-inner-half $input-height-inner-half !default;
-
-$custom-select-border-width:        $input-border-width !default;
-$custom-select-border-color:        $input-border-color !default;
-$custom-select-border-radius:       $border-radius !default;
-$custom-select-box-shadow:          inset 0 1px 2px rgba($black, .075) !default;
-
-$custom-select-focus-border-color:  $input-focus-border-color !default;
-$custom-select-focus-width:         $input-focus-width !default;
-$custom-select-focus-box-shadow:    0 0 0 $custom-select-focus-width $input-btn-focus-color !default;
-
-$custom-select-padding-y-sm:        $input-padding-y-sm !default;
-$custom-select-padding-x-sm:        $input-padding-x-sm !default;
-$custom-select-font-size-sm:        $input-font-size-sm !default;
-$custom-select-height-sm:           $input-height-sm !default;
-
-$custom-select-padding-y-lg:        $input-padding-y-lg !default;
-$custom-select-padding-x-lg:        $input-padding-x-lg !default;
-$custom-select-font-size-lg:        $input-font-size-lg !default;
-$custom-select-height-lg:           $input-height-lg !default;
-
-$custom-range-track-width:          100% !default;
-$custom-range-track-height:         .5rem !default;
-$custom-range-track-cursor:         pointer !default;
-$custom-range-track-bg:             $gray-300 !default;
-$custom-range-track-border-radius:  1rem !default;
-$custom-range-track-box-shadow:     inset 0 .25rem .25rem rgba($black, .1) !default;
-
-$custom-range-thumb-width:                   1rem !default;
-$custom-range-thumb-height:                  $custom-range-thumb-width !default;
-$custom-range-thumb-bg:                      $component-active-bg !default;
-$custom-range-thumb-border:                  0 !default;
-$custom-range-thumb-border-radius:           1rem !default;
-$custom-range-thumb-box-shadow:              0 .1rem .25rem rgba($black, .1) !default;
-$custom-range-thumb-focus-box-shadow:        0 0 0 1px $body-bg, $input-focus-box-shadow !default;
-$custom-range-thumb-focus-box-shadow-width:  $input-focus-width !default; // For focus box shadow issue in IE/Edge
-$custom-range-thumb-active-bg:               lighten($component-active-bg, 35%) !default;
-$custom-range-thumb-disabled-bg:             $gray-500 !default;
-
-$custom-file-height:                $input-height !default;
-$custom-file-height-inner:          $input-height-inner !default;
-$custom-file-focus-border-color:    $input-focus-border-color !default;
-$custom-file-focus-box-shadow:      $input-focus-box-shadow !default;
-$custom-file-disabled-bg:           $input-disabled-bg !default;
-
-$custom-file-padding-y:             $input-padding-y !default;
-$custom-file-padding-x:             $input-padding-x !default;
-$custom-file-line-height:           $input-line-height !default;
-$custom-file-font-family:           $input-font-family !default;
-$custom-file-font-weight:           $input-font-weight !default;
-$custom-file-color:                 $input-color !default;
-$custom-file-bg:                    $input-bg !default;
-$custom-file-border-width:          $input-border-width !default;
-$custom-file-border-color:          $input-border-color !default;
-$custom-file-border-radius:         $input-border-radius !default;
-$custom-file-box-shadow:            $input-box-shadow !default;
-$custom-file-button-color:          $custom-file-color !default;
-$custom-file-button-bg:             $input-group-addon-bg !default;
-$custom-file-text: (
-        en: "Browse"
-) !default;
-
-
-// Form validation
-
-$form-feedback-margin-top:          $form-text-margin-top !default;
-$form-feedback-font-size:           $small-font-size !default;
-$form-feedback-valid-color:         theme-color("success") !default;
-$form-feedback-invalid-color:       theme-color("danger") !default;
-
-$form-feedback-icon-valid-color:    $form-feedback-valid-color !default;
-$form-feedback-icon-valid:          url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' width='8' height='8' viewBox='0 0 8 8'><path fill='#{$form-feedback-icon-valid-color}' d='M2.3 6.73L.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/></svg>") !default;
-$form-feedback-icon-invalid-color:  $form-feedback-invalid-color !default;
-$form-feedback-icon-invalid:        url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' width='12' height='12' fill='none' stroke='#{$form-feedback-icon-invalid-color}' viewBox='0 0 12 12'><circle cx='6' cy='6' r='4.5'/><path stroke-linejoin='round' d='M5.8 3.6h.4L6 6.5z'/><circle cx='6' cy='8.2' r='.6' fill='#{$form-feedback-icon-invalid-color}' stroke='none'/></svg>") !default;
-
-$form-validation-states: () !default;
-$form-validation-states: map-merge(
-  (
-    "valid": (
-      "color": $form-feedback-valid-color,
-      "icon": $form-feedback-icon-valid
-    ),
-    "invalid": (
-      "color": $form-feedback-invalid-color,
-      "icon": $form-feedback-icon-invalid
-    ),
-  ),
-  $form-validation-states
-);
-
-// Z-index master list
-//
-// Warning: Avoid customizing these values. They're used for a bird's eye view
-// of components dependent on the z-axis and are designed to all work together.
-
-$zindex-dropdown:                   1000 !default;
-$zindex-sticky:                     1020 !default;
-$zindex-fixed:                      1030 !default;
-$zindex-modal-backdrop:             1040 !default;
-$zindex-modal:                      1050 !default;
-$zindex-popover:                    1060 !default;
-$zindex-tooltip:                    1070 !default;
-
-
-// Navs
-
-$nav-link-padding-y:                .5rem !default;
-$nav-link-padding-x:                1rem !default;
-$nav-link-disabled-color:           $gray-600 !default;
-
-$nav-tabs-border-color:             $gray-300 !default;
-$nav-tabs-border-width:             $border-width !default;
-$nav-tabs-border-radius:            $border-radius !default;
-$nav-tabs-link-hover-border-color:  $gray-200 $gray-200 $nav-tabs-border-color !default;
-$nav-tabs-link-active-color:        $gray-700 !default;
-$nav-tabs-link-active-bg:           $body-bg !default;
-$nav-tabs-link-active-border-color: $gray-300 $gray-300 $nav-tabs-link-active-bg !default;
-
-$nav-pills-border-radius:           $border-radius !default;
-$nav-pills-link-active-color:       $component-active-color !default;
-$nav-pills-link-active-bg:          $component-active-bg !default;
-
-$nav-divider-color:                 $gray-200 !default;
-$nav-divider-margin-y:              $spacer / 2 !default;
-
-
-// Navbar
-
-$navbar-padding-y:                  $spacer / 2 !default;
-$navbar-padding-x:                  $spacer !default;
-
-$navbar-nav-link-padding-x:         .5rem !default;
-
-$navbar-brand-font-size:            $font-size-lg !default;
-// Compute the navbar-brand padding-y so the navbar-brand will have the same height as navbar-text and nav-link
-$nav-link-height:                   $font-size-base * $line-height-base + $nav-link-padding-y * 2 !default;
-$navbar-brand-height:               $navbar-brand-font-size * $line-height-base !default;
-$navbar-brand-padding-y:            ($nav-link-height - $navbar-brand-height) / 2 !default;
-
-$navbar-toggler-padding-y:          .25rem !default;
-$navbar-toggler-padding-x:          .75rem !default;
-$navbar-toggler-font-size:          $font-size-lg !default;
-$navbar-toggler-border-radius:      $btn-border-radius !default;
-
-$navbar-nav-scroll-max-height:      75vh !default;
-
-$navbar-dark-color:                 rgba($white, .5) !default;
-$navbar-dark-hover-color:           rgba($white, .75) !default;
-$navbar-dark-active-color:          $white !default;
-$navbar-dark-disabled-color:        rgba($white, .25) !default;
-$navbar-dark-toggler-icon-bg:       url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' width='30' height='30' viewBox='0 0 30 30'><path stroke='#{$navbar-dark-color}' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/></svg>") !default;
-$navbar-dark-toggler-border-color:  rgba($white, .1) !default;
-
-$navbar-light-color:                rgba($black, .5) !default;
-$navbar-light-hover-color:          rgba($black, .7) !default;
-$navbar-light-active-color:         rgba($black, .9) !default;
-$navbar-light-disabled-color:       rgba($black, .3) !default;
-$navbar-light-toggler-icon-bg:      url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' width='30' height='30' viewBox='0 0 30 30'><path stroke='#{$navbar-light-color}' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/></svg>") !default;
-$navbar-light-toggler-border-color: rgba($black, .1) !default;
-
-$navbar-light-brand-color:                $navbar-light-active-color !default;
-$navbar-light-brand-hover-color:          $navbar-light-active-color !default;
-$navbar-dark-brand-color:                 $navbar-dark-active-color !default;
-$navbar-dark-brand-hover-color:           $navbar-dark-active-color !default;
-
-
-// Dropdowns
-//
-// Dropdown menu container and contents.
-
-$dropdown-min-width:                10rem !default;
-$dropdown-padding-x:                0 !default;
-$dropdown-padding-y:                .5rem !default;
-$dropdown-spacer:                   .125rem !default;
-$dropdown-font-size:                $font-size-base !default;
-$dropdown-color:                    $body-color !default;
-$dropdown-bg:                       $white !default;
-$dropdown-border-color:             rgba($black, .15) !default;
-$dropdown-border-radius:            $border-radius !default;
-$dropdown-border-width:             $border-width !default;
-$dropdown-inner-border-radius:      subtract($dropdown-border-radius, $dropdown-border-width) !default;
-$dropdown-divider-bg:               $gray-200 !default;
-$dropdown-divider-margin-y:         $nav-divider-margin-y !default;
-$dropdown-box-shadow:               0 .5rem 1rem rgba($black, .175) !default;
-
-$dropdown-link-color:               $gray-900 !default;
-$dropdown-link-hover-color:         darken($gray-900, 5%) !default;
-$dropdown-link-hover-bg:            $gray-200 !default;
-
-$dropdown-link-active-color:        $component-active-color !default;
-$dropdown-link-active-bg:           $component-active-bg !default;
-
-$dropdown-link-disabled-color:      $gray-500 !default;
-
-$dropdown-item-padding-y:           .25rem !default;
-$dropdown-item-padding-x:           1.5rem !default;
-
-$dropdown-header-color:             $gray-600 !default;
-$dropdown-header-padding:           $dropdown-padding-y $dropdown-item-padding-x !default;
-
-
-// Pagination
-
-$pagination-padding-y:              .5rem !default;
-$pagination-padding-x:              .75rem !default;
-$pagination-padding-y-sm:           .25rem !default;
-$pagination-padding-x-sm:           .5rem !default;
-$pagination-padding-y-lg:           .75rem !default;
-$pagination-padding-x-lg:           1.5rem !default;
-$pagination-line-height:            1.25 !default;
-
-$pagination-color:                  $link-color !default;
-$pagination-bg:                     $white !default;
-$pagination-border-width:           $border-width !default;
-$pagination-border-color:           $gray-300 !default;
-
-$pagination-focus-box-shadow:       $input-btn-focus-box-shadow !default;
-$pagination-focus-outline:          0 !default;
-
-$pagination-hover-color:            $link-hover-color !default;
-$pagination-hover-bg:               $gray-200 !default;
-$pagination-hover-border-color:     $gray-300 !default;
-
-$pagination-active-color:           $component-active-color !default;
-$pagination-active-bg:              $component-active-bg !default;
-$pagination-active-border-color:    $pagination-active-bg !default;
-
-$pagination-disabled-color:         $gray-600 !default;
-$pagination-disabled-bg:            $white !default;
-$pagination-disabled-border-color:  $gray-300 !default;
-
-$pagination-border-radius-sm:       $border-radius-sm !default;
-$pagination-border-radius-lg:       $border-radius-lg !default;
-
-// Jumbotron
-
-$jumbotron-padding:                 2rem !default;
-$jumbotron-color:                   null !default;
-$jumbotron-bg:                      $gray-200 !default;
-
-
-// Cards
-
-$card-spacer-y:                     .75rem !default;
-$card-spacer-x:                     1.25rem !default;
-$card-border-width:                 $border-width !default;
-$card-border-radius:                $border-radius !default;
-$card-border-color:                 rgba($black, .125) !default;
-$card-inner-border-radius:          subtract($card-border-radius, $card-border-width) !default;
-$card-cap-bg:                       rgba($black, .03) !default;
-$card-cap-color:                    null !default;
-$card-height:                       null !default;
-$card-color:                        null !default;
-$card-bg:                           $white !default;
-
-$card-img-overlay-padding:          1.25rem !default;
-
-$card-group-margin:                 $grid-gutter-width / 2 !default;
-$card-deck-margin:                  $card-group-margin !default;
-
-$card-columns-count:                3 !default;
-$card-columns-gap:                  1.25rem !default;
-$card-columns-margin:               $card-spacer-y !default;
-
-
-// Tooltips
-
-$tooltip-font-size:                 $font-size-sm !default;
-$tooltip-max-width:                 200px !default;
-$tooltip-color:                     $white !default;
-$tooltip-bg:                        $black !default;
-$tooltip-border-radius:             $border-radius !default;
-$tooltip-opacity:                   .9 !default;
-$tooltip-padding-y:                 .25rem !default;
-$tooltip-padding-x:                 .5rem !default;
-$tooltip-margin:                    0 !default;
-
-$tooltip-arrow-width:               .8rem !default;
-$tooltip-arrow-height:              .4rem !default;
-$tooltip-arrow-color:               $tooltip-bg !default;
-
-// Form tooltips must come after regular tooltips
-$form-feedback-tooltip-padding-y:     $tooltip-padding-y !default;
-$form-feedback-tooltip-padding-x:     $tooltip-padding-x !default;
-$form-feedback-tooltip-font-size:     $tooltip-font-size !default;
-$form-feedback-tooltip-line-height:   $line-height-base !default;
-$form-feedback-tooltip-opacity:       $tooltip-opacity !default;
-$form-feedback-tooltip-border-radius: $tooltip-border-radius !default;
-
-
-// Popovers
-
-$popover-font-size:                 $font-size-sm !default;
-$popover-bg:                        $white !default;
-$popover-max-width:                 276px !default;
-$popover-border-width:              $border-width !default;
-$popover-border-color:              rgba($black, .2) !default;
-$popover-border-radius:             $border-radius-lg !default;
-$popover-inner-border-radius:       subtract($popover-border-radius, $popover-border-width) !default;
-$popover-box-shadow:                0 .25rem .5rem rgba($black, .2) !default;
-
-$popover-header-bg:                 darken($popover-bg, 3%) !default;
-$popover-header-color:              $headings-color !default;
-$popover-header-padding-y:          .5rem !default;
-$popover-header-padding-x:          .75rem !default;
-
-$popover-body-color:                $body-color !default;
-$popover-body-padding-y:            $popover-header-padding-y !default;
-$popover-body-padding-x:            $popover-header-padding-x !default;
-
-$popover-arrow-width:               1rem !default;
-$popover-arrow-height:              .5rem !default;
-$popover-arrow-color:               $popover-bg !default;
-
-$popover-arrow-outer-color:         fade-in($popover-border-color, .05) !default;
-
-
-// Toasts
-
-$toast-max-width:                   350px !default;
-$toast-padding-x:                   .75rem !default;
-$toast-padding-y:                   .25rem !default;
-$toast-font-size:                   .875rem !default;
-$toast-color:                       null !default;
-$toast-background-color:            rgba($white, .85) !default;
-$toast-border-width:                1px !default;
-$toast-border-color:                rgba(0, 0, 0, .1) !default;
-$toast-border-radius:               .25rem !default;
-$toast-box-shadow:                  0 .25rem .75rem rgba($black, .1) !default;
-
-$toast-header-color:                $gray-600 !default;
-$toast-header-background-color:     rgba($white, .85) !default;
-$toast-header-border-color:         rgba(0, 0, 0, .05) !default;
-
-
-// Badges
-
-$badge-font-size:                   75% !default;
-$badge-font-weight:                 $font-weight-bold !default;
-$badge-padding-y:                   .25em !default;
-$badge-padding-x:                   .4em !default;
-$badge-border-radius:               $border-radius !default;
-
-$badge-transition:                  $btn-transition !default;
-$badge-focus-width:                 $input-btn-focus-width !default;
-
-$badge-pill-padding-x:              .6em !default;
-// Use a higher than normal value to ensure completely rounded edges when
-// customizing padding or font-size on labels.
-$badge-pill-border-radius:          10rem !default;
-
-
-// Modals
-
-// Padding applied to the modal body
-$modal-inner-padding:               1rem !default;
-
-// Margin between elements in footer, must be lower than or equal to 2 * $modal-inner-padding
-$modal-footer-margin-between:       .5rem !default;
-
-$modal-dialog-margin:               .5rem !default;
-$modal-dialog-margin-y-sm-up:       1.75rem !default;
-
-$modal-title-line-height:           $line-height-base !default;
-
-$modal-content-color:               null !default;
-$modal-content-bg:                  $white !default;
-$modal-content-border-color:        rgba($black, .2) !default;
-$modal-content-border-width:        $border-width !default;
-$modal-content-border-radius:       $border-radius-lg !default;
-$modal-content-inner-border-radius: subtract($modal-content-border-radius, $modal-content-border-width) !default;
-$modal-content-box-shadow-xs:       0 .25rem .5rem rgba($black, .5) !default;
-$modal-content-box-shadow-sm-up:    0 .5rem 1rem rgba($black, .5) !default;
-
-$modal-backdrop-bg:                 $black !default;
-$modal-backdrop-opacity:            .5 !default;
-$modal-header-border-color:         $border-color !default;
-$modal-footer-border-color:         $modal-header-border-color !default;
-$modal-header-border-width:         $modal-content-border-width !default;
-$modal-footer-border-width:         $modal-header-border-width !default;
-$modal-header-padding-y:            1rem !default;
-$modal-header-padding-x:            1rem !default;
-$modal-header-padding:              $modal-header-padding-y $modal-header-padding-x !default; // Keep this for backwards compatibility
-
-$modal-xl:                          1140px !default;
-$modal-lg:                          800px !default;
-$modal-md:                          500px !default;
-$modal-sm:                          300px !default;
-
-$modal-fade-transform:              translate(0, -50px) !default;
-$modal-show-transform:              none !default;
-$modal-transition:                  transform .3s ease-out !default;
-$modal-scale-transform:             scale(1.02) !default;
-
-
-// Alerts
-//
-// Define alert colors, border radius, and padding.
-
-$alert-padding-y:                   .75rem !default;
-$alert-padding-x:                   1.25rem !default;
-$alert-margin-bottom:               1rem !default;
-$alert-border-radius:               0 !default;
-$alert-link-font-weight:            $font-weight-bold !default;
-$alert-border-width:                0 !default;
-
-$alert-bg-level:                    -10 !default;
-$alert-border-level:                -9 !default;
-$alert-color-level:                 6 !default;
-
-
-// Progress bars
-
-$progress-height:                   1rem !default;
-$progress-font-size:                $font-size-base * .75 !default;
-$progress-bg:                       $gray-200 !default;
-$progress-border-radius:            $border-radius !default;
-$progress-box-shadow:               inset 0 .1rem .1rem rgba($black, .1) !default;
-$progress-bar-color:                $white !default;
-$progress-bar-bg:                   theme-color("primary") !default;
-$progress-bar-animation-timing:     1s linear infinite !default;
-$progress-bar-transition:           width .6s ease !default;
-
-
-// List group
-
-$list-group-color:                  null !default;
-$list-group-bg:                     $white !default;
-$list-group-border-color:           rgba($black, .125) !default;
-$list-group-border-width:           $border-width !default;
-$list-group-border-radius:          $border-radius !default;
-
-$list-group-item-padding-y:         .75rem !default;
-$list-group-item-padding-x:         1.25rem !default;
-
-$list-group-hover-bg:               $gray-100 !default;
-$list-group-active-color:           $component-active-color !default;
-$list-group-active-bg:              $component-active-bg !default;
-$list-group-active-border-color:    $list-group-active-bg !default;
-
-$list-group-disabled-color:         $gray-600 !default;
-$list-group-disabled-bg:            $list-group-bg !default;
-
-$list-group-action-color:           $gray-700 !default;
-$list-group-action-hover-color:     $list-group-action-color !default;
-
-$list-group-action-active-color:    $body-color !default;
-$list-group-action-active-bg:       $gray-200 !default;
-
-
-// Image thumbnails
-
-$thumbnail-padding:                 .25rem !default;
-$thumbnail-bg:                      $body-bg !default;
-$thumbnail-border-width:            $border-width !default;
-$thumbnail-border-color:            $gray-300 !default;
-$thumbnail-border-radius:           $border-radius !default;
-$thumbnail-box-shadow:              0 1px 2px rgba($black, .075) !default;
-
-
-// Figures
-
-$figure-caption-font-size:          90% !default;
-$figure-caption-color:              $gray-600 !default;
-
-
-// Breadcrumbs
-
-$breadcrumb-font-size:              null !default;
-
-$breadcrumb-padding-y:              .75rem !default;
-$breadcrumb-padding-x:              1rem !default;
-$breadcrumb-item-padding:           .5rem !default;
-
-$breadcrumb-margin-bottom:          1rem !default;
-
-$breadcrumb-bg:                     $gray-200 !default;
-$breadcrumb-divider-color:          $gray-600 !default;
-$breadcrumb-active-color:           $gray-600 !default;
-$breadcrumb-divider:                quote("/") !default;
-
-$breadcrumb-border-radius:          $border-radius !default;
-
-
-// Carousel
-
-$carousel-control-color:             $white !default;
-$carousel-control-width:             15% !default;
-$carousel-control-opacity:           .5 !default;
-$carousel-control-hover-opacity:     .9 !default;
-$carousel-control-transition:        opacity .15s ease !default;
-
-$carousel-indicator-width:           30px !default;
-$carousel-indicator-height:          3px !default;
-$carousel-indicator-hit-area-height: 10px !default;
-$carousel-indicator-spacer:          3px !default;
-$carousel-indicator-active-bg:       $white !default;
-$carousel-indicator-transition:      opacity .6s ease !default;
-
-$carousel-caption-width:             70% !default;
-$carousel-caption-color:             $white !default;
-
-$carousel-control-icon-width:        20px !default;
-
-$carousel-control-prev-icon-bg:      url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' fill='#{$carousel-control-color}' width='8' height='8' viewBox='0 0 8 8'><path d='M5.25 0l-4 4 4 4 1.5-1.5L4.25 4l2.5-2.5L5.25 0z'/></svg>") !default;
-$carousel-control-next-icon-bg:      url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' fill='#{$carousel-control-color}' width='8' height='8' viewBox='0 0 8 8'><path d='M2.75 0l-1.5 1.5L3.75 4l-2.5 2.5L2.75 8l4-4-4-4z'/></svg>") !default;
-
-$carousel-transition-duration:       .6s !default;
-$carousel-transition:                transform $carousel-transition-duration ease-in-out !default; // Define transform transition first if using multiple transitions (e.g., `transform 2s ease, opacity .5s ease-out`)
-
-
-// Spinners
-
-$spinner-width:         2rem !default;
-$spinner-height:        $spinner-width !default;
-$spinner-border-width:  .25em !default;
-
-$spinner-width-sm:        1rem !default;
-$spinner-height-sm:       $spinner-width-sm !default;
-$spinner-border-width-sm: .2em !default;
-
-
-// Close
-
-$close-font-size:                   $font-size-base * 1.5 !default;
-$close-font-weight:                 $font-weight-bold !default;
-$close-color:                       $black !default;
-$close-text-shadow:                 0 1px 0 $white !default;
-
-
-// Code
-
-$code-font-size:                    87.5% !default;
-$code-color:                        $pink !default;
-
-$kbd-padding-y:                     .2rem !default;
-$kbd-padding-x:                     .4rem !default;
-$kbd-font-size:                     $code-font-size !default;
-$kbd-color:                         $white !default;
-$kbd-bg:                            $gray-900 !default;
-
-$pre-color:                         $gray-900 !default;
-$pre-scrollable-max-height:         340px !default;
-
-
-// Utilities
-
-$displays: none, inline, inline-block, block, table, table-row, table-cell, flex, inline-flex !default;
-$overflows: auto, hidden !default;
-$positions: static, relative, absolute, fixed, sticky !default;
-$user-selects: all, auto, none !default;
-
-
-// Printing
-
-$print-page-size:                   a3 !default;
-$print-body-min-width:              map-get($grid-breakpoints, "lg") !default;
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/login_page/desert.jpg b/src/Bundle/ChillMainBundle/Resources/public/page/login/desert.jpg
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/login_page/desert.jpg
rename to src/Bundle/ChillMainBundle/Resources/public/page/login/desert.jpg
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/login_page/index.js b/src/Bundle/ChillMainBundle/Resources/public/page/login/index.js
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/login_page/index.js
rename to src/Bundle/ChillMainBundle/Resources/public/page/login/index.js
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/login_page/login.scss b/src/Bundle/ChillMainBundle/Resources/public/page/login/login.scss
similarity index 95%
rename from src/Bundle/ChillMainBundle/Resources/public/modules/login_page/login.scss
rename to src/Bundle/ChillMainBundle/Resources/public/page/login/login.scss
index a451171b3..6cd15d577 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/modules/login_page/login.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/page/login/login.scss
@@ -1,4 +1,4 @@
-@import './../../fonts/OpenSans/OpenSans';
+@import 'ChillMainAssets/chill/fonts/OpenSans/OpenSans';
 
 html, body {
     height: 100%;
diff --git a/src/Bundle/ChillMainBundle/Resources/public/scss/_alert-first-child.scss b/src/Bundle/ChillMainBundle/Resources/public/scss/_alert-first-child.scss
deleted file mode 100644
index 9a089c8a7..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/scss/_alert-first-child.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-/* 
- * when an alert is the first child of the page, with a banner, we do not want the alert to be merged with the banner
- */
-div.container.content {
-  & > div {
-    div.alert:nth-child(2) {
-      margin-top: 1rem;
-    }
-  }
-}
diff --git a/src/Bundle/ChillMainBundle/Resources/public/scss/_alert-with-actions.scss b/src/Bundle/ChillMainBundle/Resources/public/scss/_alert-with-actions.scss
deleted file mode 100644
index 0779ca7b3..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/scss/_alert-with-actions.scss
+++ /dev/null
@@ -1,29 +0,0 @@
-
-div.alert.alert-with-actions {
-  display: flex;
-  flex-direction: row;
-
-  ul.record_actions {
-    display: flex;
-    flex-direction: column;
-    padding: 0;
-    margin: 0;
-
-    li:nth-child(1n+2) {
-      margin-top: 0.5rem; 
-    }
-
-    li {
-      margin-right: 0;
-    }
-  }
-
-  @media screen and (max-width: 1050px) {
-      flex-direction: column;
-
-      ul.record_actions {
-        margin-top: 1rem;
-        text-align: center;
-      }
-  }
-}
diff --git a/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss b/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss
deleted file mode 100644
index 41a15522f..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
- * NOTE 2021.04
- * scss/chillmain.scss is the main sass file for the new chill.2
- * scratch will be replaced by bootstrap, please avoid to edit in modules/scratch/_custom.scss
- *
- * when possible, try to use bootstrap html class
-*/
-
-
-@import 'alert-first-child';
-@import 'alert-with-actions';
-
-
-/*  [hack]  /!\ Contourne le positionnement problématique du div#content_conainter suivant,
- *  car sa position: relative le place au-dessus du bandeau et les liens sont incliquables  */
-div.subheader {
-  height: 130px;
-}
-
-/*
- * Specific rules
- */
-
-// [scratch] un bouton 'disabled' non clickable
-.sc-button {
-   &.disabled {
-      cursor: default;
-      &.bt-remove {
-         background-color: #d9d9d9;
-      }
-   }
-}
-
-// [debug] un affichage discret pour le debug
-.discret {
-   color: grey;
-   margin-right: 1em;
-}
-
-// reserre la hauteur des rangées de tableau (ul.record_actions prennait trop de place)
-table {
-   ul.record_actions {
-      margin: 0;
-      padding: 0.5em;
-   }
-}
-
-// styles communs pour tous les bandeaux
-div.banner {
-   .id-number {
-      font-weight: lighter; 
-      font-size: 50%;
-      &:before { content: '(n°'; }
-      &:after { content: ')'; }
-   }
-   a.phone, 
-   a.email {
-      color: white;
-   }
-   ul.list-content {
-      //margin: 0 auto;
-   }
-   span.age {
-      margin-left: 0.5em;
-      &:before { content: '('; }
-      &:after { content: ')'; }
-   }
-   div.members {
-      display: flex;
-      flex-direction: row;
-      span.badge-member {
-         border: 1px solid #ffffff3b;
-         color: #ffffff;
-         padding: 0.4em 0.8em;
-         margin-right: 0.3em;
-         border-radius: 8px;
-         &.holder {
-            order: -1;
-         }
-         &.child {
-            order: 2;
-         }
-      }
-   }
-}
-
-/*
-*  FLEX RESPONSIVE TABLE/BLOCK PRESENTATION
-*/
-div.flex-bloc,
-div.flex-table {
-   h2, h3, h4, dl, p {
-      margin: 0;
-   }
-   h2, h3, h4 {
-      color: var(--chill-blue);
-   }
-   div.item-bloc {
-      // We use box-shadow instead of border
-      // to avoid to manage border double-width 
-      // when blocs are resized for small screen !
-      // Then we can simulate border-collapse: collapse (table)
-      box-shadow: 
-          1px 0 0 0 #000, 
-          0 1px 0 0 #000, 
-          1px 1px 0 0 #000,   /* fix the corner */
-          1px 0 0 0 #000 inset, 
-          0 1px 0 0 #000 inset;
-   }
-}
-
-/*
-* Bloc appearance
-*/
-div.flex-bloc {
-   box-sizing: border-box;
-   display: flex;
-   flex-direction: row;
-   flex-wrap: wrap;
-   align-items: stretch;
-   align-content: stretch;
-
-   div.item-bloc {
-      flex-grow: 0; flex-shrink: 1; flex-basis: 33%;
-      margin: 0;
-      padding: 1em;
-      display: flex;
-      flex-direction: column;
-
-      div.item-row {
-         flex-grow: 1; flex-shrink: 1; flex-basis: auto;
-         display: flex;
-         flex-direction: column;
-
-         div.item-col {
-            &:first-child {
-               flex-grow: 0; flex-shrink: 0; flex-basis: auto;
-            }
-            &:last-child {
-               flex-grow: 1; flex-shrink: 1; flex-basis: auto;
-               display: flex;
-
-               .list-content { // ul, dl, or div
-               }
-               ul.record_actions {
-                  margin: 0;
-                  align-self: flex-end;
-                  flex-grow: 1; flex-shrink: 0; flex-basis: auto;
-                  li {
-                     margin-right: 5px;
-                  }
-               }
-            }
-         }
-      }
-   }
-   @media only screen and (max-width: 945px) { margin: auto -0.2em; }
-   @media only screen and (max-width: 935px) { margin: auto -0.5em; }
-   @media only screen and (max-width: 920px) { margin: auto -0.9em; }
-   @media only screen and (max-width: 900px) {
-      flex-direction: column;
-      margin: auto 0;
-   }
-}
-
-/*
-* Table appearance
-*/
-div.flex-table {
-   display: flex;
-   flex-direction: column;
-   align-items: stretch;
-   align-content: stretch;
-
-   div.item-bloc {
-      display: flex;
-      flex-direction: column;
-      padding: 1em;
-      &:nth-child(even) {
-         background-color: #e6e6e6;
-      }
-
-      div.item-row {
-         display: flex;
-         flex-direction: row;
-         &:not(:first-child) {
-            margin-top: 0.5em;
-            border-top: 1px dotted #0000004f;
-            padding-top: 0.5em;
-            flex-direction: column;
-         }
-
-         div.item-col {
-            &:first-child {
-               flex-grow: 0; flex-shrink: 0; flex-basis: 33%;
-            }
-            &:last-child {
-               flex-grow: 1; flex-shrink: 1; flex-basis: auto;
-               display: flex;
-               justify-content: flex-end;
-
-               .list-content { // ul, dl, or div
-               }
-               ul.record_actions {
-                  margin: 0;
-                  align-self: flex-start;
-                  flex-grow: 1; flex-shrink: 0; flex-basis: auto;
-                  li {
-                     margin-right: 5px;
-                  }
-               }
-            }
-         }
-         @media only screen and (max-width: 900px) {
-            flex-direction: column;
-            div.item-col {
-               &:last-child {
-                  ul.record_actions {
-                     align-self: flex-end;
-                  }
-               }
-            }
-         }
-
-         // neutralize
-         div.chill_address div.chill_address_address p { text-indent: 0; }
-      }
-   }
-}
-
-/*
-* Address form
-*/
-div.address_form {
-   display: flex;
-   flex-direction: column;
-   div.address_form__header {
-
-   }
-   div.address_form__select {
-      display: flex;
-      flex-direction: row;
-      justify-content: space-between;
-
-      div.address_form__select__body {
-         display: flex;
-         flex-direction: column;
-         flex-grow: 1;
-         div.custom-address, div.custom-postcode {
-             padding: 12px;
-         }
-      }
-
-      div.address_form__select__map {
-         margin: 0px 20px;
-         div#address_map {
-            height:400px;
-            width:400px;
-            input {
-               border: 1px solid #999;
-            }
-         }
-      }
-   }
-   div.address_form__more {
-      & > div {
-         display: flex;
-         & > label {
-            width: 30%;
-         }
-      }
-   }
-}
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
index 438e94892..72b46c3ab 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
@@ -1,28 +1,30 @@
 <template>
+   <div class="chill-entity entity-address">
 
-   <div class='person__address__create'>
-      <div>
-         <h2 v-if="!edit">{{ $t('create_a_new_address') }}</h2>
-         <h2 v-else>{{ $t('edit_a_new_address') }}</h2>
-         <add-address
-            @addNewAddress="addNewAddress">
-         </add-address>
-      </div>
+      <h2 v-if="!edit">{{ $t('create_a_new_address') }}</h2>
+      <h2 v-else>{{ $t('edit_address') }}</h2>
 
-      <div>
-         <show-address
-            v-if="address"
-            v-bind:address="address">
-         </show-address>
-      </div>
+      <show-address
+         v-if="address"
+         v-bind:address="address">
+      </show-address>
+
+      <add-address
+         @addNewAddress="addNewAddress">
+      </add-address>
    </div>
-   <div v-if="!edit" class='person__address__valid'>
+
+   <div v-if="!edit" class='person-address__valid'>
       <h2>{{ $t('date') }}</h2>
-      <input
-         type="date"
-         name="validFrom"
-         :placeholder="$t('validFrom')"
-         v-model="validFrom"/>
+
+      <div class="input-group mb-3">
+         <span class="input-group-text" id="validFrom"><i class="fa fa-fw fa-calendar"></i></span>
+         <input type="date" class="form-control form-control-lg" name="validFrom"
+            v-bind:placeholder="$t('validFrom')"
+            v-model="validFrom"
+            aria-describedby="validFrom" />
+      </div>
+
       <div v-if="errors.length > 0">
          {{ errors }}
       </div>
@@ -34,24 +36,21 @@
       </div>
    </div>
 
-   <div>
-      <ul class="record_actions sticky-form-buttons">
-         <li class="cancel">
-            <a :href=backUrl class="sc-button bt-cancel">{{ $t('back_to_the_list') }}</a>
-         </li>
-         <li v-if="!edit">
-            <button type="submit" class="sc-button bt-update centered" @click="addToPerson">
-               {{ $t('add_an_address_to_person') }}
-            </button>
-         </li>
-      </ul>
-   </div>
-
+   <ul class="record_actions sticky-form-buttons">
+      <li class="cancel">
+         <a :href="backUrl" class="btn btn-cancel">{{ $t('back_to_the_list') }}</a>
+      </li>
+      <li v-if="!edit">
+         <button type="submit" class="btn btn-update" @click="addToPerson">
+            {{ $t('add_an_address_to_person') }}
+         </button>
+      </li>
+   </ul>
 </template>
 
 <script>
-import AddAddress from '../_components/AddAddress.vue';
-import ShowAddress from '../_components/ShowAddress.vue';
+import AddAddress from './components/AddAddress.vue';
+import ShowAddress from './components/ShowAddress.vue';
 
 export default {
    name: 'App',
@@ -131,7 +130,8 @@ export default {
          this.$store.dispatch('addDateToAddressAndAddressToPerson', {
             personId: this.personId,
             addressId: this.$store.state.address.address_id,
-            body: { validFrom: {datetime: `${this.validFrom}T00:00:00+0100`}}
+            body: { validFrom: {datetime: `${this.validFrom}T00:00:00+0100`}},
+            backUrl: this.backUrl
          })
       },
       getEditAddress() {
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_api/AddAddress.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/api.js
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/public/vuejs/_api/AddAddress.js
rename to src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/api.js
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
similarity index 85%
rename from src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress.vue
rename to src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
index 497a9ff39..ead092802 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
@@ -1,9 +1,9 @@
 <template>
-   <button v-if="!edit" class="sc-button bt-create mt-4" @click="openModal">
+   <button v-if="!edit" class="btn btn-create mt-4" @click="openModal">
       {{ $t('add_an_address_title') }}
    </button>
-   <button v-else class="sc-button bt-create mt-4" @click="openModal">
-      {{ $t('edit_an_address_title') }}
+   <button v-else class="btn btn-create mt-4" @click="openModal">
+      {{ $t('edit_address') }}
    </button>
 
    <teleport to="body">
@@ -17,27 +17,27 @@
          </template>
 
          <template v-slot:body>
-            <div class="address_form">
+            <div class="address-form">
 
-               <div v-if="loading">
-                  {{ $t('loading') }}
-               </div>
+               <h4 class="h3">{{ $t('select_an_address_title') }}
+                  <span v-if="loading">
+                     <i class="fa fa-circle-o-notch fa-spin fa-lg"></i>
+                  </span>
+               </h4>
 
-               <div class="address_form__header">
-                  <h4>{{ $t('select_an_address_title') }}</h4>
-               </div>
+               <div class="row my-3">
+                  <div class="col-lg-6">
 
-               <div class="address_form__select">
-
-                  <div class="address_form__select__body">
-                     <label for="isNoAddress">
+                     <div class="form-check">
                         <input type="checkbox"
-                           name="isNoAddress"
-                           v-bind:placeholder="$t('isNoAddress')"
+                           class="form-check-input"
+                           id="isNoAddress"
                            v-model="isNoAddress"
-                           v-bind:value="value"/>
-                        {{ $t('isNoAddress') }}
-                     </label>
+                           v-bind:value="value" />
+                        <label class="form-check-label" for="isNoAddress">
+                           {{ $t('isNoAddress') }}
+                        </label>
+                     </div>
 
                      <country-selection
                         v-bind:address="address"
@@ -55,30 +55,30 @@
                         v-bind:address="address"
                         v-bind:updateMapCenter="updateMapCenter">
                      </address-selection>
-                  </div>
 
-                  <div class="address_form__select__map">
+                  </div>
+                  <div class="col-lg-6 mt-3 mt-lg-0">
+
                      <address-map
                         v-bind:address="address"
                         ref="addressMap">
                      </address-map>
+
                   </div>
                </div>
 
-               <div class="address_form__more">
-                  <address-more
-                     v-if="!isNoAddress"
-                     v-bind:address="address">
-                  </address-more>
-               </div>
-            </div>
+               <address-more
+                  v-if="!isNoAddress"
+                  v-bind:address="address">
+               </address-more>
 
+            </div>
          </template>
 
          <template v-slot:footer>
-            <button class="sc-button green"
+            <button class="btn btn-create"
                @click.prevent="$emit('addNewAddress', { address, modal })">
-               <i class="fa fa-plus fa-fw"></i>{{ $t('action.add')}}
+               {{ $t('action.add')}}
             </button>
          </template>
 
@@ -87,8 +87,9 @@
 </template>
 
 <script>
-import Modal from './Modal';
-import { fetchCountries, fetchCities, fetchReferenceAddresses } from '../_api/AddAddress'
+import Modal from 'ChillMainAssets/vuejs/_components/Modal';
+import { fetchCountries, fetchCities, fetchReferenceAddresses } from '../api'
+
 import CountrySelection from './AddAddress/CountrySelection';
 import CitySelection from './AddAddress/CitySelection';
 import AddressSelection from './AddAddress/AddressSelection';
@@ -257,3 +258,16 @@ export default {
    }
 }
 </script>
+
+<style lang="scss">
+
+div.address-form {
+   h4.h3 {
+      font-weight: bold;
+   }
+   div#address_map {
+      height: 400px;
+      width: 100%;
+   }
+}
+</style>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/AddressMap.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMap.vue
similarity index 94%
rename from src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/AddressMap.vue
rename to src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMap.vue
index da70d0ee2..978862d82 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/AddressMap.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMap.vue
@@ -1,7 +1,5 @@
 <template>
-   <div class="container">
-      <div id='address_map'></div>
-   </div>
+   <div id="address_map"></div>
 </template>
 
 <script>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMore.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMore.vue
new file mode 100644
index 000000000..11c25b318
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMore.vue
@@ -0,0 +1,144 @@
+<template>
+   <h4 class="h3">{{ $t('fill_an_address') }}</h4>
+   <div class="row my-3">
+      <div class="col-lg-6">
+         <div class="form-floating my-1">
+            <input class="form-control"
+            type="text"
+            name="floor"
+            maxlength=16
+            :placeholder="$t('floor')"
+            v-model="floor"/>
+            <label for="floor">{{ $t('floor') }}</label>
+         </div>
+         <div class="form-floating my-1">
+            <input class="form-control"
+            type="text"
+            name="corridor"
+            maxlength=16
+            :placeholder="$t('corridor')"
+            v-model="corridor"/>
+            <label for="corridor">{{ $t('corridor') }}</label>
+         </div>
+         <div class="form-floating my-1">
+            <input class="form-control"
+            type="text"
+            name="steps"
+            maxlength=16
+            :placeholder="$t('steps')"
+            v-model="steps"/>
+            <label for="steps">{{ $t('steps') }}</label>
+         </div>
+         <div class="form-floating my-1">
+            <input class="form-control"
+            type="text"
+            name="flat"
+            maxlength=16
+            :placeholder="$t('flat')"
+            v-model="flat"/>
+            <label for="flat">{{ $t('flat') }}</label>
+         </div>
+      </div>
+      <div class="col-lg-6">
+         <div class="form-floating my-1">
+            <input class="form-control"
+            type="text"
+            name="buildingName"
+            maxlength=255
+            :placeholder="$t('buildingName')"
+            v-model="buildingName"/>
+            <label for="buildingName">{{ $t('buildingName') }}</label>
+         </div>
+         <div class="form-floating my-1">
+            <input class="form-control"
+            type="text"
+            name="extra"
+            maxlength=255
+            :placeholder="$t('extra')"
+            v-model="extra"/>
+            <label for="extra">{{ $t('extra') }}</label>
+         </div>
+         <div class="form-floating my-1">
+            <input class="form-control"
+            type="text"
+            name="distribution"
+            maxlength=255
+            :placeholder="$t('distribution')"
+            v-model="distribution"/>
+            <label for="distribution">{{ $t('distribution') }}</label>
+         </div>
+      </div>
+   </div>
+</template>
+
+<script>
+export default {
+   name: "AddressMore",
+   props: ['address'],
+   computed: {
+      floor: {
+         set(value) {
+            console.log('value', value);
+            this.address.floor = value;
+         },
+         get() {
+            return this.address.floor;
+         }
+      },
+      corridor: {
+         set(value) {
+            console.log('value', value);
+            this.address.corridor = value;
+         },
+         get() {
+            return this.address.corridor;
+         }
+      },
+      steps: {
+         set(value) {
+            console.log('value', value);
+            this.address.steps = value;
+         },
+         get() {
+            return this.address.steps;
+         }
+      },
+      flat: {
+         set(value) {
+            console.log('value', value);
+            this.address.flat = value;
+         },
+         get() {
+            return this.address.flat;
+         }
+      },
+      buildingName: {
+         set(value) {
+            console.log('value', value);
+            this.address.buildingName = value;
+         },
+         get() {
+            return this.address.buildingName;
+         }
+      },
+      extra: {
+         set(value) {
+            console.log('value', value);
+            this.address.extra = value;
+         },
+         get() {
+            return this.address.extra;
+         }
+      },
+      distribution: {
+         set(value) {
+            console.log('value', value);
+            this.address.distribution = value;
+         },
+         get() {
+            return this.address.distribution;
+         }
+      }
+   }
+}
+</script>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/AddressSelection.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue
similarity index 68%
rename from src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/AddressSelection.vue
rename to src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue
index a0b186a55..656d1e068 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/AddressSelection.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue
@@ -1,5 +1,6 @@
 <template>
-   <div class="container">
+   <div class="my-1">
+      <label class="col-form-label" for="addressSelector">{{ $t('address') }}</label>
       <VueMultiselect
          id="addressSelector"
          v-model="value"
@@ -16,17 +17,27 @@
          :options="addresses">
       </VueMultiselect>
    </div>
-   <div class="custom-address" v-if="writeNewAddress || writeNewPostalCode">
-      <input
-         type="text"
-         name="street"
-         :placeholder="$t('street')"
-         v-model="street"/>
-      <input
-         type="text"
-         name="streetNumber"
-         :placeholder="$t('streetNumber')"
-         v-model="streetNumber"/>
+   <div class="custom-address row g-1" v-if="writeNewAddress || writeNewPostalCode">
+      <div class="col-10">
+         <div class="form-floating">
+            <input class="form-control"
+               type="text"
+               name="street"
+               :placeholder="$t('street')"
+               v-model="street"/>
+            <label for="street">{{ $t('street') }}</label>
+         </div>
+      </div>
+      <div class="col-2">
+         <div class="form-floating">
+            <input class="form-control"
+               type="text"
+               name="streetNumber"
+               :placeholder="$t('streetNumber')"
+               v-model="streetNumber"/>
+            <label for="streetNumber">{{ $t('streetNumber') }}</label>
+         </div>
+      </div>
    </div>
 </template>
 
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/CitySelection.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue
similarity index 68%
rename from src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/CitySelection.vue
rename to src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue
index 81662d2eb..cd322c03c 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/CitySelection.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue
@@ -1,5 +1,6 @@
 <template>
-   <div class="container">
+   <div class="my-1">
+      <label class="col-form-label" for="citySelector">{{ $t('city') }}</label>
       <VueMultiselect
          id="citySelector"
          v-model="value"
@@ -16,17 +17,28 @@
          :options="cities">
       </VueMultiselect>
    </div>
-   <div class="custom-postcode" v-if="writeNewPostalCode">
-      <input
-         type="text"
-         name="name"
-         :placeholder="$t('postalCode_name')"
-         v-model="name"/>
-      <input
-         type="text"
-         name="code"
-         :placeholder="$t('postalCode_code')"
-         v-model="code"/>
+   
+   <div class="custom-postcode row g-1" v-if="writeNewPostalCode">
+      <div class="col-4">
+         <div class="form-floating">
+            <input class="form-control"
+               type="text"
+               name="code"
+               :placeholder="$t('postalCode_code')"
+               v-model="code"/>
+            <label for="code">{{ $t('postalCode_code') }}</label>
+         </div>
+      </div> 
+      <div class="col-8">
+         <div class="form-floating">
+            <input class="form-control"
+               type="text"
+               name="name"
+               :placeholder="$t('postalCode_name')"
+               v-model="name"/>
+            <label for="name">{{ $t('postalCode_name') }}</label>
+         </div>
+      </div>
    </div>
 </template>
 
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/CountrySelection.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CountrySelection.vue
similarity index 93%
rename from src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/CountrySelection.vue
rename to src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CountrySelection.vue
index 388ab7e8e..4e23f0d34 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/CountrySelection.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CountrySelection.vue
@@ -1,8 +1,9 @@
 <template>
-   <div class="container">
+   <div class="my-1">
+      <label class="col-form-label" for="countrySelect">{{ $t('country') }}</label>
       <VueMultiselect
          v-model="value"
-         name="field"
+         id="countrySelect"
          track-by="id"
          label="name"
          :custom-label="transName"
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddress.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddress.vue
new file mode 100644
index 000000000..786f0dce6
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddress.vue
@@ -0,0 +1,64 @@
+<template>
+   <div class="address multiline">
+      <p v-if="address.text"
+         class="street">
+         {{ address.text }}
+      </p>
+      <p v-if="address.postcode"
+         class="postcode">
+         {{ address.postcode.name }}
+      </p>
+      <p v-if="address.country"
+         class="country">
+         {{ address.country.name.fr }}
+      </p>
+
+      <div v-if="address.floor">
+         <span class="floor">
+            <b>{{ $t('floor') }}</b>: {{ address.floor }}
+         </span>
+      </div>
+      <div v-if="address.corridor">
+         <span class="corridor">
+            <b>{{ $t('corridor') }}</b>: {{ address.corridor }}
+         </span>
+      </div>
+      <div v-if="address.steps">
+         <span class="steps">
+            <b>{{ $t('steps') }}</b>: {{ address.steps }}
+         </span>
+      </div>
+      <div v-if="address.flat">
+         <span class="flat">
+            <b>{{ $t('flat') }}</b>: {{ address.flat }}
+         </span>
+      </div>
+      <div v-if="address.buildingName">
+         <span class="buildingName">
+            <b>{{ $t('buildingName') }}</b>: {{ address.buildingName }}
+         </span>
+      </div>
+      <div v-if="address.extra">
+         <span class="extra">
+            <b>{{ $t('extra') }}</b>: {{ address.extra }}
+         </span>
+      </div>
+      <div v-if="address.distribution">
+         <span class="distribution">
+            <b>{{ $t('distribution') }}</b>: {{ address.distribution }}
+         </span>
+      </div>
+   </div>
+</template>
+
+<script>
+
+export default {
+   name: 'ShowAddress',
+   props: ['address'],
+   data() {
+      return {
+      }
+   },
+};
+</script>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/js/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/js/i18n.js
index d0e43266a..f8a7ea4d2 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/js/i18n.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/js/i18n.js
@@ -3,12 +3,17 @@ const addressMessages = {
       add_an_address_title: 'Créer une adresse',
       edit_an_address_title: 'Modifier une adresse',
       create_a_new_address: 'Créer une nouvelle adresse',
-      edit_a_new_address: 'Modifier l\'adresse',
+      edit_address: 'Modifier l\'adresse',
       select_an_address_title: 'Sélectionner une adresse',
       fill_an_address: 'Compléter l\'adresse',
       select_country: 'Choisir le pays',
+      country: 'Pays',
       select_city: 'Choisir une localité',
+      city: 'Localité',
+      other_city: 'Autre localité',
       select_address: 'Choisir une adresse',
+      address: 'Adresse',
+      other_address: 'Autre adresse',
       create_address: 'Adresse inconnue. Cliquez ici pour créer une nouvelle adresse',
       isNoAddress: 'Pas d\'adresse complète',
       street: 'Nom de rue',
@@ -17,12 +22,12 @@ const addressMessages = {
       corridor: 'Couloir',
       steps: 'Escalier',
       flat: 'Appartement',
-      buildingName: 'Nom du batiment',
+      buildingName: 'Nom du bâtiment',
       extra: 'Complément d\'adresse',
       distribution: 'Service particulier de distribution',
       create_postal_code: 'Localité inconnue. Cliquez ici pour créer une nouvelle localité',
-      postalCode_name: 'Nom de la localité',
-      postalCode_code: 'Code postal de la localité',
+      postalCode_name: 'Nom',
+      postalCode_code: 'Code postal',
       date: 'Date de la nouvelle adresse',
       add_an_address_to_person: 'Ajouter l\'adresse à la personne',
       validFrom: 'Date de la nouvelle adresse',
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/store/index.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/store/index.js
index 9db2a7298..967675c8f 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/store/index.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/store/index.js
@@ -1,7 +1,7 @@
 import 'es6-promise/auto';
 import { createStore } from 'vuex';
 
-import { patchAddress, postAddress, postPostalCode, postAddressToPerson, getAddress } from '../../_api/AddAddress'
+import { patchAddress, postAddress, postPostalCode, postAddressToPerson, getAddress } from '../api'
 
 const debug = process.env.NODE_ENV !== 'production';
 
@@ -95,9 +95,10 @@ const store = createStore({
                postAddressToPerson(payload.personId, payload.addressId)
                   .then(person => new Promise((resolve, reject) => {
                      commit('addAddressToPerson', person);
-                     resolve();
                      commit('setLoading', false);
                      commit('setSuccess', true);
+                     window.location.assign(payload.backUrl);
+                     resolve();
                }))
                .catch((error) => {
                   commit('catchError', error);
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/AddressMore.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/AddressMore.vue
deleted file mode 100644
index 744f9ddc1..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/AddressMore.vue
+++ /dev/null
@@ -1,138 +0,0 @@
-<template>
-   <h4>{{ $t('fill_an_address') }}</h4>
-   <div>
-      <label for="floor">{{ $t('floor') }}</label>
-      <input
-         type="text"
-         name="floor"
-         maxlength=16
-         :placeholder="$t('floor')"
-         v-model="floor"/>
-      </div>
-   <div>
-      <label for="corridor">{{ $t('corridor') }}</label>
-      <input
-         type="text"
-         name="corridor"
-         maxlength=16
-         :placeholder="$t('corridor')"
-         v-model="corridor"/>
-   </div>
-   <div>
-      <label for="steps">{{ $t('steps') }}</label>
-      <input
-         type="text"
-         name="steps"
-         maxlength=16
-         :placeholder="$t('steps')"
-         v-model="steps"/>
-   </div>
-   <div>
-      <label for="flat">{{ $t('flat') }}</label>
-      <input
-         type="text"
-         name="flat"
-         maxlength=16
-         :placeholder="$t('flat')"
-         v-model="flat"/>
-   </div>
-   <div>
-      <label for="buildingName">{{ $t('buildingName') }}</label>
-      <input
-         type="text"
-         name="buildingName"
-         maxlength=255
-         :placeholder="$t('buildingName')"
-         v-model="buildingName"/>
-   </div>
-   <div>
-      <label for="extra">{{ $t('extra') }}</label>
-      <input
-         type="text"
-         name="extra"
-         maxlength=255
-         :placeholder="$t('extra')"
-         v-model="extra"/>
-   </div>
-   <div>
-      <label for="distribution">{{ $t('distribution') }}</label>
-      <input
-         type="text"
-         name="distribution"
-         maxlength=255
-         :placeholder="$t('distribution')"
-         v-model="distribution"/>
-   </div>
-</template>
-
-<script>
-export default {
-   name: "AddressMore",
-   props: ['address'],
-   computed: {
-      floor: {
-         set(value) {
-            console.log('value', value);
-            this.address.floor = value;
-         },
-         get() {
-            return this.address.floor;
-         }
-      },
-      corridor: {
-         set(value) {
-            console.log('value', value);
-            this.address.corridor = value;
-         },
-         get() {
-            return this.address.corridor;
-         }
-      },
-      steps: {
-         set(value) {
-            console.log('value', value);
-            this.address.steps = value;
-         },
-         get() {
-            return this.address.steps;
-         }
-      },
-      flat: {
-         set(value) {
-            console.log('value', value);
-            this.address.flat = value;
-         },
-         get() {
-            return this.address.flat;
-         }
-      },
-      buildingName: {
-         set(value) {
-            console.log('value', value);
-            this.address.buildingName = value;
-         },
-         get() {
-            return this.address.buildingName;
-         }
-      },
-      extra: {
-         set(value) {
-            console.log('value', value);
-            this.address.extra = value;
-         },
-         get() {
-            return this.address.extra;
-         }
-      },
-      distribution: {
-         set(value) {
-            console.log('value', value);
-            this.address.distribution = value;
-         },
-         get() {
-            return this.address.distribution;
-         }
-      }
-   }
-}
-</script>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue
index 7498d66f3..44d444247 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue
@@ -6,7 +6,7 @@
             <div class="modal-content">
                <div class="modal-header">
                   <slot name="header"></slot>
-                  <button class="close sc-button grey" @click="$emit('close')">
+                  <button class="close btn" @click="$emit('close')">
                      <i class="fa fa-times" aria-hidden="true"></i></button>
                </div>
                <div class="body-head">
@@ -16,7 +16,7 @@
                   <slot name="body"></slot>
                </div>
                <div class="modal-footer">
-                  <button class="sc-button cancel" @click="$emit('close')">{{ $t('action.close') }}</button>
+                  <button class="btn btn-cancel" @click="$emit('close')">{{ $t('action.close') }}</button>
                   <slot name="footer"></slot>
                </div>
             </div>
@@ -52,10 +52,9 @@ export default {
       width: 100%;
       height: 100%;
       background-color: rgba(0, 0, 0, 0.75);
-      display: table;
       transition: opacity 0.3s ease;
    }
-   .modal-header .close { // bootstrap classes, override sc-button 0 radius
+   .modal-header .close { 
       border-top-right-radius: 0.3rem;
    }
    /*
@@ -77,4 +76,8 @@ export default {
       -webkit-transform: scale(1.1);
       transform: scale(1.1);
    }
+   h3.modal-title {
+      font-size: 1.5rem;
+      font-weight: bold;
+   }
 </style>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly.vue
index 8e1e2227a..19bfef197 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly.vue
@@ -1,6 +1,6 @@
 <template>
   
-   <a class="sc-button" target="_blank"
+   <a class="btn" target="_blank"
       :class="classAction"
       :title="$t(titleAction)"
       @click="openModal">
@@ -44,10 +44,10 @@
          <template v-slot:footer>
             <button v-if="action === 'show'"
                @click="changeActionTo('edit')"
-               class="sc-button bt-update"> <!-- @click.prevent="$emit('..', ..)" -->
+               class="btn btn-update"> <!-- @click.prevent="$emit('..', ..)" -->
             </button>
             <button v-else
-               class="sc-button bt-save"
+               class="btn btn-save"
                @click="saveAction"
                > <!--  
                -->
@@ -81,21 +81,21 @@ export default {
             showModal: false,
             modalDialogClass: "modal-dialog-scrollable modal-xl"
          },
-         action: this.action
+         //action: this.action
       }
    },
    computed: {
-      action() {
-         return this.$data.action;
-      },
+      //action() {
+      //   return this.$data.action;
+      //},
       classAction() {
          switch (this.action) {
             case 'show':
-               return 'bt-show';
+               return 'btn-show';
             case 'edit':
-               return 'bt-update';
+               return 'btn-update';
             case 'create':
-               return 'bt-create';
+               return 'btn-create';
          }
       },
       titleAction() {
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/ShowAddress.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/ShowAddress.vue
deleted file mode 100644
index d76f7a056..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/ShowAddress.vue
+++ /dev/null
@@ -1,46 +0,0 @@
-<template>
-  <div class="chill_address_address chill_address_address--multiline">
-   <div v-if="address.text">
-      {{ address.text }}
-   </div>
-   <div v-if="address.postcode">
-      {{ address.postcode.name }}
-   </div>
-   <div v-if="address.country">
-      {{ address.country.name.fr }}
-   </div>
-   <div v-if="address.floor">
-      <span>{{ $t('floor') }}</span>: {{ address.floor }}
-   </div>
-   <div v-if="address.corridor">
-      <span>{{ $t('corridor') }}</span>: {{ address.corridor }}
-   </div>
-   <div v-if="address.steps">
-      <span>{{ $t('steps') }}</span>: {{ address.steps }}
-   </div>
-   <div v-if="address.flat">
-      <span>{{ $t('flat') }}</span>: {{ address.flat }}
-   </div>
-   <div v-if="address.buildingName">
-      <span>{{ $t('buildingName') }}</span>: {{ address.buildingName }}
-   </div>
-   <div v-if="address.extra">
-      <span>{{ $t('extra') }}</span>: {{ address.extra }}
-   </div>
-   <div v-if="address.distribution">
-      <span>{{ $t('distribution') }}</span>: {{ address.distribution }}
-    </div>
-  </div>
-</template>
-
-<script>
-
-export default {
-   name: 'ShowAddress',
-   props: ['address'],
-   data() {
-      return {
-      }
-   },
-};
-</script>
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Address/entity_render.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Address/entity_render.html.twig
deleted file mode 100644
index fa7a13645..000000000
--- a/src/Bundle/ChillMainBundle/Resources/views/Address/entity_render.html.twig
+++ /dev/null
@@ -1,16 +0,0 @@
-<div class="chill_address">
-    {% if options['has_no_address'] == true and address.isNoAddress == true %}
-        <div class="chill_address_is_noaddress">{{ 'address.consider homeless'|trans }}</div>
-    {% endif %}
-    <div class="chill_address_address {% if options['multiline'] %}chill_address_address--multiline{% endif %}">
-    {% if address.street is not empty %}<p class="street street1">{{ address.street }}</p>{% endif %}
-    {% if address.streetNumber is not empty %}<p class="street street2">{{ address.streetNumber }}</p>{% endif %}
-    {% if address.postCode is not empty %}
-    <p class="postalCode"><span class="code">{{ address.postCode.code }}</span> <span class="name">{{ address.postCode.name }}</span></p>
-    <p class="country">{{ address.postCode.country.name|localize_translatable_string }}</p>
-    {% endif %}
-    </div>
-{%- if options['with_valid_from'] == true -%}
-<span class="address_since">{{ 'Since %date%'|trans( { '%date%' : address.validFrom|format_date('long') } ) }}</span>
-{%- endif -%}
-</div>
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Address/macro.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Address/macro.html.twig
deleted file mode 100644
index 990dbc043..000000000
--- a/src/Bundle/ChillMainBundle/Resources/views/Address/macro.html.twig
+++ /dev/null
@@ -1,21 +0,0 @@
-{%- macro _render(address, options) -%}
-    {%- set options = { 'with_valid_from' : true  }|merge(options|default({})) -%}
-    {%- set options = { 'has_no_address'  : false }|merge(options|default({})) -%}
-    {%- set options = { 'with_icon' : false }|merge(options|default({})) -%}
-    <div class="chill_address">
-        {% if options['has_no_address'] == true and address.isNoAddress == true %}
-            <div class="chill_address_is_noaddress">{{ 'address.consider homeless'|trans }}</div>
-        {% endif %}
-        <div class="chill_address_address">{% if options['with_icon'] == true %}<i class="fa fa-fw fa-map-marker"></i>{% endif %}
-        {% if address.street is not empty %}<p class="street street1">{{ address.street }}</p>{% endif %}
-        {% if address.streetNumber is not empty %}<p class="street street2">{{ address.streetNumber }}</p>{% endif %}
-        {% if address.postCode is not empty %}
-        <p class="postalCode"><span class="code">{{ address.postCode.code }}</span> <span class="name">{{ address.postCode.name }}</span></p>
-        <p class="country">{{ address.postCode.country.name|localize_translatable_string }}</p>
-        {% endif %}
-        </div>
-    {%- if options['with_valid_from'] == true -%}
-    <span class="address_since">{{ 'Since %date%'|trans( { '%date%' : address.validFrom|format_date('long') } ) }}</span>
-    {%- endif -%}
-    </div>
-{%- endmacro -%}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/layout.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/layout.html.twig
index 64270f409..c3331b08b 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Admin/layout.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Admin/layout.html.twig
@@ -32,8 +32,8 @@
 
 {% block content %}
     {% block admin_content %}<!-- block personcontent empty -->
-        <div class="container">
-            <div class="grid-10 push-1">
+        <div class="container-fluid">
+            <div class="col-10 push-1">
                 <h2>{{ 'Welcome to the admin section !'|trans }}</h2>
             </div>
         </div>
diff --git a/src/Bundle/ChillMainBundle/Resources/views/CRUD/_delete_content.html.twig b/src/Bundle/ChillMainBundle/Resources/views/CRUD/_delete_content.html.twig
index 5baba11ea..c47f4fbf4 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/CRUD/_delete_content.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/CRUD/_delete_content.html.twig
@@ -1,4 +1,4 @@
-<div class="{% block crud_content_main_div_class %}grid-10 centered{% endblock %}">
+<div class="{% block crud_content_main_div_class %}col-10 centered{% endblock %}">
     {% block crud_content_header %}
         <h1>{{ ('crud.'~crud_name~'.title_delete')|trans({ '%as_string%': entity|chill_entity_render_string }) }}</h1>
     {% endblock crud_content_header %}
@@ -10,7 +10,7 @@
     <ul class="record_actions">
             {% block content_form_actions_back %}
                 <li class="cancel">
-                    <a class="sc-button bt-cancel" href="{{ chill_return_path_or('chill_crud_'~crud_name~'_index') }}">
+                    <a class="btn btn-cancel" href="{{ chill_return_path_or('chill_crud_'~crud_name~'_index') }}">
                         {{ 'Cancel'|trans }}
                     </a>
                 </li>
@@ -19,7 +19,7 @@
             {% block content_form_actions_view %}
                 {% if is_granted(chill_crud_config('role', crud_name, 'view'), entity) %}
                 <li class="">
-                    <a class="sc-button bt-show" href="{{ chill_return_path_or('chill_crud_'~crud_name~'_view', { 'id': entity.id }) }}">
+                    <a class="btn btn-show" href="{{ chill_return_path_or('chill_crud_'~crud_name~'_view', { 'id': entity.id }) }}">
                         {{ 'crud.edit.back_to_view'|trans }}
                     </a>
                 </li>
@@ -27,7 +27,7 @@
             {% endblock %}
             {% block content_form_actions_confirm_delete %}
                 <li>
-                    <button type="submit" class="sc-button bt-delete" value="delete-and-close">{{ ('crud.'~crud_name~'.button_delete')|trans }}</button>
+                    <button type="submit" class="btn btn-delete" value="delete-and-close">{{ ('crud.'~crud_name~'.button_delete')|trans }}</button>
                 </li>
             {% endblock content_form_actions_confirm_delete %}
             {% block content_form_actions_after %}{% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/CRUD/_edit_content.html.twig b/src/Bundle/ChillMainBundle/Resources/views/CRUD/_edit_content.html.twig
index 77b794ce9..cc2673960 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/CRUD/_edit_content.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/CRUD/_edit_content.html.twig
@@ -1,4 +1,4 @@
-<div class="{% block crud_content_main_div_class %}grid-10 centered{% endblock %}">
+<div class="{% block crud_content_main_div_class %}{% endblock %}">
     {% block crud_content_header %}
         <h1>{{ ('crud.'~crud_name~'.title_edit')|trans }}</h1>
     {% endblock crud_content_header %}
@@ -16,7 +16,7 @@
         <ul class="record_actions sticky-form-buttons">
             {% block content_form_actions_back %}
                 <li class="cancel">
-                    <a class="sc-button bt-cancel" href="{{ chill_return_path_or('chill_crud_'~crud_name~'_index') }}">
+                    <a class="btn btn-cancel" href="{{ chill_return_path_or('chill_crud_'~crud_name~'_index') }}">
                         {{ 'Cancel'|trans }}
                     </a>
                 </li>
@@ -26,7 +26,7 @@
                 {% if chill_crud_action_exists(crud_name, 'delete') %}
                 {% if is_granted(chill_crud_config('role', crud_name, 'delete'), entity) %}
                 <li class="">
-                    <a class="sc-button bt-small bt-delete" href="{{ chill_path_add_return_path('chill_crud_'~crud_name~'_delete', { 'id': entity.id }) }}"></a>
+                    <a class="btn btn-small btn-delete" href="{{ chill_path_add_return_path('chill_crud_'~crud_name~'_delete', { 'id': entity.id }) }}"></a>
                 </li>
                 {% endif %}
                 {% endif %}
@@ -35,21 +35,21 @@
                 {% if chill_crud_action_exists(crud_name, 'view') %}
                 {% if is_granted(chill_crud_config('role', crud_name, 'view'), entity) %}
                 <li class="">
-                    <a class="sc-button bt-small bt-show" href="{{ chill_path_forward_return_path('chill_crud_'~crud_name~'_view', { 'id': entity.id }) }}"></a>
+                    <a class="btn btn-small btn-show" href="{{ chill_path_forward_return_path('chill_crud_'~crud_name~'_view', { 'id': entity.id }) }}"></a>
                 </li>
                 {% endif %}
                 {% endif %}
             {% endblock content_form_actions_view %} 
             {% block content_form_actions_save_and_close %}
                 <li class="">
-                    <button type="submit" name="submit" value="save-and-close" class="sc-button bt-update">
+                    <button type="submit" name="submit" value="save-and-close" class="btn btn-update">
                         {{ 'crud.edit.save_and_close'|trans }}
                     </button>
                 </li>
             {% endblock %}
             {% block content_form_actions_save_and_show %}
                 <li class="">
-                    <button type="submit" name="submit" value="save-and-show" class="sc-button bt-update">
+                    <button type="submit" name="submit" value="save-and-show" class="btn btn-update">
                         {{ 'crud.edit.save_and_show'|trans }}
                     </button>
                 </li>
diff --git a/src/Bundle/ChillMainBundle/Resources/views/CRUD/_index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/CRUD/_index.html.twig
index 4e553d962..46828a49e 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/CRUD/_index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/CRUD/_index.html.twig
@@ -1,4 +1,4 @@
-<div class="grid-10 centered">
+<div class="col-10 centered">
         
 {% block index_header %}
 <h1>{{ ('crud.' ~ crud_name ~ '.index.title')|trans({'%crud_name%': crud_name}) }}</h1>
@@ -40,7 +40,7 @@
     <ul class="record_actions sticky-form-buttons">
     {% block add_new %}
         <li>
-            <a href="{{ chill_path_add_return_path('chill_crud_' ~ crud_name ~ '_new') }}" class="sc-button bt-new">{{ ('crud.'~crud_name~'.index.add_new')|trans( {'%crud_name%': crud_name} ) }}</a>
+            <a href="{{ chill_path_add_return_path('chill_crud_' ~ crud_name ~ '_new') }}" class="btn btn-new">{{ ('crud.'~crud_name~'.index.add_new')|trans( {'%crud_name%': crud_name} ) }}</a>
         </li>
     {% endblock %}
     </ul>
diff --git a/src/Bundle/ChillMainBundle/Resources/views/CRUD/_new_content.html.twig b/src/Bundle/ChillMainBundle/Resources/views/CRUD/_new_content.html.twig
index aee878b86..ff5fe7263 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/CRUD/_new_content.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/CRUD/_new_content.html.twig
@@ -1,4 +1,4 @@
-<div class="{% block crud_content_main_div_class %}grid-10 centered{% endblock %}">
+<div class="{% block crud_content_main_div_class %}col-10 centered{% endblock %}">
     {% block crud_content_header %}
         <h1>{{ ('crud.' ~ crud_name ~ '.title_new')|trans({'%crud_name%' : crud_name }) }}</h1>
     {% endblock crud_content_header %}
@@ -16,28 +16,28 @@
         <ul class="record_actions sticky-form-buttons">
             {% block content_form_actions_back %}
                 <li class="cancel">
-                    <a class="sc-button bt-cancel" href="{{ chill_return_path_or('chill_crud_'~crud_name~'_index') }}">
+                    <a class="btn btn-cancel" href="{{ chill_return_path_or('chill_crud_'~crud_name~'_index') }}">
                         {{ 'Cancel'|trans }}
                     </a>
                 </li>
             {% endblock %} 
             {% block content_form_actions_save_and_close %}
                 <li class="">
-                    <button type="submit" name="submit" value="save-and-close" class="sc-button bt-create">
+                    <button type="submit" name="submit" value="save-and-close" class="btn btn-create">
                         {{ 'crud.new.save_and_close'|trans }}
                     </button>
                 </li>
             {% endblock %}
             {% block content_form_actions_save_and_show %}
                 <li class="">
-                    <button type="submit" name="submit" value="save-and-show" class="sc-button bt-create">
+                    <button type="submit" name="submit" value="save-and-show" class="btn btn-create">
                         {{ 'crud.new.save_and_show'|trans }}
                     </button>
                 </li>
             {% endblock %}
             {% block content_form_actions_save_and_new %}
                 <li class="">
-                    <button type="submit" name="submit" value="save-and-new" class="sc-button bt-create">
+                    <button type="submit" name="submit" value="save-and-new" class="btn btn-create">
                         {{ 'crud.new.save_and_new'|trans }}
                     </button>
                 </li>
diff --git a/src/Bundle/ChillMainBundle/Resources/views/CRUD/_view_content.html.twig b/src/Bundle/ChillMainBundle/Resources/views/CRUD/_view_content.html.twig
index f56a00e1b..b6f54cba0 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/CRUD/_view_content.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/CRUD/_view_content.html.twig
@@ -1,4 +1,4 @@
-<div class="{% block crud_content_main_div_class %}grid-10 centered{% endblock %}">
+<div class="{% block crud_content_main_div_class %}col-10 centered{% endblock %}">
     {% block crud_content_header %}
         <h1>{{ 'crud.%crud_name%.title_view'|trans({'%crud_name%' : crud_name }) }}</h1>
     {% endblock crud_content_header %}
@@ -16,7 +16,7 @@
         <ul class="record_actions sticky-form-buttons">
             {% block content_view_actions_back %}
                 <li class="cancel">
-                    <a class="sc-button bt-cancel" href="{{ chill_return_path_or('chill_crud_'~crud_name~'_index') }}">
+                    <a class="btn btn-cancel" href="{{ chill_return_path_or('chill_crud_'~crud_name~'_index') }}">
                         {{ 'Cancel'|trans }}
                     </a>
                 </li>
@@ -26,7 +26,7 @@
                 {% if chill_crud_action_exists(crud_name, 'delete') %}
                 {% if is_granted(chill_crud_config('role', crud_name, 'delete'), entity) %}
                 <li class="">
-                    <a class="sc-button bt-delete" href="{{ chill_path_add_return_path('chill_crud_'~crud_name~'_delete', { 'id': entity.id }) }}">
+                    <a class="btn btn-delete" href="{{ chill_path_add_return_path('chill_crud_'~crud_name~'_delete', { 'id': entity.id }) }}">
                         {{ 'crud.delete.link_to_form'|trans }}
                     </a>
                 </li>
@@ -37,7 +37,7 @@
                 {% if chill_crud_action_exists(crud_name, 'new') %}
                 {% if is_granted(chill_crud_config('role', crud_name, 'new'), entity) %}
                     <li>
-                        <a class="sc-button bt-duplicate" href="{{ chill_path_add_return_path('chill_crud_'~crud_name~'_new', { 'duplicate_id': entity.id, 'duplicate': true }) }}">
+                        <a class="btn btn-duplicate" href="{{ chill_path_add_return_path('chill_crud_'~crud_name~'_new', { 'duplicate_id': entity.id, 'duplicate': true }) }}">
                             {{ 'crud.view.link_duplicate'|trans }}
                         </a>
                     </li>
@@ -48,7 +48,7 @@
                 {% if chill_crud_action_exists(crud_name, 'edit') %}
                 {% if is_granted(chill_crud_config('role', crud_name, 'edit'), entity) %}
                     <li>
-                        <a class="sc-button bt-edit" href="{{ chill_path_forward_return_path('chill_crud_'~crud_name~'_edit', { 'id': entity.id }) }}">
+                        <a class="btn btn-edit" href="{{ chill_path_forward_return_path('chill_crud_'~crud_name~'_edit', { 'id': entity.id }) }}">
                             {{ 'crud.new.link_edit'|trans }}
                         </a>
                     </li>
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Center/edit.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Center/edit.html.twig
index f39f5cf94..d2018e2d3 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Center/edit.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Center/edit.html.twig
@@ -7,7 +7,7 @@
 
     {{ form_start(edit_form) }}
     {{ form_row(edit_form.name) }}
-    {{ form_row(edit_form.submit, { 'attr' : { 'class' : 'sc-button green' } } ) }}
+    {{ form_row(edit_form.submit, { 'attr' : { 'class' : 'btn btn-chill-green' } } ) }}
     {{ form_end(edit_form) }}
 
         <ul class="record_actions">
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Center/new.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Center/new.html.twig
index e5205d8a3..b100d0b8b 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Center/new.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Center/new.html.twig
@@ -7,7 +7,7 @@
 
     {{ form_start(form) }}
     {{ form_row(form.name) }}
-    {{ form_row(form.submit, { 'attr' : { 'class' : 'sc-button green' } } ) }}
+    {{ form_row(form.submit, { 'attr' : { 'class' : 'btn btn-chill-green' } } ) }}
     {{ form_end(form) }}
 
         <ul class="record_actions">
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig
new file mode 100644
index 000000000..7e1c47da4
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig
@@ -0,0 +1,121 @@
+{#
+    Template to render an address
+
+    OPTIONS
+    * render            string ['list'|'bloc'|'inline']
+    * with_valid_from   bool    start date
+    * with_valid_to     bool    end date
+    * with_picto        bool    add a forkawesome pictogram
+    * with_delimiter    bool    add a delimiter between fragments
+    * has_no_address    bool
+    * multiline         bool    multiline display
+    * extended_infos    bool    add extra informations (step, floor, etc.)
+
+#}
+{% macro raw(address, options) %}
+    {% if address.street is not empty %}
+        <p class="street">{{ address.street }}
+            {% if address.streetNumber is not empty %}
+                <span class="streetnumber">{{ address.streetNumber }}</span>
+            {% endif %}
+        </p>
+    {% endif %}
+    {% if options['extended_infos'] %}
+        {{ _self.extended(address, options) }}
+    {% endif %}
+    {% if address.postCode is not empty %}
+        <p class="postcode">
+            <span class="code">{{ address.postCode.code }}</span>
+            <span class="name">{{ address.postCode.name }}</span>
+        </p>
+        <p class="country">{{ address.postCode.country.name|localize_translatable_string }}</p>
+    {% endif %}
+{% endmacro %}
+
+{% macro extended(address, options) %}
+    {% if address.floor is not empty %}
+        <span class="floor">{{ address.floor }}</span>
+    {% endif %}
+    {% if address.corridor is not empty %}
+        <span class="corridor">{{ address.corridor }}</span>
+    {% endif %}
+    {% if address.steps is not empty %}
+        <span class="steps">{{ address.steps }}</span>
+    {% endif %}
+    {% if address.buildingName is not empty %}
+        <span class="buildingName">{{ address.buildingName }}</span>
+    {% endif %}
+    {% if address.flat is not empty %}
+        <span class="flat">{{ address.flat }}</span>
+    {% endif %}
+    {% if address.distribution is not empty %}
+        <span class="distribution">{{ address.distribution }}</span>
+    {% endif %}
+    {% if address.extra is not empty %}
+        <span class="extra">{{ address.extra }}</span>
+    {% endif %}
+{% endmacro %}
+
+{% macro inline(address, options) %}
+    {% if options['has_no_address'] == true and address.isNoAddress == true %}
+        <span class="noaddress">
+            {{ 'address.consider homeless'|trans }}
+        </span>
+    {% else %}
+        <span class="address{% if options['multiline'] %} multiline{% endif %}{% if options['with_delimiter'] %} delimiter{% endif %}">
+            {{ _self.raw(address, options) }}
+        </span>
+    {% endif %}
+    {{ _self.validity(address, options) }}
+{% endmacro %}
+
+{% macro validity(address, options) %}
+    {%- if options['with_valid_from'] == true -%}
+        <span class="address-valid address-since">
+            {{ 'Since %date%'|trans( { '%date%' : address.validFrom|format_date('long') } ) }}
+        </span>
+    {%- endif -%}
+    {%- if options['with_valid_to'] == true -%}
+        <span class="address-valid address-until">
+            {{ 'Until %date%'|trans( { '%date%' : address.validTo|format_date('long') } ) }}
+        </span>
+    {%- endif -%}
+{% endmacro %}
+
+
+{%- if render == 'list' -%}
+    <li class="chill-entity entity-address">
+        {% if options['with_picto'] %}
+            <i class="fa fa-li fa-map-marker"></i>
+        {% endif %}
+        {{ _self.inline(address, options) }}
+    </li>
+{%- endif -%}
+
+{%- if render == 'inline' -%}
+    <span class="chill-entity entity-address">
+        {% if options['with_picto'] %}
+            <i class="fa fa-fw fa-map-marker"></i>
+        {% endif %}
+        {{ _self.inline(address, options) }}
+    </span>
+{%- endif -%}
+
+{%- if render == 'bloc' -%}
+    <div class="chill-entity entity-address">
+        {% if options['has_no_address'] == true and address.isNoAddress == true %}
+            <div class="noaddress">
+                {{ 'address.consider homeless'|trans }}
+            </div>
+        {% else %}
+            <div class="address{% if options['multiline'] %} multiline{% endif %}{% if options['with_delimiter'] %} delimiter{% endif %}">
+                {% if options['with_picto'] %}
+                    <i class="fa fa-fw fa-map-marker"></i>
+                {% endif %}
+                {{ _self.raw(address, options) }}
+            </div>
+        {% endif %}
+        {{ _self.validity(address, options) }}
+    </div>
+{%- endif -%}
+
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Export/layout.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Export/layout.html.twig
index e81665556..be6307822 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Export/layout.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Export/layout.html.twig
@@ -36,7 +36,7 @@
                         <p>{{ export.description|trans }}</p> 
 
                         <p>
-                            <a class="sc-button bt-action" href="{{ path('chill_main_export_new', { 'alias': export_alias } ) }}">
+                            <a class="btn btn-action" href="{{ path('chill_main_export_new', { 'alias': export_alias } ) }}">
                                 {{ 'Create an export'|trans }}
                             </a>
                         </p>
@@ -56,7 +56,7 @@
                     <p>{{ export.description|trans }}</p> 
 
                     <p>
-                        <a class="sc-button bt-action" href="{{ path('chill_main_export_new', { 'alias': export_alias } ) }}">
+                        <a class="btn btn-action" href="{{ path('chill_main_export_new', { 'alias': export_alias } ) }}">
                             {{ 'Create an export'|trans }}
                         </a>
                     </p>
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Export/new.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Export/new.html.twig
index 016b58424..c3e188720 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Export/new.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Export/new.html.twig
@@ -104,7 +104,7 @@
         </div>
     {% endif %}
     
-    <p>{{ form_widget(form.submit, { 'attr' : { 'class' : 'sc-button btn-create' }, 'label' : 'Go to formatter options' } ) }}</p>
+    <p>{{ form_widget(form.submit, { 'attr' : { 'class' : 'btn btn-create' }, 'label' : 'Go to formatter options' } ) }}</p>
     {{ form_end(form) }}
     
 {% endblock layout_wvm_content  %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Export/new_centers_step.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Export/new_centers_step.html.twig
index 639b0791f..f00419c9d 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Export/new_centers_step.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Export/new_centers_step.html.twig
@@ -44,7 +44,7 @@
         {% endfor %}
     {% endif %}
     
-    <p>{{ form_widget(form.submit, { 'attr' : { 'class' : 'sc-button btn-action bt-create' }, 'label' : 'Go to export options' } ) }}</p>
+    <p>{{ form_widget(form.submit, { 'attr' : { 'class' : 'btn btn-action btn-create' }, 'label' : 'Go to export options' } ) }}</p>
     {{ form_end(form) }}
     
 {% endblock layout_wvm_content  %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Export/new_formatter_step.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Export/new_formatter_step.html.twig
index 72a00daeb..43a5f63ec 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Export/new_formatter_step.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Export/new_formatter_step.html.twig
@@ -46,7 +46,7 @@
     </div>
     
     <div style=clear:both;">
-    <p>{{ form_widget(form.submit, { 'attr' : { 'class' : 'sc-button btn-action' }, 'label': 'Generate the report' } ) }}</p>
+    <p>{{ form_widget(form.submit, { 'attr' : { 'class' : 'btn btn-action' }, 'label': 'Generate the report' } ) }}</p>
     </div>
     
     {{ form_end(form) }}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Form/bootstrap5/bootstrap_5_horizontal_layout.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Form/bootstrap5/bootstrap_5_horizontal_layout.html.twig
new file mode 100644
index 000000000..e0c43629e
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/Form/bootstrap5/bootstrap_5_horizontal_layout.html.twig
@@ -0,0 +1,139 @@
+{# use "bootstrap_5_layout.html.twig" #}
+{% use "@ChillMain/Form/bootstrap5/bootstrap_5_layout.html.twig" %}
+
+{# Labels #}
+
+{% block form_label -%}
+    {%- if label is same as(false) -%}
+        <div class="{{ block('form_label_class') }}"></div>
+    {%- else -%}
+        {%- set row_class = row_class|default(row_attr.class|default('')) -%}
+        {%- if 'form-floating' not in row_class and 'input-group' not in row_class -%}
+            {%- if expanded is not defined or not expanded -%}
+                {%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' col-form-label')|trim}) -%}
+            {%- endif -%}
+            {%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' ' ~ block('form_label_class'))|trim}) -%}
+        {%- endif -%}
+        {{- parent() -}}
+    {%- endif -%}
+{%- endblock form_label %}
+
+{% block form_label_class -%}
+    col-sm-4
+{%- endblock form_label_class %}
+
+{# Rows #}
+
+{% block form_row -%}
+    {%- if expanded is defined and expanded -%}
+        {{ block('fieldset_form_row') }}
+    {%- else -%}
+        {%- set widget_attr = {} -%}
+        {%- if help is not empty -%}
+            {%- set widget_attr = {attr: {'aria-describedby': id ~"_help"}} -%}
+        {%- endif -%}
+        {%- set row_class = row_class|default(row_attr.class|default('mb-3')) -%}
+        {%- set is_form_floating = is_form_floating|default('form-floating' in row_class) -%}
+        {%- set is_input_group = is_input_group|default('input-group' in row_class) -%}
+        {#- Remove behavior class from the main container -#}
+        {%- set row_class = row_class|replace({'form-floating': '', 'input-group': ''}) -%}
+        <div{% with {attr: row_attr|merge({class: (row_class ~ ' row' ~ ((not compound or force_error|default(false)) and not valid ? ' is-invalid'))|trim})} %}{{ block('attributes') }}{% endwith %}>
+            {%- if is_form_floating or is_input_group -%}
+                <div class="{{ block('form_label_class') }}"></div>
+                <div class="{{ block('form_group_class') }}">
+                    {%- if is_form_floating -%}
+                        <div class="form-floating">
+                            {{- form_widget(form, widget_attr) -}}
+                            {{- form_label(form) -}}
+                        </div>
+                    {%- elseif is_input_group -%}
+                        <div class="input-group">
+                            {{- form_label(form) -}}
+                            {{- form_widget(form, widget_attr) -}}
+                            {#- Hack to properly display help with input group -#}
+                            {{- form_help(form) -}}
+                        </div>
+                    {%- endif -%}
+                    {%- if not is_input_group -%}
+                        {{- form_help(form) -}}
+                    {%- endif -%}
+                    {{- form_errors(form) -}}
+                </div>
+            {%- else -%}
+                {% if form.vars.hideLabel is not defined or form.vars.hideLabel == false %}
+                    {{- form_label(form) -}}
+                    <div class="{{ block('form_group_class') }}">
+                        {{- form_widget(form, widget_attr) -}}
+                        {{- form_help(form) -}}
+                        {{- form_errors(form) -}}
+                    </div>
+                {% else %}
+                    <div class="col-sm">
+                        {{- form_widget(form, widget_attr) -}}
+                        {{- form_help(form) -}}
+                        {{- form_errors(form) -}}
+                    </div>
+                {% endif %}
+            {%- endif -%}
+        </div>
+    {%- endif -%}
+{%- endblock form_row %}
+
+{% block fieldset_form_row -%}
+    {%- set widget_attr = {} -%}
+    {%- if help is not empty -%}
+        {%- set widget_attr = {attr: {'aria-describedby': id ~"_help"}} -%}
+    {%- endif -%}
+    <fieldset{% with {attr: row_attr|merge({class: row_attr.class|default('mb-3')|trim})} %}{{ block('attributes') }}{% endwith %}>
+        <div class="row{% if (not compound or force_error|default(false)) and not valid %} is-invalid{% endif %}">
+            {{- form_label(form) -}}
+            <div class="{{ block('form_group_class') }}">
+                {{- form_widget(form, widget_attr) -}}
+                {{- form_help(form) -}}
+                {{- form_errors(form) -}}
+            </div>
+        </div>
+    </fieldset>
+{%- endblock fieldset_form_row %}
+
+{% block submit_row -%}
+    <div{% with {attr: row_attr|merge({class: (row_attr.class|default('mb-3') ~ ' row')|trim})} %}{{ block('attributes') }}{% endwith %}>{#--#}
+        <div class="{{ block('form_label_class') }}"></div>{#--#}
+        <div class="{{ block('form_group_class') }}">
+            {{- form_widget(form) -}}
+        </div>{#--#}
+    </div>
+{%- endblock submit_row %}
+
+{% block reset_row -%}
+    <div{% with {attr: row_attr|merge({class: (row_attr.class|default('mb-3') ~ ' row')|trim})} %}{{ block('attributes') }}{% endwith %}>{#--#}
+        <div class="{{ block('form_label_class') }}"></div>{#--#}
+        <div class="{{ block('form_group_class') }}">
+            {{- form_widget(form) -}}
+        </div>{#--#}
+    </div>
+{%- endblock reset_row %}
+
+{% block button_row -%}
+    <div{% with {attr: row_attr|merge({class: (row_attr.class|default('mb-3') ~ ' row')|trim})} %}{{ block('attributes') }}{% endwith %}>{#--#}
+        <div class="{{ block('form_label_class') }}"></div>{#--#}
+        <div class="{{ block('form_group_class') }}">
+            {{- form_widget(form) -}}
+        </div>{#--#}
+    </div>
+{%- endblock button_row %}
+
+{% block checkbox_row -%}
+    <div{% with {attr: row_attr|merge({class: (row_attr.class|default('mb-3') ~ ' row')|trim})} %}{{ block('attributes') }}{% endwith %}>{#--#}
+        <div class="{{ block('form_label_class') }}"></div>{#--#}
+        <div class="{{ block('form_group_class') }}">
+            {{- form_widget(form) -}}
+            {{- form_help(form) -}}
+            {{- form_errors(form) -}}
+        </div>{#--#}
+    </div>
+{%- endblock checkbox_row %}
+
+{% block form_group_class -%}
+    col-sm-8
+{%- endblock form_group_class %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Form/bootstrap5/bootstrap_5_layout.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Form/bootstrap5/bootstrap_5_layout.html.twig
new file mode 100644
index 000000000..cd6a261b3
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/Form/bootstrap5/bootstrap_5_layout.html.twig
@@ -0,0 +1,374 @@
+{% use "bootstrap_base_layout.html.twig" %}
+
+{# Widgets #}
+
+{% block money_widget -%}
+    {%- set prepend = not (money_pattern starts with '{{') -%}
+    {%- set append = not (money_pattern ends with '}}') -%}
+    {%- if prepend or append -%}
+        <div class="input-group{{ group_class|default('') }}">
+            {%- if prepend -%}
+                <span class="input-group-text">{{ money_pattern|form_encode_currency }}</span>
+            {%- endif -%}
+            {{- block('form_widget_simple') -}}
+            {%- if append -%}
+                <span class="input-group-text">{{ money_pattern|form_encode_currency }}</span>
+            {%- endif -%}
+        </div>
+    {%- else -%}
+        {{- block('form_widget_simple') -}}
+    {%- endif -%}
+{%- endblock money_widget %}
+
+{% block date_widget -%}
+    {%- if widget == 'single_text' -%}
+        {{- block('form_widget_simple') -}}
+    {%- else -%}
+        {% if not valid %}
+            {% set attr = attr|merge({class: (attr.class|default('') ~ ' is-invalid')|trim}) -%}
+            {% set valid = true %}
+        {% endif %}
+        {%- if datetime is not defined or not datetime -%}
+            <div {{ block('widget_container_attributes') -}}>
+        {%- endif %}
+        {%- if label is not same as(false) -%}
+            <div class="visually-hidden">
+                {{- form_label(form.year) -}}
+                {{- form_label(form.month) -}}
+                {{- form_label(form.day) -}}
+            </div>
+        {%- endif -%}
+        <div class="input-group">
+            {{- date_pattern|replace({
+                '{{ year }}': form_widget(form.year),
+                '{{ month }}': form_widget(form.month),
+                '{{ day }}': form_widget(form.day),
+            })|raw -}}
+        </div>
+        {%- if datetime is not defined or not datetime -%}
+            </div>
+        {%- endif -%}
+    {%- endif -%}
+{%- endblock date_widget %}
+
+{% block time_widget -%}
+    {%- if widget == 'single_text' -%}
+        {{- block('form_widget_simple') -}}
+    {%- else -%}
+        {% if not valid %}
+            {% set attr = attr|merge({class: (attr.class|default('') ~ ' is-invalid')|trim}) -%}
+            {% set valid = true %}
+        {% endif %}
+        {%- if datetime is not defined or false == datetime -%}
+            <div {{ block('widget_container_attributes') -}}>
+        {%- endif -%}
+        {%- if label is not same as(false) -%}
+            <div class="visually-hidden">
+                {{- form_label(form.hour) -}}
+                {%- if with_minutes -%}{{ form_label(form.minute) }}{%- endif -%}
+                {%- if with_seconds -%}{{ form_label(form.second) }}{%- endif -%}
+            </div>
+        {%- endif -%}
+        {% if with_minutes or with_seconds %}
+            <div class="input-group">
+        {% endif %}
+        {{- form_widget(form.hour) -}}
+        {%- if with_minutes -%}
+            <span class="input-group-text">:</span>
+            {{- form_widget(form.minute) -}}
+        {%- endif -%}
+        {%- if with_seconds -%}
+            <span class="input-group-text">:</span>
+            {{- form_widget(form.second) -}}
+        {%- endif -%}
+        {% if with_minutes or with_seconds %}
+            </div>
+        {% endif %}
+        {%- if datetime is not defined or false == datetime -%}
+            </div>
+        {%- endif -%}
+    {%- endif -%}
+{%- endblock time_widget %}
+
+{% block datetime_widget -%}
+    {%- if widget == 'single_text' -%}
+        {{- block('form_widget_simple') -}}
+    {%- else -%}
+        {% if not valid %}
+            {% set attr = attr|merge({class: (attr.class|default('') ~ ' is-invalid')|trim}) -%}
+            {% set valid = true %}
+        {% endif %}
+        <div {{ block('widget_container_attributes') }}>
+            {{- form_widget(form.date, { datetime: true } ) -}}
+            {{- form_errors(form.date) -}}
+            {{- form_widget(form.time, { datetime: true } ) -}}
+            {{- form_errors(form.time) -}}
+        </div>
+    {%- endif -%}
+{%- endblock datetime_widget %}
+
+{% block dateinterval_widget -%}
+    {%- if widget == 'single_text' -%}
+        {{- block('form_widget_simple') -}}
+    {%- else -%}
+        {% if not valid %}
+            {% set attr = attr|merge({class: (attr.class|default('') ~ ' is-invalid')|trim}) -%}
+            {% set valid = true %}
+        {% endif %}
+        <div {{ block('widget_container_attributes') }}>
+            {%- if with_years -%}
+                <div class="col-auto mb-3">
+                    {{ form_label(form.years) }}
+                    {{ form_widget(form.years) }}
+                </div>
+            {%- endif -%}
+            {%- if with_months -%}
+                <div class="col-auto mb-3">
+                    {{ form_label(form.months) }}
+                    {{ form_widget(form.months) }}
+                </div>
+            {%- endif -%}
+            {%- if with_weeks -%}
+                <div class="col-auto mb-3">
+                    {{ form_label(form.weeks) }}
+                    {{ form_widget(form.weeks) }}
+                </div>
+            {%- endif -%}
+            {%- if with_days -%}
+                <div class="col-auto mb-3">
+                    {{ form_label(form.days) }}
+                    {{ form_widget(form.days) }}
+                </div>
+            {%- endif -%}
+            {%- if with_hours -%}
+                <div class="col-auto mb-3">
+                    {{ form_label(form.hours) }}
+                    {{ form_widget(form.hours) }}
+                </div>
+            {%- endif -%}
+            {%- if with_minutes -%}
+                <div class="col-auto mb-3">
+                    {{ form_label(form.minutes) }}
+                    {{ form_widget(form.minutes) }}
+                </div>
+            {%- endif -%}
+            {%- if with_seconds -%}
+                <div class="col-auto mb-3">
+                    {{ form_label(form.seconds) }}
+                    {{ form_widget(form.seconds) }}
+                </div>
+            {%- endif -%}
+            {%- if with_invert %}{{ form_widget(form.invert) }}{% endif -%}
+        </div>
+    {%- endif -%}
+{%- endblock dateinterval_widget %}
+
+{% block percent_widget -%}
+    {%- if symbol -%}
+        <div class="input-group">
+            {{- block('form_widget_simple') -}}
+            <span class="input-group-text">{{ symbol|default('%') }}</span>
+        </div>
+    {%- else -%}
+        {{- block('form_widget_simple') -}}
+    {%- endif -%}
+{%- endblock percent_widget %}
+
+{% block form_widget_simple -%}
+    {%- if type is not defined or type != 'hidden' %}
+        {%- set widget_class = ' form-control' %}
+        {%- if type|default('') == 'color' -%}
+            {%- set widget_class = widget_class ~ ' form-control-color' -%}
+        {%- elseif type|default('') == 'range' -%}
+            {%- set widget_class = ' form-range' -%}
+        {%- endif -%}
+        {%- set attr = attr|merge({class: (attr.class|default('') ~ widget_class)|trim}) -%}
+    {% endif -%}
+    {%- if type is defined and type in ['range', 'color'] %}
+        {# Attribute "required" is not supported #}
+        {% set required = false %}
+    {% endif -%}
+    {{- parent() -}}
+{%- endblock form_widget_simple %}
+
+{%- block widget_attributes -%}
+    {%- if not valid %}
+        {% set attr = attr|merge({class: (attr.class|default('') ~ ' is-invalid')|trim}) %}
+    {% endif -%}
+    {{ parent() }}
+{%- endblock widget_attributes -%}
+
+{%- block button_widget -%}
+    {%- set attr = attr|merge({class: (attr.class|default('btn-secondary') ~ ' btn')|trim}) -%}
+    {{- parent() -}}
+{%- endblock button_widget %}
+
+{%- block submit_widget -%}
+    {%- set attr = attr|merge({class: (attr.class|default('btn-primary'))|trim}) -%}
+    {{- parent() -}}
+{%- endblock submit_widget %}
+
+{%- block checkbox_widget -%}
+    {%- set attr = attr|merge({class: (attr.class|default('') ~ ' form-check-input')|trim}) -%}
+    {%- set parent_label_class = parent_label_class|default(label_attr.class|default('')) -%}
+    {%- set row_class = 'form-check' -%}
+    {%- if 'checkbox-inline' in parent_label_class %}
+        {% set row_class = row_class ~ ' form-check-inline' %}
+    {% endif -%}
+    {%- if 'checkbox-switch' in parent_label_class %}
+        {% set row_class = row_class ~ ' form-switch' %}
+    {% endif -%}
+    <div class="{{ row_class }}">
+        {{- form_label(form, null, { widget: parent() }) -}}
+    </div>
+{%- endblock checkbox_widget %}
+
+{%- block radio_widget -%}
+    {%- set attr = attr|merge({class: (attr.class|default('') ~ ' form-check-input')|trim}) -%}
+    {%- set parent_label_class = parent_label_class|default(label_attr.class|default('')) -%}
+    {%- set row_class = 'form-check' -%}
+    {%- if 'radio-inline' in parent_label_class -%}
+        {%- set row_class = row_class ~ ' form-check-inline' -%}
+    {%- endif -%}
+    <div class="{{ row_class }}">
+        {{- form_label(form, null, { widget: parent() }) -}}
+    </div>
+{%- endblock radio_widget %}
+
+{%- block choice_widget_collapsed -%}
+    {%- set attr = attr|merge({class: (attr.class|default('') ~ ' form-select')|trim}) -%}
+    {{- parent() -}}
+{%- endblock choice_widget_collapsed -%}
+
+{%- block choice_widget_expanded -%}
+    <div {{ block('widget_container_attributes') }}>
+        {%- for child in form %}
+            {{- form_widget(child, {
+                parent_label_class: label_attr.class|default(''),
+                translation_domain: choice_translation_domain,
+                valid: valid,
+            }) -}}
+        {% endfor -%}
+    </div>
+{%- endblock choice_widget_expanded %}
+
+{# Labels #}
+
+{%- block form_label -%}
+    {% if label is not same as(false) -%}
+        {%- set parent_label_class = parent_label_class|default(label_attr.class|default('')) -%}
+        {%- if compound is defined and compound -%}
+            {%- set element = 'legend' -%}
+            {%- if 'col-form-label' not in parent_label_class -%}
+                {%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' col-form-label' )|trim}) -%}
+            {%- endif -%}
+        {%- else -%}
+            {%- set row_class = row_class|default(row_attr.class|default('')) -%}
+            {%- set label_attr = label_attr|merge({for: id}) -%}
+            {%- if 'col-form-label' not in parent_label_class -%}
+                {%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ('input-group' in row_class ? ' input-group-text' : ' form-label') )|trim}) -%}
+            {%- endif -%}
+        {%- endif -%}
+    {%- endif -%}
+    {{- parent() -}}
+{%- endblock form_label %}
+
+{%- block checkbox_radio_label -%}
+    {#- Do not display the label if widget is not defined in order to prevent double label rendering -#}
+    {%- if widget is defined -%}
+        {%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' form-check-label')|trim}) -%}
+        {%- if not compound -%}
+            {% set label_attr = label_attr|merge({'for': id}) %}
+        {%- endif -%}
+        {%- if required -%}
+            {%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' required')|trim}) -%}
+        {%- endif -%}
+        {%- if parent_label_class is defined -%}
+            {%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' ' ~ parent_label_class)|replace({'checkbox-inline': '', 'radio-inline': ''})|trim}) -%}
+        {%- endif -%}
+        {%- if label is not same as(false) and label is empty -%}
+            {%- if label_format is not empty -%}
+                {%- set label = label_format|replace({
+                    '%name%': name,
+                    '%id%': id,
+                }) -%}
+            {%- else -%}
+                {%- set label = name|humanize -%}
+            {%- endif -%}
+        {%- endif -%}
+
+        {{ widget|raw }} {# adaptation before sf5 upgrade #}{% set label_html = false %}{# end adaptation before sf5 upgrade #}
+        <label{% with { attr: label_attr } %}{{ block('attributes') }}{% endwith %}>
+            {%- if label is not same as(false) -%}
+                {%- if translation_domain is same as(false) -%}
+                    {%- if label_html is same as(false) -%}
+                        {{- label -}}
+                    {%- else -%}
+                        {{- label|raw -}}
+                    {%- endif -%}
+                {%- else -%}
+                    {%- if label_html is same as(false) -%}
+                        {{- label|trans(label_translation_parameters, translation_domain) -}}
+                    {%- else -%}
+                        {{- label|trans(label_translation_parameters, translation_domain)|raw -}}
+                    {%- endif -%}
+                {%- endif -%}
+            {%- endif -%}
+        </label>
+    {%- endif -%}
+{%- endblock checkbox_radio_label %}
+
+{# Rows #}
+
+{%- block form_row -%}
+    {%- if compound is defined and compound -%}
+        {%- set element = 'fieldset' -%}
+    {%- endif -%}
+    {%- set widget_attr = {} -%}
+    {%- if help is not empty -%}
+        {%- set widget_attr = {attr: {'aria-describedby': id ~"_help"}} -%}
+    {%- endif -%}
+    {%- set row_class = row_class|default(row_attr.class|default('mb-3')|trim) -%}
+    <{{ element|default('div') }}{% with {attr: row_attr|merge({class: row_class})} %}{{ block('attributes') }}{% endwith %}>
+        {%- if 'form-floating' in row_class -%}
+            {{- form_widget(form, widget_attr) -}}
+            {{- form_label(form) -}}
+        {%- else -%}
+            {{- form_label(form) -}}
+            {{- form_widget(form, widget_attr) -}}
+        {%- endif -%}
+        {{- form_help(form) -}}
+        {{- form_errors(form) -}}
+    </{{ element|default('div') }}>
+{%- endblock form_row %}
+
+{%- block button_row -%}
+    <div{% with {attr: row_attr|merge({class: row_attr.class|default('mb-3')|trim})} %}{{ block('attributes') }}{% endwith %}>
+        {{- form_widget(form) -}}
+    </div>
+{%- endblock button_row %}
+
+{# Errors #}
+
+{%- block form_errors -%}
+    {%- if errors|length > 0 -%}
+        {%- for error in errors -%}
+            <div class="invalid-feedback d-block">{{ error.message }}</div>
+        {%- endfor -%}
+    {%- endif %}
+{%- endblock form_errors %}
+
+{# Help #}
+
+{%- block form_help -%}
+    {% set row_class = row_attr.class|default('') %}
+    {% set help_class = ' form-text' %}
+    {% if 'input-group' in row_class %}
+        {#- Hack to properly display help with input group -#}
+        {% set help_class = ' input-group-text' %}
+    {% endif %}
+    {%- if help is not empty -%}
+        {%- set help_attr = help_attr|merge({class: (help_attr.class|default('') ~ help_class ~ ' mb-0')|trim}) -%}
+    {%- endif -%}
+    {{- parent() -}}
+{%- endblock form_help %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig
index f087578f3..1e2bf713f 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig
@@ -1,5 +1,5 @@
 {#
- * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS, 
+ * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS,
  <info@champs-libres.coop> / <http://www.champs-libres.coop>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -19,33 +19,35 @@
 {% block form_row %}
 {% apply spaceless %}
     {% if form.vars.hideLabel is not defined or form.vars.hideLabel == false %}
-    <div class="container">
-        <div class="{% apply spaceless %}
-            {% if attr.class is defined and ('cf-title' in attr.class or 'cf-fields' in attr.class ) %}
-                grid-12
-            {% elseif attr.class is defined and 'multiple-cf-inline' in attr.class %}
-                grid-2  grid-mobile-4 grid-tablet-4 mobile-clear tablet-clear
-            {% else %}
-                grid-4 clear
+    <div class="mb-2">
+        <div class="row">
+            <div class="{% apply spaceless %}
+                {% if attr.class is defined and ('cf-title' in attr.class or 'cf-fields' in attr.class ) %}
+                    col-sm-12
+                {% elseif attr.class is defined and 'multiple-cf-inline' in attr.class %}
+                    col-sm-2 col-md-4 clear
+                {% else %}
+                    col-sm-4 clear
+                {% endif %}
+            {% endapply %}">
+            {% if attr.class is not defined or ('cf-title' not in attr.class and 'cf-fields' not in attr.class ) %}
+                {{ form_label(form) }}
             {% endif %}
-        {% endapply %}">
-        {% if attr.class is not defined or ('cf-title' not in attr.class and 'cf-fields' not in attr.class ) %}
-            {{ form_label(form) }}
-        {% endif %}
-        </div>
-        <div class="{% apply spaceless %}
-            {% if attr.class is defined and 'cf-title' in attr.class  %} 
-                grid-12
-            {% elseif attr.class is defined and 'cf-fields' in attr.class %}
-                grid-12 parent
-            {% elseif attr.class is defined and 'multiple-cf-inline' in attr.class %} 
-                grid-2 grid-mobile-8 grid-tablet-8 multiple-cf-inline
-            {% else %}
-                grid-8
-            {% endif %}
-        {% endapply %}">
-            {{ form_widget(form)  }}
-            {{ form_errors(form) }}
+            </div>
+            <div class="{% apply spaceless %}
+                {% if attr.class is defined and 'cf-title' in attr.class  %}
+                    col-sm-12
+                {% elseif attr.class is defined and 'cf-fields' in attr.class %}
+                    col-sm-12 parent
+                {% elseif attr.class is defined and 'multiple-cf-inline' in attr.class %}
+                    col-sm-2 col-md-8 multiple-cf-inline
+                {% else %}
+                    col-sm-8
+                {% endif %}
+            {% endapply %}">
+                {{ form_widget(form)  }}
+                {{ form_errors(form) }}
+            </div>
         </div>
     </div>
     {% else %}
@@ -53,7 +55,7 @@
     {% endif %}
 {% endapply %}
 {% endblock form_row %}
-    
+
 {% block choice_widget_expanded %}
 {% apply spaceless %}
     <div {{ block('widget_container_attributes') }} class="choice-widget-expanded">
@@ -62,7 +64,6 @@
             {{ form_widget(child) }}
             {{ form_label(child, '', {'label_attr': { 'class' : 'inline'} }) }}
         </span>
-        <br/>
     {% endfor %}
     </div>
     <script type="text/javascript">
@@ -83,17 +84,18 @@
                 {{ form_label(child, '', {'label_attr': { 'class' : 'inline'} }) }}
             </div>
         {%- else -%}
-            <div class="container">
-                <div class="grid-6 grid-tablet-12 gid-mobile-12 no-gutter">
-                    <span class="inline-choice">
-                        {{ form_widget(child) }}
-                        {{ form_label(child, '', {'label_attr': { 'class' : 'inline'} }) }}
-                    </span>
+            <div class="container-fluid">
+                <div class="row g-0">
+                    <div class="col-md-6">
+                        <span class="inline-choice">
+                            {{ form_widget(child) }}
+                            {{ form_label(child, '', {'label_attr': { 'class' : 'inline'} }) }}
+                        </span>
+                    </div>
+                    <div class="col-md-6">
+                        {{ form_widget(form._other, {'attr': {'class': 'input-text-other-value'} }) }}
+                    </div>
                 </div>
-                <div class="grid-6 grid-tablet-12 gid-mobile-12  no-gutter">
-                    {{ form_widget(form._other, {'attr': {'class': 'input-text-other-value'} }) }}
-                </div>
-                
             </div>
         {%- endif -%}
     {% endfor %}
@@ -123,7 +125,7 @@
         </div>
     {%- endif -%}
 {%- endblock time_widget -%}
-        
+
 {% block form_errors %}
 {% apply spaceless %}
     {% if errors|length > 0 %}
@@ -138,25 +140,30 @@
 
 {% block _formatter__aggregator_placement_csv_formatter_row %}
     <h3>{{ form_label(form) }}</h3>
-    
+
     {{ form_row(form.order) }}
-    
+
     {{ form_row(form.position) }}
-    
+
 {% endblock %}
 
 {% block _formatter__aggregator_placement_spreadsheet_formatter_row %}
     <h3>{{ form_label(form) }}</h3>
-    
+
     {{ form_row(form.order) }}
-    
+
 {% endblock %}
 
 {% block chill_collection_widget %}
     <div class="chill-collection">
-        <ul class="chill-collection__list" data-collection-name="{{ form.vars.name|escape('html_attr') }}" data-collection-identifier="{{ form.vars.identifier|escape('html_attr') }}"  data-collection-button-remove-label="{{ form.vars.button_remove_label|trans|e }}" data-collection-allow-add="{{ form.vars.allow_add|escape('html_attr') }}" data-collection-allow-delete="{{ form.vars.allow_delete|escape('html_attr') }}" >
+        <ul class="list-entry"
+            data-collection-name="{{ form.vars.name|escape('html_attr') }}"
+            data-collection-identifier="{{ form.vars.identifier|escape('html_attr') }}"
+            data-collection-button-remove-label="{{ form.vars.button_remove_label|trans|e }}"
+            data-collection-allow-add="{{ form.vars.allow_add|escape('html_attr') }}"
+            data-collection-allow-delete="{{ form.vars.allow_delete|escape('html_attr') }}">
             {% for entry in form %}
-                <li class="chill-collection__list__entry" data-collection-is-persisted="1">
+                <li class="entry" data-collection-is-persisted="1">
                     <div>
                         {{ form_widget(entry) }}
                     </div>
@@ -165,9 +172,15 @@
         </ul>
 
         {% if form.vars.allow_add == 1 %}
-        <button class="chill-collection__button--add sc-button" data-collection-add-target="{{ form.vars.name|escape('html_attr') }}" data-form-prototype="{{ ('<div>' ~ form_widget(form.vars.prototype) ~ '</div>')|escape('html_attr') }}" >{{ form.vars.button_add_label|trans }}</button>
+        <button class="add-entry btn btn-misc"
+            data-collection-add-target="{{ form.vars.name|escape('html_attr') }}"
+            data-form-prototype="{{ ('<div>' ~ form_widget(form.vars.prototype) ~ '</div>')|escape('html_attr') }}" >
+            <i class="fa fa-plus fa-fw"></i>
+            {{ form.vars.button_add_label|trans }}
+        </button>
+        {% endif %}
+
     </div>
-    {% endif %}
 {% endblock %}
 
 {% block address_widget %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Layout/_debug.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Layout/_debug.html.twig
new file mode 100644
index 000000000..b0d7729cd
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/Layout/_debug.html.twig
@@ -0,0 +1 @@
+<div class="responsive"></div>
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Layout/_footer.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Layout/_footer.html.twig
index 0d23d499d..dbec69008 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Layout/_footer.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Layout/_footer.html.twig
@@ -1,4 +1,9 @@
 <footer class="footer">
-    <p>{{ 'This program is free software: you can redistribute it and/or modify it under the terms of the <strong>GNU Affero General Public License</strong>'|trans|raw }}
-        <br/> <a name="bottom" href="https://{{ app.request.locale }}.wikibooks.org/wiki/Chill" target="_blank">{{ 'User manual'|trans }}</a></p>
+    <p>
+        {{ 'This program is free software: you can redistribute it and/or modify it under the terms of the <strong>GNU Affero General Public License</strong>'|trans|raw }}
+        <br/> 
+        <a name="bottom" class="btn text-white" href="https://{{ app.request.locale }}.wikibooks.org/wiki/Chill" target="_blank">
+            {{ 'User manual'|trans }}
+        </a>
+    </p>
 </footer>
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Layout/_header.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Layout/_header.html.twig
new file mode 100644
index 000000000..605be2da6
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/Layout/_header.html.twig
@@ -0,0 +1,100 @@
+{#
+    * Copyright (C) 2014-2021, Champs Libres Cooperative SCRLFS,
+    * <info@champs-libres.coop> / <http://www.champs-libres.coop>
+    *
+    * This program is free software: you can redistribute it and/or modify
+    *  it under the terms of the GNU Affero General Public License as
+    * published by the Free Software Foundation, either version 3 of the
+    *  License, or (at your option) any later version.
+    *
+    * This program is distributed in the hope that it will be useful,
+    * but WITHOUT ANY WARRANTY; without even the implied warranty of
+    * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    * GNU Affero General Public License for more details.
+    *
+    * You should have received a copy of the GNU Affero General Public License
+    * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#}
+<header>
+    <nav class="navbar navbar-dark bg-primary navbar-expand-md">
+        <div class="container-xxl">
+
+            <div class="col-4">
+                <a class="navbar-brand" href="{{ path('chill_main_homepage') }}">
+                    {{ include('@ChillMain/Layout/_header-logo.html.twig') }}
+                </a>
+            </div>
+            
+            <div class="col-8">
+
+                <button class="navbar-toggler" 
+                    type="button" 
+                    data-bs-toggle="collapse" 
+                    data-bs-target="#navbarContent"
+                    aria-controls="navbarContent"
+                    aria-expanded="false"
+                    aria-label="Toggle navigation">
+                    <span class="navbar-toggler-icon"></span>
+                </button>
+
+                <div id="navbarContent" class="collapse navbar-collapse bg-primary">
+                    <ul class="navbar-nav mr-auto">
+
+                        {% block navigation_search_bar %}
+                            <li class="nav-item navigation-search">
+                                <form class="form-inline" action="{{ path('chill_main_search') }}" method="get">
+                                    <input class="form-control" 
+                                        name="q" type="search" placeholder="{{ 'Search'|trans }}" 
+                                        {% if _search_pattern is defined %}value="{{ _search_pattern }}"{% endif %}/>
+                                        <button class="btn text-white-50" type="submit">
+                                            <i class="fa fa-lg fa-search fa-flip-horizontal"></i>
+                                        </button>
+                                </form>
+                            </li>
+                        {% endblock  %}
+
+                        {% block navigation_section_menu %}
+                            {{ chill_menu('section', {
+                                'layout': '@ChillMain/Menu/section.html.twig',
+                            }) }}
+                        {% endblock %}
+
+                        {{ chill_menu('user', {
+                            'layout': '@ChillMain/Menu/user.html.twig',
+                        }) }}
+
+                        {% if  available_languages|length == 1 %}
+                            <li class="nav-item btn btn-primary nav-language">
+                                <a id="menu-languages" class="nav-link" href="#">
+                                    {{ available_languages[0] | capitalize }}
+                                </a>
+                            </li>
+                        {% else %}
+                            <li class="nav-item dropdown btn btn-primary nav-language">
+                                <a id="menu-languages" 
+                                    class="nav-link dropdown-toggle" 
+                                    type="button" 
+                                    data-bs-toggle="dropdown" 
+                                    aria-haspopup="true" 
+                                    aria-expanded="false">
+                                    <a href="#" class="more">{{ app.request.locale | capitalize }}</a>
+                                </a>
+                                <div class="dropdown-menu dropdown-menu-end" 
+                                    aria-labelledby="menu-languages">
+                                    {% for lang in available_languages  %}
+                                        <a class="dropdown-item list-group-item bg-dark text-white{% if lang == app.request.locale %} active{% endif %}"
+                                            href="{{ path(app.request.get('_route'), app.request.get('_route_params')|merge({'_locale' : lang})) }}">
+                                            {{ lang | capitalize }}
+                                        </a>
+                                    {% endfor %}
+                                </div>
+                            </li>
+                        {% endif %}
+
+                    </ul>
+                </div>
+                
+            </div>
+        </div>
+    </nav>
+</header>
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Login/login.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Login/login.html.twig
index 0c35228df..8a636a8cd 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Login/login.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Login/login.html.twig
@@ -23,7 +23,7 @@
             {{ 'Login to %installation_name%' | trans({ '%installation_name%' : installation.name } ) }}
         </title>
         <link rel="shortcut icon" href="{{ asset('build/images/favicon.ico') }}" type="image/x-icon">
-        <link rel="stylesheet" href="{{ asset('build/login.css') }}"/>
+        {{ encore_entry_link_tags('page_login') }}
     </head>
     <body>
         <div id="content">
@@ -42,14 +42,13 @@
                 <input type="hidden" name="_csrf_token" value="{{ csrf_token('authenticate') }}" />
                 <br/>
                 <button type="submit" name="login">{{ 'Login'|trans }}</button>
-
             </form>
+
             <p class="forgot-password-link"><a href="{{ path('password_request_recover') }}">{{ 'Forgot your password ?'|trans }}</a></p>
 
             {{ include('@ChillMain/Login/_footer.html.twig') }}
         </div>
 
-        <script type="text/javascript" src="{{ asset('build/runtime.js') }}"></script>
-
+        {{ encore_entry_script_tags('page_login') }}
     </body>
 </html>
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Menu/section.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Menu/section.html.twig
index a2a437a7b..67683bf50 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Menu/section.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Menu/section.html.twig
@@ -16,26 +16,28 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
 
-<li class="nav-link2">
-    <div class="li-content">
-        <a href="javascript:void(0)" class="more">Sections</a>
-    </div>
-    <ul class="submenu width-15-em" style="padding-left: 0; padding-right: 0;  background-color:transparent;">
+<li class="nav-item dropdown btn btn-primary nav-section">
+    <a id="menu-section" 
+        class="nav-link dropdown-toggle" 
+        type="button" 
+        data-bs-toggle="dropdown" 
+        aria-haspopup="true" 
+        aria-expanded="false">
+        
+        {{ 'Sections'|trans }}
+    </a>
+    <div class="dropdown-menu dropdown-menu-end dropdown-menu-dark" aria-labelledby="menu-section">
         {% for menu in menus %}
-            <li style="display:block; background-color: #333333; padding-left:1.5em; border-bottom:1px; border-bottom: 1px solid #FFF;padding-top:0; padding-bottom:0;">
-                <div style="margin-bottom:2px;">
-                        <div style="font-family: 'Open Sans'; font-weight:300; font-size: 0.75em; text-align:left; height: 46px; display:inline-block;  width: calc(100% - 5em - 1px); vertical-align:top;">
-                            <a href="{{ menu.uri }}">{{ menu.label }}</a>
-                        </div>
-                        <div style="background-color: #333333;  text-align:center;width: 2em; margin-left:-0.15em; font-size:1.5em; color:#FFF; height: 46px; display:inline-block; vertical-align:top;float:right">{% apply spaceless %}
-                            {% if menu.extras.icons is defined %}
-                            {% for icon in menu.extras.icons %}
-                                <i class="fa fa-{{ icon }}"></i> 
-                            {% endfor %}
-                            {% endif %}
-                        {% endapply %}</div>
-                </div>
-            </li>
+            <a class="dropdown-item list-group-item bg-dark text-white" 
+                href="{{ menu.uri }}">
+                {{ menu.label }}
+                {% apply spaceless %}
+                    {% if menu.extras.icons is defined %}
+                        {% for icon in menu.extras.icons %}
+                            <i class="fa fa-{{ icon }} fa-lg"></i>
+                        {% endfor %}
+                    {% endif %}
+            {% endapply %}</a>
         {% endfor %}
-    </ul>
+    </div>
 </li>
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Menu/user.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Menu/user.html.twig
index 4ca7374d0..c083bcb19 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Menu/user.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Menu/user.html.twig
@@ -16,45 +16,42 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
 
-<li class="nav-link2 user-menu">
-	<div class="li-content">
-		<a href="javascript:void(0)" style="font-size: 0.8em; font-family: 'Open Sans'; font-weight:300;">
+<li class="nav-item dropdown btn btn-primary nav-user">
+    <a id="menu-user"
+        class="nav-link dropdown-toggle"
+        type="button"
+        data-bs-toggle="dropdown"
+        aria-haspopup="true"
+        aria-expanded="false">
 
-			{{ 'Welcome' | trans }}<br/>
+        {{ 'Welcome' | trans }}<br/>
+        
+        <b>
+            {{ app.user.username }}
+            {{ render(controller('ChillMainBundle:UI:showNotificationUserCounter')) }}
+        </b>
 
-            <b>{{ app.user.username }}{{ render(controller('ChillMainBundle:UI:showNotificationUserCounter')) }}</b>
+        {% if is_granted('ROLE_PREVIOUS_ADMIN') %}
+            <i class="fa fa-wrench fa-lg" title="Impersonate mode"></i>
+        {% endif %}
 
-            {% if is_granted('ROLE_PREVIOUS_ADMIN') %}
-                <i class="fa fa-wrench fa-lg" title="Impersonate mode"></i>
-            {% endif %}
+    </a>
+    <div class="dropdown-menu dropdown-menu-end dropdown-menu-dark" aria-labelledby="menu-user">
 
-		</a>
-	</div>
-    <ul class="submenu width-11-em user-menu-list" style="padding-left: 0; padding-right: 0;  background-color:transparent;">
         {% for menu in menus %}
-            <li style="display:block; background-color: #333333; padding-left:1.5em; border-bottom:1px; border-bottom: 1px solid #FFF;padding-top:0; padding-bottom:0;">
-                <div style="margin-bottom:2px;">
-                    <div style="font-family: 'Open Sans'; font-weight:300; font-size: 0.75em; text-align:left; height: 46px; display:inline-block;  width: calc(100% - 5em - 1px); vertical-align:top;">
-
-                        {# Impersonate case logout #}
-                        {% if is_granted('ROLE_PREVIOUS_ADMIN') and menu.name == 'Logout' %}
-
-                            <a href="{{ path('admin_user', {'_switch_user': '_exit'}) }}">
-                                {{ 'Exit impersonation'|trans }}
-                            </a>
-
-                        {% else %}
-                            <a href="{{ menu.uri }}">{{ menu.label|trans }}</a>
-                        {% endif %}
-
-                    </div>
-                    <div style="background-color: #333333;  text-align:center;width: 2em; margin-left:-0.15em; font-size:1.5em; color:#FFF; height: 46px; display:inline-block; vertical-align:top;float:right">{% apply spaceless %}
-                        {% if menu.extras.icon is defined %}
-                            <i class="fa fa-{{ menu.extras.icon }}"></i>
-                        {% endif %}
-                    {% endapply %}</div>
-                </div>
-            </li>
+            {% if is_granted('ROLE_PREVIOUS_ADMIN') and menu.name == 'Logout' %}
+            <a class="dropdown-item list-group-item bg-dark text-white" 
+                href="{{ path('admin_user', {'_switch_user': '_exit'}) }}">
+                {{ 'Exit impersonation'|trans }}
+            {% else %}
+            <a class="dropdown-item list-group-item bg-dark text-white"
+                href="{{ menu.uri }}">{{ menu.label|trans }}
+            {% endif %}
+            {% if menu.extras.icon is defined %}
+                <i class="fa fa-{{ menu.extras.icon }} fa-lg"></i>
+            {% endif %}
+            </a>
         {% endfor %}
-    </ul>
+
+    </div>
 </li>
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig
new file mode 100644
index 000000000..34aeee049
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig
@@ -0,0 +1,42 @@
+{% extends "@ChillMain/layout.html.twig"  %}
+
+{% block content %}
+    <div id="container content">
+        <div class="grid-8 centered">
+            <h1>{{ "Notifications list" | trans }}</h1>
+            <!-- TODO : UNREAD & READ -->
+
+            {%for data in datas %}
+                {% set notification = data.notification %}
+
+                <dl class="chill_view_data">
+                    <dt class="inline">{{ 'Message'|trans }}</dt>
+                    <dd>{{ notification.message }}</dd>
+                </dl>
+
+                <dl class="chill_view_data">
+                    <dt class="inline">{{ 'Date'|trans }}</dt>
+                    <dd>{{ notification.date | date('long') }}</dd>
+                </dl>
+
+
+                <dl class="chill_view_data">
+                    <dt class="inline">{{ 'Sender'|trans }}</dt>
+                    <dd>{{ notification.sender }}</dd>
+                </dl>
+
+                <dl class="chill_view_data">
+                    <dt class="inline">{{ 'Addressees'|trans }}</dt>
+                    <dd>{{ notification.addressees |join(', ')  }}</dd>
+                </dl>
+
+                <dl class="chill_view_data">
+                    <dt class="inline">{{ 'Entity'|trans }}</dt>
+                    <dd>
+                        {% include data.template with data.template_data %}
+                    </dd>
+                </dl>
+            {% endfor %}
+        </div>
+    </div>
+{% endblock content %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Pagination/long.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Pagination/long.html.twig
index 3166c187b..b0b787078 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Pagination/long.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Pagination/long.html.twig
@@ -1,27 +1,29 @@
 {%- macro page(text, page, class = "") -%}
-<span class="link {{ class }}"><a href="{{ page.generateUrl() }}">{{ text }}</a></span>
+<li class="page-item {{ class }}"><a class="page-link" href="{{ page.generateUrl() }}">{{ text }}</a></li>
 {%- endmacro -%}
 
 {% import _self as m %}
 
 {% if paginator|length > 1 %}
-<div class="pagination long">
-    {%- if paginator.hasPreviousPage() -%}
-        {{ m.page('Previous'|trans, paginator.getPreviousPage() ) }}
-    {%- endif -%}
-    {% for i in range(10, 1) %}
-        {%- if paginator.hasPage(current - i) -%}
-        {{ m.page(current - i, paginator.getPage(current - i) ) }}
+<nav aria-label="Page navigation">
+    <ul class="pagination justify-content-center long">
+        {%- if paginator.hasPreviousPage() -%}
+            {{ m.page('Previous'|trans, paginator.getPreviousPage() ) }}
         {%- endif -%}
-    {%- endfor -%}
-    <span class="current link">{{ current }}</span>
-    {% for i in range(1,10) %}
-        {%- if paginator.hasPage(current + i) -%}
-        {{ m.page(current + i, paginator.getPage(current + i) ) }}
+        {% for i in range(10, 1) %}
+            {%- if paginator.hasPage(current - i) -%}
+            {{ m.page(current - i, paginator.getPage(current - i) ) }}
+            {%- endif -%}
+        {%- endfor -%}
+        <li class="active page-item"><span class="page-link">{{ current }}</span></li>
+        {% for i in range(1,10) %}
+            {%- if paginator.hasPage(current + i) -%}
+            {{ m.page(current + i, paginator.getPage(current + i) ) }}
+            {%- endif -%}
+        {%- endfor -%}
+        {%- if paginator.hasNextPage() -%}
+            {{ m.page('Next'|trans, paginator.getNextPage() ) }}
         {%- endif -%}
-    {%- endfor -%}
-    {%- if paginator.hasNextPage() -%}
-        {{ m.page('Next'|trans, paginator.getNextPage() ) }}
-    {%- endif -%}
-</div>
+    </ul>
+</nav>
 {% endif %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Pagination/short.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Pagination/short.html.twig
new file mode 100644
index 000000000..27bc0c75d
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/Pagination/short.html.twig
@@ -0,0 +1,25 @@
+{%- macro page(text, page, class = "") -%}
+    <li class="page-item {{ class }}"><a class="page-link" href="{{ page.generateUrl() }}">{{ text }}</a></li>
+{%- endmacro -%}
+
+{% import _self as m %}
+
+{% if paginator|length > 1 %}
+    <nav aria-label="Page navigation">
+        <ul class="pagination pagination-sm justify-content-center short">
+
+            {% for i in range(10, 1) %}
+                {%- if paginator.hasPage(current - i) -%}
+                    {{ m.page(current - i, paginator.getPage(current - i) ) }}
+                {%- endif -%}
+            {%- endfor -%}
+            <li class="active page-item"><span class="page-link">{{ current }}</span></li>
+            {% for i in range(1,10) %}
+                {%- if paginator.hasPage(current + i) -%}
+                    {{ m.page(current + i, paginator.getPage(current + i) ) }}
+                {%- endif -%}
+            {%- endfor -%}
+
+        </ul>
+    </nav>
+{% endif %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Password/password.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Password/password.html.twig
index ea77fb94c..b34214ed2 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Password/password.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Password/password.html.twig
@@ -23,7 +23,7 @@
 {% block title %}{{"Change my password"|trans}}{% endblock %}
 
 {% block content %}
-    <div class="grid-10 grid-mobile-10 grid-tablet-10 centered">
+    <div class="col-10 centered">
 
         <h1>{{ 'Change my password'|trans }}</h1>
 
@@ -33,7 +33,7 @@
         
         <ul class="record_actions">
             <li>
-                {{ form_widget(form.submit, { 'attr': { 'class': 'sc-button orange' } } ) }}
+                {{ form_widget(form.submit, { 'attr': { 'class': 'btn btn-chill-orange' } } ) }}
             </li>
         </ul>
             
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Password/recover_layout.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Password/recover_layout.html.twig
index fa4c58bdb..7c328b889 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Password/recover_layout.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Password/recover_layout.html.twig
@@ -1,5 +1,5 @@
 {#
- * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS, 
+ * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS,
  <info@champs-libres.coop> / <http://www.champs-libres.coop>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,25 +24,20 @@
             {{ 'Login to %installation_name%' | trans({ '%installation_name%' : installation.name } ) }}
         </title>
         <link rel="shortcut icon" href="{{ asset('build/images/favicon.ico') }}" type="image/x-icon">
-        <link rel="stylesheet" href="{{ asset('build/chill.css') }}"/>
-
+        {{ encore_entry_link_tags('chill') }}
     </head>
     <body>
-        
-        <header class="navigation container">
-        <div class="grid-4 hide-tablet hide-mobile parent">
-            <div class="grid-10 push-2 grid-tablet-12 grid-mobile-12 push-tablet-0 grid-mobile-0 logo-container">
-                <a href="{{ path('chill_main_homepage') }}">
-                    <img class="logo" src="{{ asset('build/images/logo-chill-sans-slogan_white.png') }}">
-                </a>
+        <header class="navigation container-fluid">
+            <div class="col-4 d-md-none parent">
+                <div class="col-10 col-md-12 offset-2 logo-container">
+                    <a href="{{ path('chill_main_homepage') }}">
+                        <img class="logo" src="{{ asset('build/images/logo-chill-sans-slogan_white.png') }}">
+                    </a>
+                </div>
             </div>
-        </div>
-        
         </header>
-        
-        <div id="content">
-            
 
+        <div id="content">
             {% block content %}{% endblock %}
         </div>
     </body>
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Password/recover_password_changed.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Password/recover_password_changed.html.twig
index c1d4b54c8..1af108bf1 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Password/recover_password_changed.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Password/recover_password_changed.html.twig
@@ -3,7 +3,7 @@
 {% block title %}{{ "New password set"|trans }}{% endblock %}
 
 {% block content %}
-    <div class="grid-10 grid-mobile-10 grid-tablet-10 centered">
+    <div class="col-10 centered">
 
         <h1>{{ "New password set"|trans }}</h1>
 
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Password/recover_password_form.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Password/recover_password_form.html.twig
index 83622c25e..6e32cb0b4 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Password/recover_password_form.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Password/recover_password_form.html.twig
@@ -5,7 +5,7 @@
 {% block title %}{{ title }}{% endblock %}
 
 {% block content %}
-    <div class="grid-10 grid-mobile-10 grid-tablet-10 centered">
+    <div class="col-10 centered">
 
         <h1>{{ title }}</h1>
 
@@ -14,7 +14,7 @@
         
         <ul class="record_actions">
             <li>
-                {{ form_widget(form.submit, { 'attr': { 'class': 'sc-button orange' } } ) }}
+                {{ form_widget(form.submit, { 'attr': { 'class': 'btn btn-chill-orange' } } ) }}
             </li>
         </ul>
             
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Password/request_recover_password.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Password/request_recover_password.html.twig
index f40fbec5a..43a2d4674 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Password/request_recover_password.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Password/request_recover_password.html.twig
@@ -23,7 +23,7 @@
 {% block title %}{{"Recover password"|trans}}{% endblock %}
 
 {% block content %}
-    <div class="grid-10 grid-mobile-10 grid-tablet-10 centered">
+    <div class="col-10 centered">
 
         <h1>{{ 'Recover password'|trans }}</h1>
 
@@ -32,7 +32,7 @@
         
         <ul class="record_actions">
             <li>
-                {{ form_widget(form.submit, { 'attr': { 'class': 'sc-button orange' } } ) }}
+                {{ form_widget(form.submit, { 'attr': { 'class': 'btn btn-chill-orange' } } ) }}
             </li>
         </ul>
             
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Password/request_recover_password_confirm.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Password/request_recover_password_confirm.html.twig
index c7431a31d..4fb924077 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Password/request_recover_password_confirm.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Password/request_recover_password_confirm.html.twig
@@ -4,7 +4,7 @@
 
 {% block content %}
 
-<div class="grid-10 grid-mobile-10 grid-tablet-10 centered">
+<div class="col-10 centered">
 
     <h1>{{ 'Check your email'|trans }}</h1>
 
diff --git a/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/edit.html.twig b/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/edit.html.twig
index b58bc6a8c..9054176d7 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/edit.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/edit.html.twig
@@ -12,7 +12,7 @@
     {% if edit_form.flags is defined %}
     {{ form_row(edit_form.flags) }}
     {% endif %}
-    {{ form_row(edit_form.submit, { 'attr': { 'class': 'sc-button green' } } ) }}
+    {{ form_row(edit_form.submit, { 'attr': { 'class': 'btn btn-chill-green' } } ) }}
     {{ form_end(edit_form) }}
     
     <h2>{{ 'Grant those permissions'|trans }} :</h2>
@@ -52,7 +52,7 @@
             </td>
             <td>
                 {{ form_start(delete_role_scopes_form[role_scope.id]) }}
-                {{ form_widget(delete_role_scopes_form[role_scope.id].submit, { 'attr': { 'class': 'sc-button red' } } ) }}
+                {{ form_widget(delete_role_scopes_form[role_scope.id].submit, { 'attr': { 'class': 'btn btn-chill-red' } } ) }}
                 {{ form_end(delete_role_scopes_form[role_scope.id]) }}
             </td>
         </tr>
@@ -75,13 +75,13 @@
     
     <ul class="record_actions">
         <li>
-            {{ form_row(add_role_scopes_form.submit, { 'attr' : { 'class': 'sc-button bt-create' } } ) }}
+            {{ form_row(add_role_scopes_form.submit, { 'attr' : { 'class': 'btn btn-create' } } ) }}
         </li>
         <li>
-            <a href="{{ path('admin_permissionsgroup_show', { 'id': entity.id }) }}" class="sc-button bt-see">{{ 'Cancel'|trans }}</a>
+            <a href="{{ path('admin_permissionsgroup_show', { 'id': entity.id }) }}" class="btn btn-see">{{ 'Cancel'|trans }}</a>
         </li>
         <li>
-            <a href="{{ path('admin_permissionsgroup') }}" class="sc-button bt-cancel">
+            <a href="{{ path('admin_permissionsgroup') }}" class="btn btn-cancel">
                 {{ 'Back to the list'|trans }}
             </a>
         </li>
diff --git a/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/index.html.twig
index f416fe380..cc3cabc48 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/index.html.twig
@@ -19,10 +19,10 @@
                 <td>
                 <ul class="record_actions">
                     <li>
-                        <a href="{{ path('admin_permissionsgroup_show', { 'id': entity.id }) }}" class="sc-button bt-see">{{ 'See'|trans }}</a>
+                        <a href="{{ path('admin_permissionsgroup_show', { 'id': entity.id }) }}" class="btn btn-see">{{ 'See'|trans }}</a>
                     </li>
                     <li>
-                        <a href="{{ path('admin_permissionsgroup_edit', { 'id': entity.id }) }}" class="sc-button bt-edit">{{ 'Edit'|trans }}</a>
+                        <a href="{{ path('admin_permissionsgroup_edit', { 'id': entity.id }) }}" class="btn btn-edit">{{ 'Edit'|trans }}</a>
                     </li>
                 </ul>
                 </td>
@@ -33,7 +33,7 @@
 
     <ul class="record_actions">
         <li>
-            <a href="{{ path('admin_permissionsgroup_new') }}" class="sc-button bt-create">
+            <a href="{{ path('admin_permissionsgroup_new') }}" class="btn btn-create">
                 {{ 'Create a new permissions group'| trans }}
             </a>
         </li>
diff --git a/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/new.html.twig b/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/new.html.twig
index 6d5b59b27..76474f220 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/new.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/new.html.twig
@@ -10,7 +10,7 @@
     {% if form.flags is defined %}
     {{ form_row(form.flags) }}
     {% endif %}
-    {{ form_row(form.submit, { 'attr': { 'class': 'sc-button green' } } ) }}
+    {{ form_row(form.submit, { 'attr': { 'class': 'btn btn-chill-green' } } ) }}
     {{ form_end(form) }}
 
         <ul class="record_actions">
diff --git a/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/show.html.twig b/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/show.html.twig
index fc0b4d349..b94b5204d 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/show.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/show.html.twig
@@ -58,12 +58,12 @@
     <ul class="record_actions">
         
         <li>
-            <a href="{{ path('admin_permissionsgroup_edit', { 'id': entity.id }) }}" class="sc-button bt-edit">
+            <a href="{{ path('admin_permissionsgroup_edit', { 'id': entity.id }) }}" class="btn btn-edit">
                {{ 'Edit'|trans }}
             </a>
         </li>
         <li>
-            <a href="{{ path('admin_permissionsgroup') }}" class="sc-button bt-cancel">
+            <a href="{{ path('admin_permissionsgroup') }}" class="btn btn-cancel">
                 {{ 'Back to the list'|trans }}
             </a>
         </li>
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Scope/edit.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Scope/edit.html.twig
index 1ad7ab763..2f1098761 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Scope/edit.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Scope/edit.html.twig
@@ -7,7 +7,7 @@
     
     {{ form_start(edit_form) }}
     {{ form_row(edit_form.name) }}
-    {{ form_row(edit_form.submit, { 'attr' : { 'class' : 'sc-button green' } } ) }}
+    {{ form_row(edit_form.submit, { 'attr' : { 'class' : 'btn btn-chill-green' } } ) }}
     {{ form_end(edit_form) }}
 
         <ul class="record_actions">
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Scope/new.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Scope/new.html.twig
index 14fc46274..0807e6088 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Scope/new.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Scope/new.html.twig
@@ -7,7 +7,7 @@
 
     {{ form_start(form) }}
     {{ form_row(form.name) }}
-    {{ form_row(form.submit, { 'attr' : { 'class' : 'sc-button green' } } ) }}
+    {{ form_row(form.submit, { 'attr' : { 'class' : 'btn btn-chill-green' } } ) }}
     {{ form_end(form) }}
 
         <ul class="record_actions">
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Search/advanced_search.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Search/advanced_search.html.twig
index b13bc377a..1079aadec 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Search/advanced_search.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Search/advanced_search.html.twig
@@ -18,29 +18,27 @@
 
 
 {% block title title|trans %}
-    
+
 {% block content %}
-    
-    <div style="margin-right: 2em; margin-left: 2em;">
-        
-        <h1>{{ title|trans }}</h1>
-    
+<div class="col-md-10 col-xxl search-list">
+
+    <h1>{{ title|trans }}</h1>
+
     {{ form_start(form) }}
-    
+
     {% for f in form %}
-        {% if f.vars.name != 'submit' %} 
+        {% if f.vars.name != 'submit' %}
           {{ form_row(f) }}
         {% endif %}
     {% endfor %}
 
     <ul class="record_actions">
         <li>
-            {{ form_widget(form.submit, { 'attr' : { 'class': 'sc-button bt-create change-icon' } } ) }}
+            {{ form_widget(form.submit, { 'attr' : { 'class': 'btn btn-create change-icon' } } ) }}
         </li>
     </ul>
-    
+
     {{ form_end(form) }}
-    
-    </div>
-    
+
+</div>
 {% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Search/error.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Search/error.html.twig
index ef0679e1e..80996db23 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Search/error.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Search/error.html.twig
@@ -19,7 +19,9 @@
 {% set _search_pattern = pattern %}
 
 {%  block content %}
+<div class="col-md-10 col-xxl search-list">
 
-    <p class="grid-8 centered error">{{ message }}</p>
+    <p class="error">{{ message }}</p>
 
+</div>
 {%  endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Search/list.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Search/list.html.twig
index cd379a692..db2d63c80 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Search/list.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Search/list.html.twig
@@ -21,13 +21,11 @@
 {% block title %}{{ 'Search %pattern%'|trans({ '%pattern%' : pattern }) }}{% endblock title %}
 
 {%  block content %}
+<div class="col-md-10 col-xxl search-list">
 
-    <div class="grid-12 parent" >
-        <div class="grid-10 push-1 parent">
-            {% for result in results %}
-                {{ result|raw }}
-            {%  endfor %}
-        </div>
-    </div>
+    {% for result in results %}
+        {{ result|raw }}
+    {%  endfor %}
 
-{%  endblock %}
\ No newline at end of file
+</div>
+{%  endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Timeline/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Timeline/index.html.twig
index d3a5f0780..525062d89 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Timeline/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Timeline/index.html.twig
@@ -2,7 +2,7 @@
 
 {% block content %}
   <div id="container content">
-    <div class="grid-8 centered">
+    <div class="col-8 centered">
       <h1>{{ 'Global timeline'|trans }}</h1>
 
       {{ timeline|raw }}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/UI/notification_user_counter.html.twig b/src/Bundle/ChillMainBundle/Resources/views/UI/notification_user_counter.html.twig
index e4e899ba6..8f2db0eef 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/UI/notification_user_counter.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/UI/notification_user_counter.html.twig
@@ -1 +1 @@
-{% if nb > 0 %}<span class="notification-counter">{{ nb }}</span>{% endif %}
\ No newline at end of file
+{% if nb > 0 %}<span class="badge rounded-pill bg-danger notification-counter">{{ nb }}</span>{% endif %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/User/edit.html.twig b/src/Bundle/ChillMainBundle/Resources/views/User/edit.html.twig
index 80752d5ad..507e3c609 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/User/edit.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/User/edit.html.twig
@@ -11,8 +11,8 @@
     {{ form_row(edit_form.email) }}
     {{ form_row(edit_form.enabled, { 'label': "User'status"}) }}
     
-    {{ form_widget(edit_form.submit, { 'attr': { 'class' : 'sc-button green center' } } ) }} 
-    <a href="{{ path('admin_user_edit_password',  { 'id' : entity.id }) }}" class="sc-button orange">{{ 'Edit password'|trans }}</a>
+    {{ form_widget(edit_form.submit, { 'attr': { 'class' : 'btn btn-chill-green center' } } ) }} 
+    <a href="{{ path('admin_user_edit_password',  { 'id' : entity.id }) }}" class="btn btn-chill-orange">{{ 'Edit password'|trans }}</a>
     
     {{ form_end(edit_form) }}
     
@@ -42,7 +42,7 @@
                     </td>
                     <td>
                         {{ form_start(delete_groupcenter_form[groupcenter.id]) }}
-                        {{ form_row(delete_groupcenter_form[groupcenter.id].submit, { 'attr': { 'class': 'sc-button red' } } ) }}
+                        {{ form_row(delete_groupcenter_form[groupcenter.id].submit, { 'attr': { 'class': 'btn btn-chill-red' } } ) }}
                         {{ form_rest(delete_groupcenter_form[groupcenter.id]) }}
                         {{ form_end(delete_groupcenter_form[groupcenter.id]) }}
                     </td>
@@ -59,7 +59,7 @@
     {{ form_start(add_groupcenter_form) }}
     {{ form_row(add_groupcenter_form.composed_groupcenter.center) }}
     {{ form_row(add_groupcenter_form.composed_groupcenter.permissionsgroup) }}
-    {{ form_row(add_groupcenter_form.submit, { 'attr' : { 'class': 'sc-button green' } } ) }}
+    {{ form_row(add_groupcenter_form.submit, { 'attr' : { 'class': 'btn btn-chill-green' } } ) }}
 
     {{ form_end(add_groupcenter_form) }}
     
diff --git a/src/Bundle/ChillMainBundle/Resources/views/User/edit_password.html.twig b/src/Bundle/ChillMainBundle/Resources/views/User/edit_password.html.twig
index add790c9d..3280b3679 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/User/edit_password.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/User/edit_password.html.twig
@@ -7,7 +7,7 @@
 
     {{ form_start(edit_form) }}
     {{ form_row(edit_form.new_password) }}
-    {{ form_widget(edit_form.submit, { 'attr': { 'class': 'sc-button orange' } } ) }}
+    {{ form_widget(edit_form.submit, { 'attr': { 'class': 'btn btn-chill-orange' } } ) }}
     {{ form_end(edit_form) }}
     
         <ul class="record_actions">
diff --git a/src/Bundle/ChillMainBundle/Resources/views/User/new.html.twig b/src/Bundle/ChillMainBundle/Resources/views/User/new.html.twig
index 11db501c6..b2234ef30 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/User/new.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/User/new.html.twig
@@ -9,7 +9,7 @@
     {{ form_row(form.username) }}
     {{ form_row(form.email) }}
     {{ form_row(form.plainPassword) }}
-    {{ form_widget(form.submit, { 'attr' : { 'class': 'sc-button blue' } }) }}
+    {{ form_widget(form.submit, { 'attr' : { 'class': 'btn btn-chill-blue' } }) }}
     {{ form_end(form) }}
 
         <ul class="record_actions">
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Util/confirmation_template.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Util/confirmation_template.html.twig
index 1355ac33d..7ffec0bbd 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Util/confirmation_template.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Util/confirmation_template.html.twig
@@ -10,12 +10,12 @@
 
 <ul class="record_actions">
     <li class="cancel">
-        <a href="{{ path(cancel_route, cancel_parameters|default( { } ) ) }}" class="sc-button bt-cancel">
+        <a href="{{ path(cancel_route, cancel_parameters|default( { } ) ) }}" class="btn btn-cancel">
             {{ 'Cancel'|trans }}
         </a>
     </li>
     <li>
-        {{ form_widget(form.submit, { 'attr' : { 'class' : "sc-button bt-delete" } } ) }}
+        {{ form_widget(form.submit, { 'attr' : { 'class' : "btn btn-delete" } } ) }}
     </li>
 </ul>
         
diff --git a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
index 13fe8de26..140557d69 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
@@ -1,19 +1,19 @@
 {#
- * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS,
- <info@champs-libres.coop> / <http://www.champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    * Copyright (C) 2014-2021, Champs Libres Cooperative SCRLFS,
+    <info@champs-libres.coop> / <http://www.champs-libres.coop>
+    *
+    * This program is free software: you can redistribute it and/or modify
+    *  it under the terms of the GNU Affero General Public License as
+    * published by the Free Software Foundation, either version 3 of the
+    *  License, or (at your option) any later version.
+    *
+    * This program is distributed in the hope that it will be useful,
+    * but WITHOUT ANY WARRANTY; without even the implied warranty of
+    * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    * GNU Affero General Public License for more details.
+    *
+    * You should have received a copy of the GNU Affero General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
 
 {#
@@ -26,150 +26,92 @@
     <meta charset="UTF-8" />
     <meta http-equiv="x-ua-compatible" content="ie=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+
     <title>{{ installation.name }} - {% block title %}{% endblock %}</title>
     <link rel="shortcut icon" href="{{ asset('build/images/favicon.ico') }}" type="image/x-icon">
-      {{ encore_entry_link_tags('scratch') }}
-      {{ encore_entry_link_tags('chill') }}
-    {% if active_bootstrap == 1 %}
-      {{ encore_entry_link_tags('bootstrap') }}
-    {% endif %}
-    {% if active_forkawesome == 1 %}
-      {{ encore_entry_link_tags('forkawesome') }}
-    {% endif %}
-    {% if active_ckeditor == 1 %}
-      {{ encore_entry_link_tags('ckeditor5') }}
-    {% endif %}
+
+    {{ encore_entry_link_tags('mod_bootstrap') }}
+    {{ encore_entry_link_tags('mod_forkawesome') }}
+    {{ encore_entry_link_tags('mod_ckeditor5') }}
+    {{ encore_entry_link_tags('chill') }}
     {% block css%}<!-- nothing added to css -->{% endblock %}
 </head>
 
 <body>
-    <header class="navigation container">
-        <div class="grid-4 hide-tablet hide-mobile parent">
-            <div class="grid-10 push-2 grid-tablet-12 grid-mobile-12 push-tablet-0 grid-mobile-0 logo-container">
-                <a href="{{ path('chill_main_homepage') }}">
-                    {{ include('@ChillMain/Layout/_header-logo.html.twig') }}
-                </a>
-            </div>
-        </div>
-        <div class="grid-8 grid-tablet-12 grid-mobile-12 text-right parent">
-            <div class="nav">
-                <ul class="navigation-menu">
-                    {% block navigation_section_menu %}
-                        {{ chill_menu('section', {
-                            'layout': '@ChillMain/Menu/section.html.twig',
-                        }) }}
-                    {% endblock %}
+    {#
+        {{ include('@ChillMain/Layout/_debug.html.twig') }}
+    #}
+    {{ include('@ChillMain/Layout/_header.html.twig') }}
 
-                    {{ chill_menu('user', {
-                        'layout': '@ChillMain/Menu/user.html.twig',
-                    }) }}
+    {% block top_banner %}{#
+        To use if you want to add a banner below the header (ie the menu)
+    #}{% endblock %}
 
-                    {% if  available_languages|length == 1 %}
-                        <li class="nav-link2 lang-selection">
-                            <div class="li-content">
-                                <a href="">{{ available_languages[0] | capitalize }}</a>
-                            </div>
-                        </li>
-                    {% else %}
-                        <li class="nav-link2 lang-selection">
-                            <div class="li-content">
-                                <a href="#" class="more">{{ app.request.locale | capitalize }}</a>
-                            </div>
-                            <ul class="submenu">
-                                {% for lang in available_languages  %}
-                                    <li {% if lang == app.request.locale %}class="active"{% endif %}>
-                                        <a href="{{ path(app.request.get('_route'), app.request.get('_route_params')|merge({'_locale' : lang})) }}">{{ lang | capitalize }}</a>
-                                    </li>
-                                {% endfor %}
-                            </ul>
-                        </li>
-                    {% endif %}
-                </ul>
-            </div>
+    <div class="content" id="content">
+        <div class="container-xxl">
 
-            {% block navigation_search_bar %}
-                <div class="navigation-search">
-                    <form action="{{ path('chill_main_search') }}" method="get">
-                        <input name="q" type="search" placeholder="{{ 'Search'|trans }}" {% if _search_pattern is defined %}value="{{ _search_pattern }}"{% endif %}/>
-                        <button type="submit" class="sc-button"><i class="fa fa-search fa-flip-horizontal"></i></button>
-                    </form>
-                </div>
-            {% endblock  %}
-        </div>
-    </header>
+        {% block sublayout_content %}
+            <div class="row justify-content-center my-5">
 
-    {% block top_banner %}{# To use if you want to add a banner below the header (ie the menu) #}{% endblock %}
-
-    <div id="content_conainter">
-        {% block sublayout_containter %}
-            <div class="container content">
-                {# Flash messages ! #}
                 {% for flashMessage in app.session.flashbag.get('success') %}
-                    <div class="grid-8 centered success flash_message">
-                        <span>
-                            {{ flashMessage|raw }}
-                        </span>
+                    <div class="col-8 mb-5 alert alert-success flash_message">
+                        <span>{{ flashMessage|raw }}</span>
                     </div>
                 {% endfor %}
 
                 {% for flashMessage in app.session.flashbag.get('error') %}
-                    <div class="grid-8 centered error flash_message">
-                        <span>
-                            {{ flashMessage|raw }}
-                        </span>
+                    <div class="col-8 mb-5 alert alert-danger flash_message">
+                        <span>{{ flashMessage|raw }}</span>
                     </div>
                 {% endfor %}
 
                 {% for flashMessage in app.session.flashbag.get('notice') %}
-                    <div class="grid-8 centered notice flash_message">
-                        <span>
-                            {{ flashMessage|raw }}
-                        </span>
+                    <div class="col-8 mb-5 alert alert-warning flash_message">
+                        <span>{{ flashMessage|raw }}</span>
                     </div>
                 {% endfor %}
 
                 {% block content %}
-                    <div class="container">
-                        <div class="grid-8 centered flash_message">
-                            <h2>{{ 'Search'|trans }}</h2>
+                <div class="col-8 main_search">
+                    <h2>{{ 'Search'|trans }}</h2>
 
-                            <form action="{{ path('chill_main_search') }}" method="get">
-                                <input name="q" type="search" placeholder="{{ 'Search persons, ...'|trans }}" />
-                                <center>
-                                    <button type="submit" class="sc-button orange"><i class="fa fa-search"></i> {{ 'Search'|trans }}</button>
-                                </center>
-                            </form>
-                        </div>
-                    </div>
+                    <form action="{{ path('chill_main_search') }}" method="get">
+                        <input class="form-control form-control-lg" name="q" type="search" placeholder="{{ 'Search persons, ...'|trans }}" />
+                        <center>
+                            <button type="submit" class="btn btn-lg btn-warning mt-3">
+                                <i class="fa fa-fw fa-search"></i> {{ 'Search'|trans }}
+                            </button>
+                        </center>
+                    </form>
+                </div>
 
-                    <div class="homepage_widget">
-                    {{  chill_widget('homepage', {} ) }}
-                    </div>
+                {{  chill_widget('homepage', {} ) }}
                 {% endblock %}
+
             </div>
         {% endblock %}
+
+        </div>
     </div>
 
     {{ include('@ChillMain/Layout/_footer.html.twig') }}
 
-    {{ encore_entry_script_tags('scratch') }}
+    {{ encore_entry_script_tags('mod_bootstrap') }}
+    {{ encore_entry_script_tags('mod_forkawesome') }}
+    {{ encore_entry_script_tags('mod_ckeditor5') }}
     {{ encore_entry_script_tags('chill') }}
-    {% if active_bootstrap == 1 %}
-      {{ encore_entry_script_tags('bootstrap') }}
-    {% endif %}
-    {% if active_forkawesome == 1 %}
-      {{ encore_entry_script_tags('forkawesome') }}
-    {% endif %}
-    {% if active_ckeditor == 1 %}
-      {{ encore_entry_script_tags('ckeditor5') }}
-    {% endif %}
+
     <script type="text/javascript">
-      window.addEventListener('DOMContentLoaded', function(e) {
-        chill.checkOtherValueOnChange();
-        $('.select2').select2({allowClear: true});
-        chill.categoryLinkParentChildSelect();
-      });
-      </script>
-      {% block js%}<!-- nothing added to js -->{% endblock %}
-  </body>
-  </html>
+        window.addEventListener('DOMContentLoaded', function(e) {
+            chill.checkOtherValueOnChange();
+            $('.select2').select2({
+                allowClear: true,
+                theme: "bootstrap"
+            });
+            chill.categoryLinkParentChildSelect();
+        });
+    </script>
+
+    {% block js%}<!-- nothing added to js -->{% endblock %}
+</body>
+</html>
diff --git a/src/Bundle/ChillMainBundle/Resources/views/layoutWithVerticalMenu.html.twig b/src/Bundle/ChillMainBundle/Resources/views/layoutWithVerticalMenu.html.twig
index 1d07ee81c..e11e5f51c 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/layoutWithVerticalMenu.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/layoutWithVerticalMenu.html.twig
@@ -1,19 +1,19 @@
 {#
- * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS, 
- <info@champs-libres.coop> / <http://www.champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    * Copyright (C) 2014-2021, Champs Libres Cooperative SCRLFS,
+    <info@champs-libres.coop> / <http://www.champs-libres.coop>
+    *
+    * This program is free software: you can redistribute it and/or modify
+    *  it under the terms of the GNU Affero General Public License as
+    * published by the Free Software Foundation, either version 3 of the
+    *  License, or (at your option) any later version.
+    *
+    * This program is distributed in the hope that it will be useful,
+    * but WITHOUT ANY WARRANTY; without even the implied warranty of
+    * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    * GNU Affero General Public License for more details.
+    *
+    * You should have received a copy of the GNU Affero General Public License
+    * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
 
 {#
@@ -23,43 +23,34 @@
 
 {% extends "@ChillMain/layout.html.twig" %}
 
-{% block sublayout_containter %}
-    <div class="container content"> 
-        <div class="grid-8 push-1 grid-mobile-9 grid-tablet-9 push-mobile-0 push-tablet-0">
-            {# Flash messages ! #}
-            <div class="container">
-                {% for flashMessage in app.session.flashbag.get('success') %}
-                    <div class="grid-8 centered success flash_message">
-                        <span>
-                            {{ flashMessage|raw }}
-                        </span>
-                    </div>
-                {% endfor %}
-                    
-                {% for flashMessage in app.session.flashbag.get('error') %}
-                    <div class="grid-8 centered error flash_message">
-                        <span>
-                            {{ flashMessage|raw }}
-                        </span>
-                    </div>
-                {% endfor %}
-                    
-                {% for flashMessage in app.session.flashbag.get('notice') %}
-                    <div class="grid-8 centered notice flash_message">
-                        <span>
-                            {{ flashMessage|raw }}
-                        </span>
-                    </div>
-                {% endfor %}    
-            </div>
+{% block sublayout_content %}
+    <div class="row">
+        <div class="col-md-9 my-5">
+
+            {% for flashMessage in app.session.flashbag.get('success') %}
+                <div class="col-8 mb-5 alert alert-success flash_message">
+                    <span>{{ flashMessage|raw }}</span>
+                </div>
+            {% endfor %}
+
+            {% for flashMessage in app.session.flashbag.get('error') %}
+                <div class="col-8 mb-5 alert alert-danger flash_message">
+                    <span>{{ flashMessage|raw }}</span>
+                </div>
+            {% endfor %}
+
+            {% for flashMessage in app.session.flashbag.get('notice') %}
+                <div class="col-8 mb-5 alert alert-warning flash_message">
+                    <span>{{ flashMessage|raw }}</span>
+                </div>
+            {% endfor %}
 
             {% block layout_wvm_content %}<!-- content of the layoutWithVerticalMenu is empty -->
             {% endblock  %}
         </div>
-
-        <div class="grid-3 float-right">
+        <div class="col-md-3">
             {% block vertical_menu_content %}<!-- vertical menu of the layoutWithVerticalMenu is empty -->
             {% endblock %}
         </div>
     </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Templating/Entity/AbstractChillEntityRender.php b/src/Bundle/ChillMainBundle/Templating/Entity/AbstractChillEntityRender.php
index d88c4b86f..c9b06a883 100644
--- a/src/Bundle/ChillMainBundle/Templating/Entity/AbstractChillEntityRender.php
+++ b/src/Bundle/ChillMainBundle/Templating/Entity/AbstractChillEntityRender.php
@@ -28,11 +28,11 @@ abstract class AbstractChillEntityRender implements ChillEntityRenderInterface
 {
     protected function getDefaultOpeningBox($classSuffix): string
     {
-        return '<span class="chill-entity chill-entity__'.$classSuffix.'">';
+        return '<section class="chill-entity entity-'.$classSuffix.'">';
     }
     
     protected function getDefaultClosingBox(): string
     {
-        return '</span>';
+        return '</section>';
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Templating/Entity/AddressRender.php b/src/Bundle/ChillMainBundle/Templating/Entity/AddressRender.php
index 90a707e40..788fd43c1 100644
--- a/src/Bundle/ChillMainBundle/Templating/Entity/AddressRender.php
+++ b/src/Bundle/ChillMainBundle/Templating/Entity/AddressRender.php
@@ -10,16 +10,20 @@ class AddressRender implements ChillEntityRenderInterface
     private EngineInterface $templating;
 
     public const DEFAULT_OPTIONS = [
-        'with_valid_from' => true,
+        'with_valid_from' => false,
+        'with_valid_to' => false,
+        'with_picto' => false,
+        'with_delimiter' => false,
         'has_no_address' => false,
         'multiline' => true,
+        'extended_infos' => false
     ];
 
     public function __construct(EngineInterface $templating)
     {
         $this->templating = $templating;
     }
-    
+
     /**
      * {@inheritDoc}
      */
@@ -56,11 +60,12 @@ class AddressRender implements ChillEntityRenderInterface
      */
     public function renderBox($addr, array $options): string
     {
-        $options = \array_merge(self::DEFAULT_OPTIONS, $options); 
+        $options = \array_merge(self::DEFAULT_OPTIONS, $options);
 
         return $this->templating
-            ->render('@ChillMain/Address/entity_render.html.twig', [
+            ->render('@ChillMain/Entity/address.html.twig', [
                 'address' => $addr,
+                'render' => $options['render'] ?? 'bloc',
                 'options' => $options
             ]);
     }
diff --git a/src/Bundle/ChillMainBundle/Test/Export/AbstractExportTest.php b/src/Bundle/ChillMainBundle/Test/Export/AbstractExportTest.php
index e480ab145..fcf82fca9 100644
--- a/src/Bundle/ChillMainBundle/Test/Export/AbstractExportTest.php
+++ b/src/Bundle/ChillMainBundle/Test/Export/AbstractExportTest.php
@@ -26,7 +26,7 @@ use Symfony\Component\HttpFoundation\Request;
 
 /**
  * This class provide a set of tests for exports.
- * 
+ *
  * The tests provided by this class will check basic things, like
  * the type of value are conform to the expected, etc.
  *
@@ -34,45 +34,45 @@ use Symfony\Component\HttpFoundation\Request;
  */
 abstract class AbstractExportTest extends WebTestCase
 {
-    
+
     use PrepareClientTrait;
 
-            
+
     /**
      * Create an instance of the report to test
-     * 
+     *
      * @return \Chill\MainBundle\Export\ExportInterface an instance of the export to test
      */
     public abstract function getExport();
-    
+
     /**
      * Create possible combinaison of data (produced by the form).
-     * 
+     *
      * This data will be used to generate data providers using this data.
-     * 
+     *
      * @return array an array of data. Example : `array( array(), array('fields' => array(1,2,3), ...)` where an empty array and `array(1,2,3)` are possible values
      */
     public abstract function getFormData();
-    
+
     /**
-     * get the possible modifiers which could apply in combination to this 
+     * get the possible modifiers which could apply in combination to this
      * export.
-     * . 
-     * 
-     * @return array of string[] an array which contains an array of possible modifiers. Example : `array( array('modifier_1', 'modifier_2'), array('modifier_1'), ...)` 
+     * .
+     *
+     * @return array of string[] an array which contains an array of possible modifiers. Example : `array( array('modifier_1', 'modifier_2'), array('modifier_1'), ...)`
      */
     abstract public function getModifiersCombination();
-    
+
     /**
      * Return an array usable as ACL
-     * 
+     *
      * If this method is overridden, the returned result must be an array
      * with this form :
-     * 
+     *
      * ```
      * array(
-     *      array( 
-     *          'center' =>  //center instance 
+     *      array(
+     *          'center' =>  //center instance
      *          'circles' => array(// array of circles instances )
      *     )
      * );
@@ -84,15 +84,15 @@ abstract class AbstractExportTest extends WebTestCase
         if (static::$kernel === null) {
             static::bootKernel();
         }
-        
+
         $em = static::$kernel->getContainer()
             ->get('doctrine.orm.entity_manager');
-            
+
         $centers = $em->getRepository('ChillMainBundle:Center')
             ->findAll();
         $circles = $em->getRepository('ChillMainBundle:Scope')
             ->findAll();
-        
+
         if (count($centers) === 0) {
             throw new \RuntimeException("No center found. Did you forget to "
                 . "run `doctrine:fixtures:load` command before ?");
@@ -101,7 +101,7 @@ abstract class AbstractExportTest extends WebTestCase
             throw new \RuntimeException("No circle found. Did you forget to "
                 . "run `doctrine:fixtures:load` command before ?");
         }
-        
+
         return array([
             'center' => $centers[0],
             'circles' => [
@@ -115,204 +115,203 @@ abstract class AbstractExportTest extends WebTestCase
     public function testGetType()
     {
         $export = $this->getExport();
-        
-        $this->assertInternalType('string', $export->getType(), 
+
+        $this->assertInternalType('string', $export->getType(),
             "Assert that the `getType` method return a string");
         $this->assertNotEmpty($export->getType(), "Assert that the `getType` method"
             . " does not return an empty string.");
     }
-    
+
     /**
      * Test that the description is not empty
      */
     public function testGetDescription()
     {
         $export = $this->getExport();
-        
-        $this->assertInternalType('string', $export->getDescription(), 
+
+        $this->assertInternalType('string', $export->getDescription(),
             "Assert that the `getDescription` method return a string");
-        $this->assertNotEmpty($export->getDescription(), 
+        $this->assertNotEmpty($export->getDescription(),
             "Assert that the `getDescription` method does not return an empty "
             . "string.");
     }
-    
+
     /**
      * create data for `ìnitiateQuery` method
      */
     public function dataProviderInitiateQuery()
     {
         $acl = $this->getAcl();
-        
+
         foreach($this->getModifiersCombination() as $modifiers) {
-            
+
             foreach($this->getFormData() as $data) {
-                
+
                 yield array($modifiers, $acl, $data);
             }
         }
     }
-    
+
     public function dataProviderGetQueryKeys()
     {
         foreach($this->getFormData() as $data) {
             yield array($data);
         }
     }
-    
+
     /**
-     * 
+     *
      * test that the query returned is a QueryBuilder or a NativeQuery.
-     * 
+     *
      * If the query is a QueryBuilder, test that select and from is not empty.
-     * 
-     * If the query is a native sql, test the query is not empty (length is 
+     *
+     * If the query is a native sql, test the query is not empty (length is
      * > 0).
-     * 
+     *
      * @dataProvider dataProviderInitiateQuery
      */
     public function testInitiateQuery($modifiers, $acl, $data)
     {
-        var_dump($data);
         $query = $this->getExport()->initiateQuery($modifiers, $acl, $data);
-        
+
         $this->assertTrue($query instanceof QueryBuilder || $query instanceof NativeQuery,
-            sprintf("Assert that the returned query is an instance of %s or %s", 
+            sprintf("Assert that the returned query is an instance of %s or %s",
                 QueryBuilder::class, Query::class));
-        
+
         if ($query instanceof QueryBuilder) {
-            
+
             $this->assertGreaterThanOrEqual(1, count($query->getDQLPart('select')),
                 "assert there is at least one 'select' part");
-            
+
             $this->assertGreaterThanOrEqual(1, count($query->getDQLPart('from')),
                 "assert there is at least one 'from' part");
-            
+
         } elseif ($query instanceof NativeQuery) {
-            $this->assertNotEmpty($query->getSQL(), 
+            $this->assertNotEmpty($query->getSQL(),
                 "check that the SQL query is not empty");
         }
     }
-    
+
     /**
      * Test that supportsModifier return :
-     * 
+     *
      * - an array of string, if the query is a QueryBuilder ;
      * - nothing, if the query is a native SQL
-     * 
+     *
      * @dataProvider dataProviderInitiateQuery
      */
     public function testSupportsModifier($modifiers, $acl, $data)
     {
         $export = $this->getExport();
         $query = $export->initiateQuery($modifiers, $acl, $data);
-        
+
         if ($query instanceof QueryBuilder) {
             $this->assertContainsOnly('string', $export->supportsModifiers(),
                 "Test that the `supportsModifiers` method returns only strings");
         } elseif ($query instanceof NativeQuery) {
-            $this->assertTrue($export->supportsModifiers() === null || 
+            $this->assertTrue($export->supportsModifiers() === null ||
                 count($export->supportsModifiers()) === 0,
                 "Test that the `supportsModifier` methods returns null or an empty array");
         }
     }
-    
+
     /**
      * Test required role is an instance of Role
      */
     public function testRequiredRole()
     {
         $role = $this->getExport()->requiredRole();
-        
-        $this->assertInstanceOf(Role::class, $role, 
+
+        $this->assertInstanceOf(Role::class, $role,
             sprintf("test that the returned value of `requiredRole` is an instance "
             . "of %s", Role::class));
     }
-    
+
     /**
      * Test the formatters type are string
      */
     public function testGetAllowedFormattersType()
     {
         $formattersTypes = $this->getExport()->getAllowedFormattersTypes();
-        
+
         $this->assertContainsOnly("string", $formattersTypes,
             "Test that the method `getAllowedFormattersTypes` returns an array of string");
     }
-    
+
     /**
      * Test that the query keys are strings
-     * 
+     *
      * @param array $data
      * @dataProvider dataProviderGetQueryKeys
      */
     public function testGetQueryKeys(array $data)
     {
         $queryKeys = $this->getExport()->getQueryKeys($data);
-        
+
         $this->assertContainsOnly("string", $queryKeys,
             "test that the query keys returned by `getQueryKeys` are only strings");
         $this->assertGreaterThanOrEqual(1, count($queryKeys),
             "test that there are at least one query key returned");
     }
-    
+
     /**
-     * 
-     * Test that 
-     * 
+     *
+     * Test that
+     *
      * - the results have a correct form (are arrays or traversable)
      * - each key in a row are present in getQueryKeys ;
      * - each returned object of the `getLabels` method is callable
      * - each result can be converted to string using this callable
      * - each of this callable can provide a string for '_header'
-     * 
+     *
      * @param string[] $modifiers
      * @param array $acl
      * @param array $data
-     * 
+     *
      * @dataProvider dataProviderInitiateQuery
      */
     public function testGetResultsAndLabels($modifiers, $acl, array $data)
     {
         // it is more convenient to  group the `getResult` and `getLabels` test
         // due to the fact that testing both methods use the same tools.
-        
+
         $queryKeys = $this->getExport()->getQueryKeys($data);
         $query     = $this->getExport()->initiateQuery($modifiers, $acl, $data);
-        
+
         // limit the result for the query for performance reason (only for QueryBuilder,
         // not possible in NativeQuery)
         if ($query instanceof QueryBuilder) {
             $query->setMaxResults(1);
-        } 
-        
+        }
+
         $results   = $this->getExport()->getResult($query, $data);
-        
-        $this->assertInternalType('array', $results, 
+
+        $this->assertInternalType('array', $results,
             "assert that the returned result is an array");
-        
+
         if (count($results) === 0) {
             $this->markTestIncomplete("The result is empty. We cannot process tests "
                 . "on results");
         }
-        
+
         // testing the result
         $result = $results[0];
-        
+
         $this->assertTrue( $result instanceof \Traversable || is_array($result),
             "test that each row in the result is traversable or an array");
-        
+
         foreach ($result as $key => $value) {
             $this->assertContains($key, $queryKeys,
                 "test that each key is present in `getQueryKeys`");
-            
+
             $closure = $this->getExport()->getLabels($key, array($value), $data);
-            
+
             $this->assertTrue(is_callable($closure, false),
                 "test that the `getLabels` for key is a callable");
             $this->assertTrue(is_string((string) call_user_func($closure, $value)),
                 sprintf("test that the callable return by `getLabels` for key %s "
                     . "is a string or an be converted to a string", $key));
-            
+
             $this->assertTrue(
                 // conditions
                 is_string((string) call_user_func($closure, '_header'))
@@ -322,13 +321,13 @@ abstract class AbstractExportTest extends WebTestCase
                 sprintf("Test that the callable return by `getLabels` for key %s "
                 . "can provide an header", $key)
                 );
-        } 
-        
+        }
+
     }
-    
+
 
     /**
-     * Test that the translated title of the export is present the list, 
+     * Test that the translated title of the export is present the list,
      * and that the list of exports (under `/fr/exports/`) is still successfull
      */
     public function testListExportPage()
@@ -338,17 +337,17 @@ abstract class AbstractExportTest extends WebTestCase
         $export = $this->getExport();
         $prophet= new \Prophecy\Prophet;
         $container = static::$kernel->getContainer();
-        
+
         // store the locale in a request
         $request = new Request();
         $request->setLocale('fr');
         $container->get('request_stack')->push($request);
         // translate the title
         $title  = $container->get('translator')->trans($export->getTitle());
-        
+
         // performs the request to /fr/exports
         $crawler = $client->request('GET', '/fr/exports/');
-        
+
         // and finally make tests
         $this->assertTrue($client->getResponse()->isSuccessful(),
             "test that the response of /fr/exports/ is successful");
diff --git a/src/Bundle/ChillMainBundle/chill.webpack.config.js b/src/Bundle/ChillMainBundle/chill.webpack.config.js
index b9038efa9..7ba42ed97 100644
--- a/src/Bundle/ChillMainBundle/chill.webpack.config.js
+++ b/src/Bundle/ChillMainBundle/chill.webpack.config.js
@@ -40,28 +40,26 @@ buildCKEditor = function(encore)
 module.exports = function(encore, entries)
 {
     // Push into "chill" entrypoint
-    entries.push(__dirname + '/Resources/public/main.js');
+    entries.push(__dirname + '/Resources/public/chill/index.js');
 
     // Aliases are used when webpack is trying to resolve modules path
     encore.addAliases({
         ChillMainAssets: __dirname + '/Resources/public',
-        ChillMainSass: __dirname + '/Resources/public/modules/scratch',
-        ShowHide: __dirname + '/Resources/public/modules/show_hide'
+        ShowHide: __dirname + '/Resources/public/lib/show_hide',
+        Tabs: __dirname + '/Resources/public/lib/tabs'
     });
 
-    // Add separate entrypoints
-    encore.addEntry('login', __dirname + '/Resources/public/modules/login_page/index.js');
-    encore.addEntry('scratch', __dirname + '/Resources/public/modules/scratch/index.js');
+    // Page entrypoints
+    encore.addEntry('page_login', __dirname + '/Resources/public/page/login/index.js');
 
-    // Chill2 new assets
-    encore.addEntry('forkawesome', __dirname + '/Resources/public/modules/forkawesome/index.js');
-    encore.addEntry('bootstrap', __dirname + '/Resources/public/modules/bootstrap/index.js');
-
-    // CKEditor5
     buildCKEditor(encore);
-    encore.addEntry('ckeditor5', __dirname + '/Resources/public/modules/ckeditor5/index.js');
 
-    // Address
-    encore.addEntry('address', __dirname + '/Resources/public/vuejs/Address/index.js');
+    // Modules entrypoints
+    encore.addEntry('mod_forkawesome', __dirname + '/Resources/public/module/forkawesome/index.js');
+    encore.addEntry('mod_bootstrap', __dirname + '/Resources/public/module/bootstrap/index.js');
+    encore.addEntry('mod_ckeditor5', __dirname + '/Resources/public/module/ckeditor5/index.js');
+
+    // Vue entrypoints
+    encore.addEntry('vue_address', __dirname + '/Resources/public/vuejs/Address/index.js');
 
 };
diff --git a/src/Bundle/ChillMainBundle/config/routes.yaml b/src/Bundle/ChillMainBundle/config/routes.yaml
index 240a44590..697ec8ec0 100644
--- a/src/Bundle/ChillMainBundle/config/routes.yaml
+++ b/src/Bundle/ChillMainBundle/config/routes.yaml
@@ -34,6 +34,10 @@ chill_password_recover:
     resource: "@ChillMainBundle/config/routes/password_recover.yaml"
     prefix: "public/{_locale}/password"
 
+chill_main_notification:
+    resource: "@ChillMainBundle/config/routes/notification.yaml"
+    prefix:   "{_locale}/notification"
+
 chill_crud:
     resource: "@ChillMainBundle"
     type: CRUD
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/modules/person_household_history/index.js b/src/Bundle/ChillMainBundle/config/routes/notification.yaml
similarity index 100%
rename from src/Bundle/ChillPersonBundle/Resources/public/modules/person_household_history/index.js
rename to src/Bundle/ChillMainBundle/config/routes/notification.yaml
diff --git a/src/Bundle/ChillMainBundle/config/services/controller.yaml b/src/Bundle/ChillMainBundle/config/services/controller.yaml
index 6021e3d72..11a9bc274 100644
--- a/src/Bundle/ChillMainBundle/config/services/controller.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/controller.yaml
@@ -33,3 +33,8 @@ services:
             $logger: '@Psr\Log\LoggerInterface'
             $validator: '@Symfony\Component\Validator\Validator\ValidatorInterface'
         tags: ['controller.service_arguments']
+
+    Chill\MainBundle\Controller\NotificationController:
+        arguments:
+            $security: '@Symfony\Component\Security\Core\Security'
+        tags: ['controller.service_arguments']
diff --git a/src/Bundle/ChillMainBundle/config/services/notification.yaml b/src/Bundle/ChillMainBundle/config/services/notification.yaml
index fa4fa15c6..c8d970c5d 100644
--- a/src/Bundle/ChillMainBundle/config/services/notification.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/notification.yaml
@@ -4,7 +4,11 @@ services:
             $logger: '@Psr\Log\LoggerInterface'
             $twig: '@Twig\Environment'
             $mailer: '@swiftmailer.mailer.default'
-          # $mailerTransporter: '@swiftmailer.transport'
+            # $mailerTransporter: '@swiftmailer.transport'
             $router: '@Symfony\Component\Routing\RouterInterface'
             $translator: '@Symfony\Component\Translation\TranslatorInterface'
             $routeParameters: '%chill_main.notifications%'
+
+    Chill\MainBundle\Notification\NotificationRenderer:
+        autoconfigure: true
+        autowire: true
diff --git a/src/Bundle/ChillMainBundle/config/services/pagination.yaml b/src/Bundle/ChillMainBundle/config/services/pagination.yaml
index f6282a39f..e85352728 100644
--- a/src/Bundle/ChillMainBundle/config/services/pagination.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/pagination.yaml
@@ -2,13 +2,15 @@ services:
     chill_main.paginator_factory:
         class: Chill\MainBundle\Pagination\PaginatorFactory
         public: true
+        autowire: true
+        autoconfigure: true
         arguments:
             - "@request_stack"
             - "@router"
             - "%chill_main.pagination.item_per_page%"
 
     Chill\MainBundle\Pagination\PaginatorFactory: '@chill_main.paginator_factory'
-            
+
     chill_main.paginator.twig_extensions:
         class: Chill\MainBundle\Pagination\ChillPaginationTwig
         tags:
diff --git a/src/Bundle/ChillMainBundle/translations/messages+intl-icu.fr.yaml b/src/Bundle/ChillMainBundle/translations/messages+intl-icu.fr.yaml
new file mode 100644
index 000000000..d5dedbb9f
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/translations/messages+intl-icu.fr.yaml
@@ -0,0 +1,6 @@
+years_old: >-
+    {age, plural, 
+        one {# an}
+        many {# ans}
+        other {# ans}
+    }
diff --git a/src/Bundle/ChillPersonBundle/Command/ChillPersonMoveCommand.php b/src/Bundle/ChillPersonBundle/Command/ChillPersonMoveCommand.php
index 4f2b2098a..b68997ed6 100644
--- a/src/Bundle/ChillPersonBundle/Command/ChillPersonMoveCommand.php
+++ b/src/Bundle/ChillPersonBundle/Command/ChillPersonMoveCommand.php
@@ -1,25 +1,7 @@
 <?php
-/*
- * Copyright (C) 2016-2019 Champs-Libres <info@champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
 
 namespace Chill\PersonBundle\Command;
 
-use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
-use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -28,39 +10,28 @@ use Doctrine\ORM\EntityManagerInterface;
 use Chill\PersonBundle\Entity\Person;
 use Symfony\Component\Console\Exception\RuntimeException;
 use Psr\Log\LoggerInterface;
+use Symfony\Component\Console\Command\Command;
 
-class ChillPersonMoveCommand extends ContainerAwareCommand
+final class ChillPersonMoveCommand extends Command
 {
-    /**
-     *
-     * @var PersonMove
-     */
-    protected $mover;
-    
-    /**
-     *
-     * @var EntityManagerInterface
-     */
-    protected $em;
-    
-    /**
-     *
-     * @var LoggerInterface
-     */
-    protected $chillLogger;
-    
+    private PersonMove $mover;
+
+    private EntityManagerInterface $em;
+
+    private LoggerInterface $chillLogger;
+
     public function __construct(
-        PersonMove $mover, 
+        PersonMove $mover,
         EntityManagerInterface $em,
         LoggerInterface $chillLogger
     ) {
         parent::__construct('chill:person:move');
-        
+
         $this->mover = $mover;
         $this->em = $em;
         $this->chillLogger = $chillLogger;
     }
-    
+
     protected function configure()
     {
         $this
@@ -73,14 +44,14 @@ class ChillPersonMoveCommand extends ContainerAwareCommand
             ->addOption('delete-entity', null, InputOption::VALUE_REQUIRED|InputOption::VALUE_IS_ARRAY, "entity to delete", [])
         ;
     }
-    
+
     protected function interact(InputInterface $input, OutputInterface $output)
     {
         if (FALSE === $input->hasOption('dump-sql') && FALSE === $input->hasOption('force')) {
             $msg = "You must use \"--dump-sql\" or \"--force\"";
             throw new RuntimeException($msg);
         }
-        
+
         foreach (["from", "to"] as $name) {
             if (empty($input->getOption($name))) {
                 throw new RuntimeException("You must set a \"$name\" option");
@@ -90,7 +61,7 @@ class ChillPersonMoveCommand extends ContainerAwareCommand
                 throw new RuntimeException("The id in \"$name\" field does not contains "
                     . "only digits: $id");
             }
-        } 
+        }
     }
 
     protected function execute(InputInterface $input, OutputInterface $output)
@@ -99,16 +70,16 @@ class ChillPersonMoveCommand extends ContainerAwareCommand
         $from = $repository->find($input->getOption('from'));
         $to   = $repository->find($input->getOption('to'));
         $deleteEntities = $input->getOption('delete-entity');
-        
+
         if ($from === NULL) {
             throw new RuntimeException(sprintf("Person \"from\" with id %d not found", $input->getOption('from')));
         }
         if ($to === NULL) {
             throw new RuntimeException(sprintf("Person \"to\" with id %d not found", $input->getOption('to')));
         }
-        
+
         $sqls = $this->mover->getSQL($from, $to, $deleteEntities);
-        
+
         if ($input->getOption('dump-sql')) {
             foreach($sqls as $sql) {
                 $output->writeln($sql);
@@ -125,25 +96,25 @@ class ChillPersonMoveCommand extends ContainerAwareCommand
                 $connection->executeQuery($sql);
             }
             $connection->commit();
-            
+
             $this->chillLogger->notice("Move a person from command line succeeded", $ctxt);
         }
     }
-    
+
     protected function buildLoggingContext(Person $from, Person $to, $deleteEntities, $sqls)
     {
         $ctxt = [
             'from' => $from->getId(),
             'to' => $to->getId()
         ];
-        
+
         foreach ($deleteEntities as $key => $de) {
             $ctxt['delete_entity_'.$key] = $de;
         }
         foreach ($sqls as $key => $sql) {
             $ctxt['sql_'.$key] = $sql;
         }
-        
+
         return $ctxt;
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php b/src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php
index d5e4c597c..35f596295 100644
--- a/src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php
+++ b/src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php
@@ -1,22 +1,5 @@
 <?php
 
-/*
- * Copyright (C) 2016 Champs-Libres <info@champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 namespace Chill\PersonBundle\Command;
 
 use Chill\MainBundle\Templating\TranslatableStringHelper;
@@ -40,65 +23,37 @@ use Symfony\Component\Console\Question\ConfirmationQuestion;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\EventDispatcher\Event;
 use Symfony\Component\Form\FormFactory;
+use Symfony\Component\Form\FormFactoryInterface;
 
-/**
- * Class ImportPeopleFromCSVCommand
- *
- * @package Chill\PersonBundle\Command
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
-class ImportPeopleFromCSVCommand extends Command
+final class ImportPeopleFromCSVCommand extends Command
 {
+    private InputInterface $input;
+
+    private OutputInterface $output;
+
+    private LoggerInterface $logger;
+
+    private TranslatableStringHelper $helper;
+
+    private EntityManagerInterface $em;
+
+    private EventDispatcherInterface $eventDispatcher;
+
     /**
-     * @var InputInterface
+     * The line currently read
      */
-    protected $input;
-    
+    private int $line;
+
     /**
-     * @var OutputInterface
+     * Where key are column names, and value the custom field slug
      */
-    protected $output;
-    
-    /**
-     * @var \Psr\Log\LoggerInterface
-     */
-    protected $logger;
-    
-    /**
-     * @var \Chill\MainBundle\Templating\TranslatableStringHelper
-     */
-    protected $helper;
-    
-    /**
-     * @var \Doctrine\Persistence\ObjectManager
-     */
-    protected $em;
-    
-    /**
-     * @var EventDispatcherInterface
-     */
-    protected $eventDispatcher;
-    
-    /**
-     * the line currently read
-     *
-     * @var int
-     */
-    protected $line;
-    
-    /**
-     * @var array where key are column names, and value the custom field slug
-     */
-    protected $customFieldMapping = array();
-    
-    /**
-     * @var CustomFieldProvider
-     */
-    protected $customFieldProvider;
-    
+    private array $customFieldMapping = [];
+
+    private CustomFieldProvider $customFieldProvider;
+
     /**
      * Contains an array of information searched in the file.
-     * 
+     *
      * position 0: the information key (which will be used in this process)
      * position 1: the helper
      * position 2: the default value
@@ -121,19 +76,16 @@ class ImportPeopleFromCSVCommand extends Command
         ['locality',        'The column header for locality',      'locality'],
         ['center',          'The column header for center',        'center']
     );
-    
+
     /**
      * Different possible format to interpret a date
      *
      * @var string
      */
     protected static $defaultDateInterpreter = "%d/%m/%Y|%e/%m/%y|%d/%m/%Y|%e/%m/%Y";
-    
-    /**
-     * @var FormFactory
-     */
-    protected $formFactory;
-    
+
+    private FormFactoryInterface $formFactory;
+
     /**
      * ImportPeopleFromCSVCommand constructor.
      *
@@ -150,7 +102,7 @@ class ImportPeopleFromCSVCommand extends Command
         EntityManagerInterface $em,
         CustomFieldProvider $customFieldProvider,
         EventDispatcherInterface $eventDispatcher,
-        FormFactory $formFactory
+        FormFactoryInterface $formFactory
     ) {
         $this->logger = $logger;
         $this->helper = $helper;
@@ -158,10 +110,10 @@ class ImportPeopleFromCSVCommand extends Command
         $this->customFieldProvider = $customFieldProvider;
         $this->eventDispatcher = $eventDispatcher;
         $this->formFactory = $formFactory;
-        
+
         parent::__construct('chill:person:import');
     }
-    
+
     /**
      *
      */
@@ -171,10 +123,10 @@ class ImportPeopleFromCSVCommand extends Command
                 ->addArgument('csv_file', InputArgument::REQUIRED, "The CSV file to import")
                 ->setDescription("Import people from a csv file")
                 ->setHelp(<<<EOF
-Import people from a csv file. The first row must contains the header column and will determines where the value will be matched. 
+Import people from a csv file. The first row must contains the header column and will determines where the value will be matched.
+
+Date format: the possible date format may be separatedby an |. The possible format will be tryed from the first to the last. The format should be explained as http://php.net/manual/en/function.strftime.php
 
-Date format: the possible date format may be separatedby an |. The possible format will be tryed from the first to the last. The format should be explained as http://php.net/manual/en/function.strftime.php                     
-                        
 php app/console chill:person:import /tmp/hepc.csv fr_FR.utf8  \
         --firstname="Prénom" --lastname="Nom" \
         --birthdate="D.N." --birthdate_format="%d/%m/%Y" \
@@ -182,11 +134,11 @@ php app/console chill:person:import /tmp/hepc.csv fr_FR.utf8  \
         --closing_date_format="%Y" --custom-field="3=code" -vvv
 EOF
             )
-                ->addArgument('locale', InputArgument::REQUIRED, 
+                ->addArgument('locale', InputArgument::REQUIRED,
                         "The locale to use in displaying translatable strings from entities")
                 ->addOption(
-                        'force-center', 
-                        null, 
+                        'force-center',
+                        null,
                         InputOption::VALUE_REQUIRED,
                         "The id of the center"
                         )
@@ -197,10 +149,10 @@ EOF
                         "Persist people in the database (default is not to persist people)"
                         )
                 ->addOption(
-                        'delimiter', 
-                        'd', 
-                        InputOption::VALUE_OPTIONAL, 
-                        "The delimiter character of the csv file", 
+                        'delimiter',
+                        'd',
+                        InputOption::VALUE_OPTIONAL,
+                        "The delimiter character of the csv file",
                         ",")
                 ->addOption(
                         'enclosure',
@@ -236,33 +188,33 @@ EOF
                         "The path of the file to load the matching between label in CSV and answers"
                         )
                 ;
-        
+
         // mapping columns
         foreach (self::$mapping as $m) {
             $this->addOptionShortcut($m[0], $m[1], $m[2]);
         }
-        
+
         // other information
         $this->addOptionShortcut('birthdate_format', 'Format preference for '
-                . 'birthdate. See help for date formats preferences.', 
+                . 'birthdate. See help for date formats preferences.',
                 self::$defaultDateInterpreter);
         $this->addOptionShortcut('opening_date_format', 'Format preference for '
                 . 'opening date. See help for date formats preferences.',
                 self::$defaultDateInterpreter);
         $this->addOptionShortcut('closing_date_format', 'Format preference for '
-                . 'closing date. See help for date formats preferences.', 
+                . 'closing date. See help for date formats preferences.',
                 self::$defaultDateInterpreter);
-        
+
         // mapping column to custom fields
-        $this->addOption('custom-field', NULL, InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY, 
+        $this->addOption('custom-field', NULL, InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY,
                 "Mapping a column to a custom fields key. Example: 1=cf_slug");
         $this->addOption('skip-interactive-field-mapping', null, InputOption::VALUE_NONE,
                 "Do not ask for interactive mapping");
     }
-    
+
     /**
      * This function is a shortcut to addOption.
-     * 
+     *
      * @param string $name
      * @param string $description
      * @param string $default
@@ -271,10 +223,10 @@ EOF
     protected function addOptionShortcut($name, $description, $default)
     {
         $this->addOption($name, null, InputOption::VALUE_OPTIONAL, $description, $default);
-        
+
         return $this;
     }
-    
+
     /**
      * @param InputInterface $input
      * @param OutputInterface $output
@@ -285,17 +237,17 @@ EOF
         $this->input = $input;
         $this->output = $output;
         $this->logger = new ConsoleLogger($output);
-        
+
         $csv = $this->openCSV();
-        
+
         // getting the first row
         if (($row = fgetcsv(
-                $csv, 
-                $input->getOption('length'), 
-                $input->getOption('delimiter'), 
-                $input->getOption('enclosure'), 
+                $csv,
+                $input->getOption('length'),
+                $input->getOption('delimiter'),
+                $input->getOption('enclosure'),
                 $input->getOption('escape'))) !== false) {
-            
+
             try {
                 $this->matchColumnToCustomField($row);
             } finally {
@@ -303,33 +255,33 @@ EOF
                 fclose($csv);
             }
         }
-        
+
         // load the matching between csv and label
         $this->loadAnswerMatching();
     }
-    
+
     /**
      * @param $row
      */
     protected function matchColumnToCustomField($row)
     {
-        
+
         $cfMappingsOptions = $this->input->getOption('custom-field');
         /* @var $em \Doctrine\Persistence\ObjectManager */
         $em = $this->em;
-        
+
         foreach($cfMappingsOptions as $cfMappingStringOption) {
             list($rowNumber, $cfSlug) = preg_split('|=|', $cfMappingStringOption);
-            
+
             // check that the column exists, getting the column name
             $column = $row[$rowNumber];
-            
+
             if (empty($column)) {
                 $message = "The column with row $rowNumber is empty.";
                 $this->logger->error($message);
                 throw new \RuntimeException($message);
             }
-            
+
             // check a custom field exists
             try {
                 $customField = $em->createQuery("SELECT cf "
@@ -357,15 +309,15 @@ EOF
                         . "Stopping this command.");
                 throw new \RuntimeException("The custom field with slug $cfSlug could not be found. "
                         . "Stopping this command.");
-            } 
-            
+            }
+
             $this->logger->notice(sprintf("Matched custom field %s (question : '%s') on column %d (displayed in the file as '%s')",
                     $customField->getSlug(), $this->helper->localize($customField->getName()), $rowNumber, $column));
-            
+
             $this->customFieldMapping[$rowNumber] = $customField;
         }
     }
-    
+
     /**
      * Load the mapping between answer in CSV and value in choices from a json file
      */
@@ -383,7 +335,7 @@ EOF
             }
         }
     }
-    
+
     /**
      *
      */
@@ -392,14 +344,14 @@ EOF
         if ($this->input->hasOption('dump-choice-matching') && !empty($this->input->getOption('dump-choice-matching'))) {
             $this->logger->debug("Dump the matching between answer and choices");
             $str = json_encode($this->cacheAnswersMapping, JSON_PRETTY_PRINT);
-            
+
             $fs = new Filesystem();
             $filename = $this->input->getOption('dump-choice-matching');
-            
+
             $fs->dumpFile($filename, $str);
         }
     }
-    
+
     /**
      * @param InputInterface $input
      * @param OutputInterface $output
@@ -410,22 +362,22 @@ EOF
     {
         $this->input = $input;
         $this->output = $output;
-        
+
         $this->logger->debug("Setting locale to ".$input->getArgument('locale'));
         setlocale(LC_TIME, $input->getArgument('locale'));
-        
+
         // opening csv as resource
         $csv = $this->openCSV();
-        
+
         $num = 0;
         $line = $this->line = 1;
-        
+
         try {
             while (($row = fgetcsv(
-                    $csv, 
-                    $input->getOption('length'), 
-                    $input->getOption('delimiter'), 
-                    $input->getOption('enclosure'), 
+                    $csv,
+                    $input->getOption('length'),
+                    $input->getOption('delimiter'),
+                    $input->getOption('enclosure'),
                     $input->getOption('escape'))) !== false) {
                 $this->logger->debug("Processing line ".$this->line);
                 if ($line === 1 ) {
@@ -434,11 +386,11 @@ EOF
                     $headers = $this->processingHeaders($row);
                 } else {
                     $person = $this->createPerson($row, $headers);
-                    
+
                     if (count($this->customFieldMapping) > 0) {
                         $this->processingCustomFields($person, $row);
                     }
-                    
+
                     $event = new Event();
                     $event->person = $person;
                     $event->rawHeaders = $rawHeaders;
@@ -449,21 +401,21 @@ EOF
                     $event->input = $this->input;
                     $event->output = $this->output;
                     $event->helperSet = $this->getHelperSet();
-                    
+
                     $this->eventDispatcher->dispatch('chill_person.person_import', $event);
-                    
-                    if ($this->input->getOption('force') === TRUE 
+
+                    if ($this->input->getOption('force') === TRUE
                         && $event->skipPerson === false) {
                         $this->em->persist($person);
                     }
-                    
+
                     $num ++;
                 }
 
                 $line ++;
                 $this->line++;
             }
-            
+
             if ($this->input->getOption('force') === true) {
                 $this->logger->debug('persisting entitites');
                 $this->em->flush();
@@ -475,9 +427,9 @@ EOF
             $this->dumpAnswerMatching();
         }
     }
-    
+
     /**
-     * 
+     *
      * @return resource
      * @throws \RuntimeException
      */
@@ -485,23 +437,23 @@ EOF
     {
         $fs = new Filesystem();
         $filename = $this->input->getArgument('csv_file');
-        
+
         if (!$fs->exists($filename)) {
             throw new \RuntimeException("The file does not exists or you do not "
                     . "have the right to read it.");
         }
-        
+
         $resource = fopen($filename, 'r');
-        
+
         if ($resource == FALSE) {
             throw new \RuntimeException("The file '$filename' could not be opened.");
         }
-        
+
         return $resource;
     }
-    
+
     /**
-     * 
+     *
      * @param type $firstRow
      * @return array where keys are column number, and value is information mapped
      */
@@ -510,11 +462,11 @@ EOF
         $availableOptions = array_map(function($m) { return $m[0]; }, self::$mapping);
         $matchedColumnHeaders = array();
         $headers = array();
-        
+
         foreach($availableOptions as $option) {
             $matchedColumnHeaders[$option] = $this->input->getOption($option);
         }
-        
+
         foreach($firstRow as $key => $content) {
             $content = trim($content);
             if (in_array($content, $matchedColumnHeaders)) {
@@ -524,11 +476,11 @@ EOF
             } else {
                 $this->logger->notice("Column with content '$content' is ignored");
             }
-        } 
-        
+        }
+
         return $headers;
     }
-    
+
     /**
      *
      * @param array $row
@@ -541,21 +493,21 @@ EOF
         // trying to get the opening date
         $openingDateString = trim($row[array_search('opening_date', $headers)]);
         $openingDate = $this->processDate($openingDateString, $this->input->getOption('opening_date_format'));
-        
+
         $person = $openingDate instanceof \DateTime ? new Person($openingDate) : new Person();
         // add the center
         $center = $this->getCenter($row, $headers);
-        
+
         if ($center === null) {
             throw new \Exception("center not found");
         }
-        
+
         $person->setCenter($center);
-        
+
         foreach($headers as $column => $info) {
-            
+
             $value = trim($row[$column]);
-            
+
             switch($info) {
                 case 'firstname':
                     $person->setFirstName($value);
@@ -582,12 +534,12 @@ EOF
                     $person->setEmail($value);
                     break;
                 case 'phonenumber':
-                    $person->setPhonenumber($value); 
+                    $person->setPhonenumber($value);
                     break;
                 case 'mobilenumber':
                     $person->setMobilenumber($value);
                     break;
-                
+
                 // we just keep the column number for those data
                 case 'postalcode':
                     $postalCodeValue = $value;
@@ -600,33 +552,33 @@ EOF
                     break;
             }
         }
-        
+
         // handle address
         if (\in_array('postalcode', $headers)) {
-            
+
             if (! empty($postalCodeValue)) {
-                
+
                 $address = new Address();
                 $postalCode = $this->guessPostalCode($postalCodeValue, $localityValue ?? '');
-                
+
                 if ($postalCode === null) {
                     throw new \Exception("The locality is not found");
                 }
-                
+
                 $address->setPostcode($postalCode);
-                
+
                 if (\in_array('street1', $headers)) {
                     $address->setStreetAddress1($street1Value);
                 }
                 $address->setValidFrom(new \DateTime('today'));
-                
+
                 $person->addAddress($address);
             }
         }
-        
+
         return $person;
     }
-    
+
     /**
      * @param $row
      * @param $headers
@@ -640,7 +592,7 @@ EOF
         } else {
             $columnCenter = \array_search('center', $headers);
             $centerName = \trim($row[$columnCenter]);
-            
+
             try {
                 return $this->em->createQuery('SELECT c FROM ChillMainBundle:Center c '
                     . 'WHERE c.name = :center_name')
@@ -654,7 +606,7 @@ EOF
             }
         }
     }
-    
+
     /**
      * @param $centerName
      * @return Center|mixed|null|object
@@ -664,68 +616,68 @@ EOF
         if (!\array_key_exists('_center_picked', $this->cacheAnswersMapping)) {
             $this->cacheAnswersMapping['_center_picked'] = [];
         }
-        
+
         if (\array_key_exists($centerName, $this->cacheAnswersMapping['_center_picked'])) {
             $id = $this->cacheAnswersMapping['_center_picked'][$centerName];
-            
+
             return $this->em->getRepository(Center::class)
                 ->find($id);
         }
-        
+
         $centers = $this->em->createQuery("SELECT c FROM ChillMainBundle:Center c "
             . "ORDER BY SIMILARITY(c.name, :center_name) DESC")
             ->setParameter('center_name', $centerName)
             ->setMaxResults(10)
             ->getResult()
             ;
-        
+
         if (count($centers) > 1) {
             if (\strtolower($centers[0]->getName()) === \strtolower($centerName)) {
                 return $centers[0];
             }
         }
-        
+
         $centersByName = [];
-        $names = \array_map(function(Center $c) use (&$centersByName) { 
+        $names = \array_map(function(Center $c) use (&$centersByName) {
             $n = $c->getName();
             $centersByName[$n] = $c;
             return $n;
-            
+
         }, $centers);
         $names[] = "none of them";
-        
+
         $helper = $this->getHelper('question');
-        $question = new ChoiceQuestion(sprintf("Which center match the name \"%s\" ? (default to \"%s\")", $centerName, $names[0]), 
+        $question = new ChoiceQuestion(sprintf("Which center match the name \"%s\" ? (default to \"%s\")", $centerName, $names[0]),
             $names,
             0);
-        
+
         $answer = $helper->ask($this->input, $this->output, $question);
-        
+
         if ($answer === 'none of them') {
             $questionCreate = new ConfirmationQuestion("Would you like to create it ?", false);
             $create = $helper->ask($this->input, $this->output, $questionCreate);
-            
+
             if ($create) {
                 $center = (new Center())
                     ->setName($centerName)
                     ;
-                
+
                 if ($this->input->getOption('force') === TRUE) {
                     $this->em->persist($center);
                     $this->em->flush();
                 }
-                
+
                 return $center;
             }
         }
-        
+
         $center = $centersByName[$answer];
-        
+
         $this->cacheAnswersMapping['_center_picked'][$centerName] = $center->getId();
-        
+
         return $center;
     }
-    
+
     /**
      * @param $postalCode
      * @param $locality
@@ -736,15 +688,15 @@ EOF
         if (!\array_key_exists('_postal_code_picked', $this->cacheAnswersMapping)) {
             $this->cacheAnswersMapping['_postal_code_picked'] = [];
         }
-        
+
         if (\array_key_exists($postalCode, $this->cacheAnswersMapping['_postal_code_picked'])) {
             if (\array_key_exists($locality, $this->cacheAnswersMapping['_postal_code_picked'][$postalCode])) {
                 $id = $this->cacheAnswersMapping['_postal_code_picked'][$postalCode][$locality];
-                
+
                 return $this->em->getRepository(PostalCode::class)->find($id);
             }
         }
-        
+
         $postalCodes = $this->em->createQuery("SELECT pc FROM ".PostalCode::class." pc "
             . "WHERE pc.code = :postal_code "
             . "ORDER BY SIMILARITY(pc.name, :locality) DESC "
@@ -754,48 +706,48 @@ EOF
             ->setParameter('locality', $locality)
             ->getResult()
             ;
-        
+
         if (count($postalCodes) >= 1) {
-            if ($postalCodes[0]->getCode() === $postalCode 
+            if ($postalCodes[0]->getCode() === $postalCode
                 && $postalCodes[0]->getName() === $locality) {
                 return $postalCodes[0];
             }
         }
-        
+
         if (count($postalCodes) === 0) {
             return null;
         }
-        
+
         $postalCodeByName = [];
         $names = \array_map(function(PostalCode $pc) use (&$postalCodeByName) {
             $n = $pc->getName();
             $postalCodeByName[$n] = $pc;
-            
+
             return $n;
         }, $postalCodes);
         $names[] = 'none of them';
-        
+
         $helper = $this->getHelper('question');
         $question = new ChoiceQuestion(sprintf("Which postal code match the "
-            . "name \"%s\" with postal code \"%s\" ? (default to \"%s\")", 
-            $locality, $postalCode, $names[0]), 
+            . "name \"%s\" with postal code \"%s\" ? (default to \"%s\")",
+            $locality, $postalCode, $names[0]),
             $names,
             0);
-        
+
         $answer = $helper->ask($this->input, $this->output, $question);
-        
+
         if ($answer === 'none of them') {
             return null;
         }
-        
+
         $pc = $postalCodeByName[$answer];
-        
-        $this->cacheAnswersMapping['_postal_code_picked'][$postalCode][$locality] = 
+
+        $this->cacheAnswersMapping['_postal_code_picked'][$postalCode][$locality] =
             $pc->getId();
-        
+
         return $pc;
     }
-    
+
     /**
      * @param Person $person
      * @param $value
@@ -804,29 +756,29 @@ EOF
     protected function processBirthdate(Person $person, $value)
     {
         if (empty($value)) { return; }
-        
+
         $date = $this->processDate($value, $this->input->getOption('birthdate_format'));
-        
+
         if ($date instanceof \DateTime) {
             // we correct birthdate if the date is in the future
             // the most common error is to set date 100 years to late (ex. 2063 instead of 1963)
             if ($date > new \DateTime('yesterday')) {
                 $date = $date->sub(new \DateInterval('P100Y'));
             }
-            
+
             $person->setBirthdate($date);
-            
+
             return;
         }
-        
+
         // if we arrive here, we could not process the date
         $this->logger->warning(sprintf(
                 "Line %d : the birthdate could not be interpreted. Was %s.",
                 $this->line,
                 $value));
-        
+
     }
-    
+
     /**
      * @param Person $person
      * @param $value
@@ -835,39 +787,39 @@ EOF
     protected function processClosingDate(Person $person, $value)
     {
         if (empty($value)) { return; }
-        
+
         // we skip if the opening date is now (or after yesterday)
         /* @var $period \Chill\PersonBundle\Entity\AccompanyingPeriod */
         $period = $person->getCurrentAccompanyingPeriod();
-        
+
         if ($period->getOpeningDate() > new \DateTime('yesterday')) {
             $this->logger->debug(sprintf("skipping a closing date because opening date is after yesterday (%s)",
                     $period->getOpeningDate()->format('Y-m-d')));
             return;
         }
-        
-        
+
+
         $date = $this->processDate($value, $this->input->getOption('closing_date_format'));
-        
+
         if ($date instanceof \DateTime) {
             // we correct birthdate if the date is in the future
             // the most common error is to set date 100 years to late (ex. 2063 instead of 1963)
             if ($date > new \DateTime('yesterday')) {
                 $date = $date->sub(new \DateInterval('P100Y'));
             }
-            
+
             $period->setClosingDate($date);
             $person->close();
             return;
         }
-        
+
         // if we arrive here, we could not process the date
         $this->logger->warning(sprintf(
                 "Line %d : the closing date could not be interpreted. Was %s.",
                 $this->line,
                 $value));
     }
-    
+
     /**
      * @param Person $person
      * @param $row
@@ -875,27 +827,27 @@ EOF
      */
     protected function processingCustomFields(Person $person, $row)
     {
-        
+
         /* @var $cfProvider \Chill\CustomFieldsBundle\Service\CustomFieldProvider */
         $cfProvider = $this->customFieldProvider;
         $cfData = array();
-        
+
         /* @var $$customField \Chill\CustomFieldsBundle\Entity\CustomField */
         foreach($this->customFieldMapping as $rowNumber => $customField) {
             $builder = $this->formFactory->createBuilder();
             $cfProvider->getCustomFieldByType($customField->getType())
                     ->buildForm($builder, $customField);
             $form = $builder->getForm();
-            
+
             // get the type of the form
             $type = get_class($form->get($customField->getSlug())
                     ->getConfig()->getType()->getInnerType());
-            $this->logger->debug(sprintf("Processing a form of type %s", 
+            $this->logger->debug(sprintf("Processing a form of type %s",
                     $type));
 
             switch ($type) {
                 case \Symfony\Component\Form\Extension\Core\Type\TextType::class:
-                    $cfData[$customField->getSlug()] = 
+                    $cfData[$customField->getSlug()] =
                         $this->processTextType($row[$rowNumber], $form, $customField);
                     break;
                 case \Symfony\Component\Form\Extension\Core\Type\ChoiceType::class:
@@ -903,12 +855,12 @@ EOF
                     $cfData[$customField->getSlug()] =
                         $this->processChoiceType($row[$rowNumber], $form, $customField);
             }
-            
+
         }
-        
+
         $person->setCFData($cfData);
     }
-    
+
     /**
      * Process a text type on a custom field
      *
@@ -917,24 +869,24 @@ EOF
      * @return type
      */
     protected function processTextType(
-            $value, 
-            \Symfony\Component\Form\FormInterface $form, 
+            $value,
+            \Symfony\Component\Form\FormInterface $form,
             \Chill\CustomFieldsBundle\Entity\CustomField $cf
             )
     {
         $form->submit(array($cf->getSlug() => $value));
-        
+
         $value = $form->getData()[$cf->getSlug()];
-        
+
         $this->logger->debug(sprintf("Found value : %s for custom field with question "
                 . "'%s'", $value, $this->helper->localize($cf->getName())));
-        
+
         return $value;
     }
-    
+
     protected $cacheAnswersMapping = array();
-    
-    
+
+
     /**
      * Process a custom field choice.
      *
@@ -949,14 +901,14 @@ EOF
      */
     protected function processChoiceType(
             $value,
-            \Symfony\Component\Form\FormInterface $form, 
+            \Symfony\Component\Form\FormInterface $form,
             \Chill\CustomFieldsBundle\Entity\CustomField $cf
             )
     {
         // getting the possible answer and their value :
         $view = $form->get($cf->getSlug())->createView();
         $answers = $this->collectChoicesAnswers($view->vars['choices']);
-        
+
         // if we do not have any answer on the question, throw an error.
         if (count($answers) === 0) {
             $message = sprintf(
@@ -964,34 +916,34 @@ EOF
                     $this->helper->localize($cf->getName()),
                     $cf->getSlug()
                     );
-            
+
             $this->logger->error($message, array(
                 'method' => __METHOD__,
                 'slug' => $cf->getSlug(),
                 'question' => $this->helper->localize($cf->getName())
             ));
-            
+
             throw new \RuntimeException($message);
         }
-        
+
         if ($view->vars['required'] === false) {
             $answers[null] = '** no answer';
         }
-        
+
         // the answer does not exists in cache. Try to find it, or asks the user
         if (!isset($this->cacheAnswersMapping[$cf->getSlug()][$value])) {
-            
+
             // try to find the answer (with array_keys and a search value
             $values = array_keys(
-                    array_map(function($label) { return trim(strtolower($label)); }, $answers), 
+                    array_map(function($label) { return trim(strtolower($label)); }, $answers),
                     trim(strtolower($value)),
                     true
                     );
-            
+
             if (count($values) === 1) {
                 // we could guess an answer !
                 $this->logger->info("This question accept multiple answers");
-                $this->cacheAnswersMapping[$cf->getSlug()][$value] = 
+                $this->cacheAnswersMapping[$cf->getSlug()][$value] =
                         $view->vars['multiple'] == false ? $values[0] : array($values[0]);
                 $this->logger->info(sprintf("Guessed that value '%s' match with key '%s' "
                         . "because the CSV and the label are equals.",
@@ -1021,20 +973,20 @@ EOF
                         array_keys($matchingTableRowAnswer)
                         );
                 $question->setErrorMessage("This choice is not possible");
-                
+
                 if ($view->vars['multiple']) {
                     $this->logger->debug("this question is multiple");
                     $question->setMultiselect(true);
                 }
-        
+
                 $selected = $this->getHelper('question')->ask($this->input, $this->output, $question);
 
-                $this->output->writeln(sprintf('You have selected "%s"', 
-                    is_array($answers[$matchingTableRowAnswer[$selected]]) ? 
+                $this->output->writeln(sprintf('You have selected "%s"',
+                    is_array($answers[$matchingTableRowAnswer[$selected]]) ?
                         implode(',', $answers[$matchingTableRowAnswer[$selected]]) :
                         $answers[$matchingTableRowAnswer[$selected]])
                     );
-                
+
                 // recording value in cache
                 $this->cacheAnswersMapping[$cf->getSlug()][$value] = $matchingTableRowAnswer[$selected];
                 $this->logger->debug(sprintf("Setting the value '%s' in cache for customfield '%s' and answer '%s'",
@@ -1045,19 +997,19 @@ EOF
                         $value));
             }
         }
-        
+
         $form->submit(array($cf->getSlug() => $this->cacheAnswersMapping[$cf->getSlug()][$value]));
         $value = $form->getData()[$cf->getSlug()];
-        
+
         $this->logger->debug(sprintf(
-                "Found value : %s for custom field with question '%s'", 
-                is_array($value) ? implode(',', $value) : $value, 
+                "Found value : %s for custom field with question '%s'",
+                is_array($value) ? implode(',', $value) : $value,
                 $this->helper->localize($cf->getName()))
                 );
-        
+
         return $value;
     }
-    
+
     /**
      * Recursive method to collect the possibles answer from a ChoiceType (or
      * its inherited types).
@@ -1069,7 +1021,7 @@ EOF
     private function collectChoicesAnswers($choices)
     {
         $answers = array();
-        
+
         /* @var $choice \Symfony\Component\Form\ChoiceList\View\ChoiceView */
         foreach($choices as $choice) {
             if ($choice instanceof \Symfony\Component\Form\ChoiceList\View\ChoiceView) {
@@ -1085,10 +1037,10 @@ EOF
                         ));
             }
         }
-        
+
         return $answers;
     }
-    
+
     /**
      * @param $value
      * @param $formats
@@ -1097,13 +1049,13 @@ EOF
     protected function processDate($value, $formats)
     {
         $possibleFormats = explode("|", $formats);
-        
+
         foreach($possibleFormats as $format) {
             $this->logger->debug("Trying format $format", array(__METHOD__));
             $dateR = strptime($value, $format);
-            
+
             if (is_array($dateR) && $dateR['unparsed'] === '') {
-                $string = sprintf("%04d-%02d-%02d %02d:%02d:%02d", 
+                $string = sprintf("%04d-%02d-%02d %02d:%02d:%02d",
                         ($dateR['tm_year']+1900),
                         ($dateR['tm_mon']+1),
                         ($dateR['tm_mday']),
@@ -1112,19 +1064,19 @@ EOF
                         ($dateR['tm_sec']));
                 $date = \DateTime::createFromFormat("Y-m-d H:i:s", $string);
                 $this->logger->debug(sprintf("Interpreting %s as date %s", $value, $date->format("Y-m-d H:i:s")));
-                
+
                 return $date;
             }
         }
-        
+
         // if we arrive here, we could not process the date
         $this->logger->debug(sprintf(
                 "Line %d : a date could not be interpreted. Was %s.",
                 $this->line,
                 $value));
-        
+
         return false;
     }
-    
-    
+
+
 }
diff --git a/src/Bundle/ChillPersonBundle/Command/ImportSocialWorkMetadata.php b/src/Bundle/ChillPersonBundle/Command/ImportSocialWorkMetadata.php
new file mode 100644
index 000000000..e42f0ef26
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Command/ImportSocialWorkMetadata.php
@@ -0,0 +1,63 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Command;
+
+use Chill\PersonBundle\Service\Import\ChillImporter;
+use Chill\PersonBundle\Service\Import\SocialWorkMetadataInterface;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+use Doctrine\ORM\EntityManagerInterface;
+use Exception;
+use League\Csv\Reader;
+use Psr\Log\LoggerInterface;
+use Symfony\Component\Console\Command\Command;
+use Throwable;
+
+final class ImportSocialWorkMetadata extends Command
+{
+    /**
+     * @var EntityManagerInterface
+     */
+    protected EntityManagerInterface $em;
+
+    /**
+     * @var LoggerInterface
+     */
+    protected ChillImporter $importer;
+
+    public function __construct(
+        SocialWorkMetadataInterface $socialWorkMetadata
+    ) {
+        parent::__construct('chill:person:import-socialwork');
+
+        $this->importer = $socialWorkMetadata;
+    }
+
+    protected function configure()
+    {
+        $this
+            ->setName('chill:person:import-socialwork')
+            ->addOption('filepath', 'f', InputOption::VALUE_REQUIRED, 'The file to import.')
+            ->addOption('language', 'l', InputOption::VALUE_OPTIONAL, 'The default language');
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $filepath = $input->getOption('filepath');
+
+        try {
+            $csv = Reader::createFromPath($filepath);
+        } catch (Throwable $e) {
+            throw new Exception('Error while loading CSV.',0, $e);
+        }
+
+        $csv->setDelimiter(';');
+
+        return true === $this->importer->import($csv) ?
+            0:
+            1;
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Controller/HouseholdController.php b/src/Bundle/ChillPersonBundle/Controller/HouseholdController.php
index 1580c5932..79391e904 100644
--- a/src/Bundle/ChillPersonBundle/Controller/HouseholdController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/HouseholdController.php
@@ -150,14 +150,19 @@ class HouseholdController extends AbstractController
      */
     public function addressEdit(Request $request, Household $household)
     {
-        // TODO ACL
-        //$address = $this->findAddressById($household, $address_id); //TODO
 
+        // TODO ACL
+
+        $address_id = $request->query->get('address_id');
+        $address = $this->getDoctrine()->getManager()
+            ->getRepository(Address::class)
+            ->find($address_id)
+            ;
 
         return $this->render('@ChillPerson/Household/address_edit.html.twig',
             [
                 'household' => $household,
-                //'address' => $address,
+                'address' => $address,
             ]
         );
     }
diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonController.php b/src/Bundle/ChillPersonBundle/Controller/PersonController.php
index 747299e59..f33e9cce8 100644
--- a/src/Bundle/ChillPersonBundle/Controller/PersonController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonController.php
@@ -252,18 +252,6 @@ final class PersonController extends AbstractController
          */
         $person = $form->getData();
 
-        $periods = $person->getAccompanyingPeriodsOrdered();
-        $period = $periods[0];
-        $period->setOpeningDate($form['creation_date']->getData());
-//        $person = new Person($form['creation_date']->getData());
-//
-//        $person->setFirstName($form['firstName']->getData())
-//                ->setLastName($form['lastName']->getData())
-//                ->setGender($form['gender']->getData())
-//                ->setBirthdate($form['birthdate']->getData())
-//                ->setCenter($form['center']->getData())
-//                ;
-
         return $person;
     }
 
@@ -364,7 +352,6 @@ final class PersonController extends AbstractController
                 'lastName' => $form['lastName']->getData(),
                 'birthdate' => $form['birthdate']->getData(),
                 'gender' => $form['gender']->getData(),
-                'creation_date' => $form['creation_date']->getData(),
                 'form' => $form->createView()));
     }
 
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodNotifications.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodNotifications.php
new file mode 100644
index 000000000..d1c6f4da7
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodNotifications.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace Chill\PersonBundle\DataFixtures\ORM;
+
+use Doctrine\Common\DataFixtures\AbstractFixture;
+use Doctrine\Common\DataFixtures\DependentFixtureInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\MainBundle\DataFixtures\ORM\LoadAbstractNotificationsTrait;
+use Chill\PersonBundle\DataFixtures\ORM\LoadAccompanyingPeriod;
+
+/**
+ * Load notififications into database
+ */
+class LoadAccompanyingPeriodNotifications extends AbstractFixture implements DependentFixtureInterface
+{
+    use LoadAbstractNotificationsTrait;
+
+    public $notifs = [
+        [
+            'message' => 'Hello !',
+            'entityClass' => AccompanyingPeriod::class,
+            'entityRef' => LoadAccompanyingPeriod::ACCOMPANYING_PERIOD,
+            'sender' => 'center a_social',
+            'addressees' => [
+                'center a_social',
+                'center a_administrative',
+                'center a_direction',
+                'multi_center'
+            ],
+        ]
+    ];
+
+    public function getDependencies()
+    {
+        return [
+            LoadAccompanyingPeriod::class,
+        ];
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php
index e8697ff28..556d832c1 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php
@@ -183,6 +183,14 @@ class LoadPeople extends AbstractFixture implements OrderedFixtureInterface, Con
     private function addAPerson(array $person, ObjectManager $manager)
     {
         $p = new Person();
+        $p->addAccompanyingPeriod(
+            new AccompanyingPeriod(
+                (new \DateTime())
+                    ->sub(
+                        new \DateInterval('P'.\random_int(0, 180).'D')
+                    )
+            )
+        );
 
         foreach ($person as $key => $value) {
             switch ($key) {
diff --git a/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php b/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
index 03b05bbc8..c9ad36319 100644
--- a/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
+++ b/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
@@ -69,11 +69,11 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
         $loader->load('services/search.yaml');
         $loader->load('services/menu.yaml');
         $loader->load('services/privacyEvent.yaml');
-        $loader->load('services/command.yaml');
         $loader->load('services/actions.yaml');
         $loader->load('services/form.yaml');
         $loader->load('services/alt_names.yaml');
         $loader->load('services/household.yaml');
+        $loader->load('services/notification.yaml');
         // We can get rid of this file when the service 'chill.person.repository.person' is no more used.
         // We should use the PersonRepository service instead of a custom service name.
         $loader->load('services/repository.yaml');
diff --git a/src/Bundle/ChillPersonBundle/Entity/Person.php b/src/Bundle/ChillPersonBundle/Entity/Person.php
index c4b36a348..695970bfa 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person.php
@@ -379,12 +379,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      */
     private Collection $householdAddresses;
 
-    /**
-     * Person constructor.
-     *
-     * @param \DateTime|null $opening
-     */
-    public function __construct(\DateTime $opening = null)
+    public function __construct()
     {
         $this->accompanyingPeriodParticipations = new ArrayCollection();
         $this->spokenLanguages = new ArrayCollection();
@@ -393,12 +388,6 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         $this->otherPhoneNumbers = new ArrayCollection();
         $this->householdParticipations = new ArrayCollection();
         $this->householdAddresses = new ArrayCollection();
-
-        if ($opening === null) {
-            $opening = new \DateTime();
-        }
-
-        $this->open(new AccompanyingPeriod($opening));
         $this->genderComment = new CommentEmbeddable();
         $this->maritalStatusComment = new CommentEmbeddable();
     }
@@ -734,9 +723,13 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this->birthdate;
     }
     
-    public function getAge(): int 
+    public function getAge(): ?int 
     {
-        return date_diff($this->birthdate, date_create('now'))->format("%y");
+        if ($this->birthdate instanceof \DateTimeInterface) {
+            return date_diff($this->birthdate, date_create('now'))->format("%y");
+        }
+
+        return null;
     }
 
     /**
diff --git a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Evaluation.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Evaluation.php
index 5a877e264..e08a6de77 100644
--- a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Evaluation.php
+++ b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Evaluation.php
@@ -23,7 +23,7 @@ class Evaluation
     private $title = [];
 
     /**
-     * @ORM\Column(type="dateinterval")
+     * @ORM\Column(type="dateinterval", nullable=true)
      */
     private $delay;
 
diff --git a/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php
index 35abe392f..506a736d8 100644
--- a/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php
+++ b/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php
@@ -47,7 +47,7 @@ class SocialAction
     private $children;
 
     /**
-     * @ORM\Column(type="dateinterval")
+     * @ORM\Column(type="dateinterval", nullable=true)
      */
     private $defaultNotificationDelay;
 
diff --git a/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php b/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php
index e3583071f..c001185ca 100644
--- a/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php
+++ b/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php
@@ -26,7 +26,7 @@ use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToStringTransformer;
 use Symfony\Component\Form\Extension\Core\Type\HiddenType;
-use Symfony\Component\Form\Extension\Core\Type\DateType;
+use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Form\Type\CenterType;
 use Chill\PersonBundle\Form\Type\GenderType;
 use Chill\MainBundle\Form\Type\DataTransformer\CenterTransformer;
@@ -80,9 +80,6 @@ final class CreationPersonType extends AbstractType
                         'property_path' => 'birthdate'
                     ))
                     ->add('gender', HiddenType::class)
-                    ->add('creation_date', HiddenType::class, array(
-                        'mapped' => false
-                    ))
                     ->add('form_status', HiddenType::class, array(
                         'mapped' => false,
                         'data' => $options['form_status']
@@ -99,25 +96,18 @@ final class CreationPersonType extends AbstractType
             
             $builder->get('birthdate')
                     ->addModelTransformer($dateToStringTransformer);
-            $builder->get('creation_date')
-                    ->addModelTransformer($dateToStringTransformer);
             $builder->get('center')
                     ->addModelTransformer($this->centerTransformer);
         } else {
             $builder
                 ->add('firstName')
                 ->add('lastName')
-                ->add('birthdate', DateType::class, array('required' => false,
-                    'widget' => 'single_text', 'format' => 'dd-MM-yyyy'))
+                ->add('birthdate', ChillDateType::class, [
+                    'required' => false,
+                ])
                 ->add('gender', GenderType::class, array(
                     'required' => true, 'placeholder' => null
                 ))
-                ->add('creation_date', DateType::class, array(
-                    'required' => true,
-                    'widget' => 'single_text',
-                    'format' => 'dd-MM-yyyy',
-                    'mapped' => false,
-                    'data' => new \DateTime()))
                 ->add('form_status', HiddenType::class, array(
                     'data' => $options['form_status'],
                     'mapped' => false
diff --git a/src/Bundle/ChillPersonBundle/Notification/AccompanyingPeriodNotificationRenderer.php b/src/Bundle/ChillPersonBundle/Notification/AccompanyingPeriodNotificationRenderer.php
new file mode 100644
index 000000000..ca76fbd5c
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Notification/AccompanyingPeriodNotificationRenderer.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Chill\PersonBundle\Notification;
+
+use Chill\MainBundle\Entity\Notification;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+
+final class AccompanyingPeriodNotificationRenderer
+{
+    public function supports(Notification $notification)
+    {
+        return $notification->getRelatedEntityClass() == AccompanyingPeriod::class;
+    }
+
+    public function getTemplate()
+    {
+        return 'ChillPersonBundle:AccompanyingPeriod:showInNotification.html.twig';
+    }
+
+    public function getTemplateData(Notification $notification)
+    {
+        return ['notification' => $notification];
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Repository/SocialWork/EvaluationRepository.php b/src/Bundle/ChillPersonBundle/Repository/SocialWork/EvaluationRepository.php
index f554e4e8c..d0f11c2d3 100644
--- a/src/Bundle/ChillPersonBundle/Repository/SocialWork/EvaluationRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/SocialWork/EvaluationRepository.php
@@ -5,8 +5,9 @@ namespace Chill\PersonBundle\Repository\SocialWork;
 use Chill\PersonBundle\Entity\SocialWork\Evaluation;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
+use Doctrine\Persistence\ObjectRepository;
 
-final class EvaluationRepository
+final class EvaluationRepository implements ObjectRepository
 {
     private EntityRepository $repository;
 
@@ -14,4 +15,40 @@ final class EvaluationRepository
     {
         $this->repository = $entityManager->getRepository(Evaluation::class);
     }
+
+    public function find($id, ?int $lockMode = null, ?int $lockVersion = null): ?Evaluation
+    {
+        return $this->repository->find($id, $lockMode, $lockVersion);
+    }
+
+    /**
+     * @return array<int, Evaluation>
+     */
+    public function findAll(): array
+    {
+        return $this->repository->findAll();
+    }
+
+    /**
+     * @return array<int, Evaluation>
+     */
+    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
+    {
+        return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
+    }
+
+    public function findOneBy(array $criteria, ?array $orderBy = null): ?Evaluation
+    {
+        return $this->repository->findOneBy($criteria, $orderBy);
+    }
+
+    /**
+     * @return class-string
+     */
+    public function getClassName(): string
+    {
+        return Evaluation::class;
+    }
+
+
 }
diff --git a/src/Bundle/ChillPersonBundle/Repository/SocialWork/GoalRepository.php b/src/Bundle/ChillPersonBundle/Repository/SocialWork/GoalRepository.php
index e6aac493f..3c96c837c 100644
--- a/src/Bundle/ChillPersonBundle/Repository/SocialWork/GoalRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/SocialWork/GoalRepository.php
@@ -18,31 +18,27 @@ final class GoalRepository implements ObjectRepository
         $this->repository = $entityManager->getRepository(Goal::class);
     }
 
-    public function find($id)
+    public function find($id, ?int $lockMode = null, ?int $lockVersion = null): ?Goal
     {
-        return $this->repository->find($id);
+        return $this->repository->find($id, $lockMode, $lockVersion);
     }
 
-    public function findAll()
+    /**
+     * @return array<int, Goal>
+     */
+    public function findAll(): array
     {
         return $this->repository->findAll();
     }
 
-    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null)
+    /**
+     * @return array<int, Goal>
+     */
+    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
 
-    public function findOneBy(array $criteria)
-    {
-        return $this->findOneBy($criteria);
-    }
-
-    public function getClassName()
-    {
-        return Goal::class;
-    }
-
     /**
      *
      * @return Goal[]
@@ -91,4 +87,16 @@ final class GoalRepository implements ObjectRepository
 
         return $qb;
     }
+    public function findOneBy(array $criteria, ?array $orderBy = null): ?Goal
+    {
+        return $this->repository->findOneBy($criteria, $orderBy);
+    }
+
+    /**
+     * @return class-string
+     */
+    public function getClassName(): string
+    {
+        return Goal::class;
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Repository/SocialWork/ResultRepository.php b/src/Bundle/ChillPersonBundle/Repository/SocialWork/ResultRepository.php
index 6dc6a887c..33bd8f7ef 100644
--- a/src/Bundle/ChillPersonBundle/Repository/SocialWork/ResultRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/SocialWork/ResultRepository.php
@@ -19,31 +19,19 @@ final class ResultRepository implements ObjectRepository
         $this->repository = $entityManager->getRepository(Result::class);
     }
 
-    public function find($id)
+    public function find($id, ?int $lockMode = null, ?int $lockVersion = null): ?Result
     {
-        return $this->repository->find($id);
+        return $this->repository->find($id, $lockMode, $lockVersion);
     }
 
-    public function findAll()
+    /**
+     * @return array<int, Result>
+     */
+    public function findAll(): array
     {
         return $this->repository->findAll();
     }
 
-    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null)
-    {
-        return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
-    }
-
-    public function findOneBy(array $criteria)
-    {
-        return $this->findOneBy($criteria);
-    }
-
-    public function getClassName()
-    {
-        return Result::class;
-    }
-
     /**
      *
      * @return Result[]
@@ -133,5 +121,25 @@ final class ResultRepository implements ObjectRepository
             ->getSingleScalarResult()
             ;
     }
-}
 
+    /**
+     * @return array<int, Result>
+     */
+    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
+    {
+        return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
+    }
+
+    public function findOneBy(array $criteria, ?array $orderBy = null): ?Result
+    {
+        return $this->repository->findOneBy($criteria, $orderBy);
+    }
+
+    /**
+     * @return class-string
+     */
+    public function getClassName(): string
+    {
+        return Result::class;
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialActionRepository.php b/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialActionRepository.php
index 3c86d2397..a81789c0a 100644
--- a/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialActionRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialActionRepository.php
@@ -5,8 +5,9 @@ namespace Chill\PersonBundle\Repository\SocialWork;
 use Chill\PersonBundle\Entity\SocialWork\SocialAction;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
+use Doctrine\Persistence\ObjectRepository;
 
-final class SocialActionRepository
+final class SocialActionRepository implements ObjectRepository
 {
     private EntityRepository $repository;
 
@@ -14,4 +15,38 @@ final class SocialActionRepository
     {
         $this->repository = $entityManager->getRepository(SocialAction::class);
     }
+
+    public function find($id, ?int $lockMode = null, ?int $lockVersion = null): ?SocialAction
+    {
+        return $this->repository->find($id, $lockMode, $lockVersion);
+    }
+
+    /**
+     * @return array<int, SocialAction>
+     */
+    public function findAll(): array
+    {
+        return $this->repository->findAll();
+    }
+
+    /**
+     * @return array<int, SocialAction>
+     */
+    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
+    {
+        return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
+    }
+
+    public function findOneBy(array $criteria, ?array $orderBy = null): ?SocialAction
+    {
+        return $this->repository->findOneBy($criteria, $orderBy);
+    }
+
+    /**
+     * @return class-string
+     */
+    public function getClassName(): string
+    {
+        return SocialAction::class;
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialIssueRepository.php b/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialIssueRepository.php
index 4dc5ecc67..b0324ba33 100644
--- a/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialIssueRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialIssueRepository.php
@@ -1,9 +1,10 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Repository\SocialWork;
 
 use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
-use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\Persistence\ObjectRepository;
@@ -17,42 +18,36 @@ final class SocialIssueRepository implements ObjectRepository
         $this->repository = $entityManager->getRepository(SocialIssue::class);
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    public function find($id)
+    public function find($id, ?int $lockMode = null, ?int $lockVersion = null): ?SocialIssue
     {
-        return $this->repository->find($id);
+        return $this->repository->find($id, $lockMode, $lockVersion);
     }
 
     /**
-     * {@inheritDoc}
+     * @return array<int, SocialIssue>
      */
-    public function findAll()
+    public function findAll(): array
     {
         return $this->repository->findAll();
     }
 
     /**
-     * {@inheritDoc}
+     * @return array<int, SocialIssue>
      */
-    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null)
+    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    public function findOneBy(array $criteria)
+    public function findOneBy(array $criteria, ?array $orderBy = null): ?SocialIssue
     {
-        return $this->findOneBy($criteria);
+        return $this->repository->findOneBy($criteria, $orderBy);
     }
 
     /**
-     * {@inheritDoc}
+     * @return class-string
      */
-    public function getClassName()
+    public function getClassName(): string
     {
         return SocialIssue::class;
     }
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/sass/chillperson.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss
similarity index 58%
rename from src/Bundle/ChillPersonBundle/Resources/public/sass/chillperson.scss
rename to src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss
index 55546c56e..dace93340 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/sass/chillperson.scss
+++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss
@@ -1,4 +1,5 @@
-@import '~ChillMainSass/custom/config/colors';
+// Access to Bootstrap variables and mixins
+@import '~ChillMainAssets/module/bootstrap/shared';
 
 /*
 *  PERSON CONTEXT
@@ -16,6 +17,11 @@ div#header-person-details {
    color: #FFF;
    padding-top: 1em;
    padding-bottom: 1em;
+   div.contact {
+      & > * {
+         margin-right: 1em;
+      }
+   }
 }
 
 div#person_details_container {
@@ -51,16 +57,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%;
@@ -104,10 +110,11 @@ div#header-accompanying_course-details {
  *  HOUSEHOLD CONTEXT
  *  Header custom for Household
  */
- 
+
 div#header-household-name {
    background: none repeat scroll 0 0 #929d69; //#b97a7a;
    color: #FFF;
+
    h1 {
      margin: 0.4em 0;
    }
@@ -130,85 +137,26 @@ div#header-household-details {
    }
 }
 
-/*
-*  ADDRESS HISTORY
-*  context person / household
-*/
-div.address-timeline.grid {
-   display: grid;
-   grid-template-rows: auto auto auto;
-   grid-template-columns: auto 120px auto;
-   
-   @media only screen and (max-width: 750px) {
-      grid-template-columns: auto 1em auto;
-   }
-   
-   div.top {
-      grid-column: 2;
-      text-align: center;
-      color: lightgrey;
-      margin-bottom: -20px;
-   }
-   div.col-a {
-      grid-column: 1;
-      text-align: right;
-   }
-   div.col-b, 
-   div.date {
-      grid-column: 2;
-      position: relative;
-      &:after {
-         position: absolute;
-         content: '';
-         top: 0; bottom: 0;
-         left: 50%;
-         margin: auto -5px;
-         width: 10px;
-         height: 100%;
-         background-color: lightgrey;
-         z-index: -5;
+div.household-members {
+   display: flex;
+   flex-direction: row;
+   flex-wrap: wrap;
+   //justify-content: flex-end;
+   span.badge-member {
+      flex-shrink: 0; flex-grow: 0; flex-basis: auto;
+      border: 1px solid #ffffff3b;
+      color: #ffffff;
+      padding: 0.4em 0.8em;
+      margin-bottom: 0.2em;
+      margin-right: 0.3em;
+      border-radius: 8px;
+      &.holder {
+         order: -1;
       }
-   }
-   div.col-c {
-      grid-column: 3;
-   }
-
-   div.col-b,
-   div.action,
-   div.content {
-      min-height: 30px;
-      padding: 1em;
-   }
-   div.content {
-      margin: 0.3em;
-      border: 1px dashed #00000045;
-      &.row1 { // current address
-         border: 1px solid #000;
-      }   
-      div.address {
-         font-variant: small-caps;
-      }
-   }   
-   div.date {
-      text-align: center;
-      background-color: lightgrey;
-      padding: 0.5em;
-      border-radius: 0.3em;
-   }
-   
-   div.span2 { grid-row: span 3; }
-   div.span3 { grid-row: span 5; }
-   div.span4 { grid-row: span 7; }
-   div.span5 { grid-row: span 9; }
-   
-   ul.record_actions {
-      margin: 0;
-   }
-   .fake {
-      &:after {
-         content: 'fake, just to test.. ';
-         color: lightgrey;
-         font-style: italic;
+      &.child {
+         order: 2;
       }
    }
 }
+
+
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/css/person.css b/src/Bundle/ChillPersonBundle/Resources/public/chill/css/person.css
similarity index 100%
rename from src/Bundle/ChillPersonBundle/Resources/public/css/person.css
rename to src/Bundle/ChillPersonBundle/Resources/public/chill/css/person.css
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/css/person.css.map b/src/Bundle/ChillPersonBundle/Resources/public/chill/css/person.css.map
similarity index 100%
rename from src/Bundle/ChillPersonBundle/Resources/public/css/person.css.map
rename to src/Bundle/ChillPersonBundle/Resources/public/chill/css/person.css.map
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/chill/index.js b/src/Bundle/ChillPersonBundle/Resources/public/chill/index.js
new file mode 100644
index 000000000..0e38c7d18
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/index.js
@@ -0,0 +1,14 @@
+//still used ?
+//require('./css/person.css');
+
+require('./chillperson.scss');
+
+require('./scss/person_with_period.scss');
+require('./scss/household_banner.scss');
+require('./scss/accompanying_period_work.scss');
+require('./scss/person_by_phonenumber.scss');
+require('./scss/render_box.scss');
+require('./scss/address_history.scss');
+
+require('./svg/phone-alt-solid.svg');
+require('./svg/mobile-alt-solid.svg');
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/modules/accompanying_course_work_list/index.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/accompanying_period_work.scss
similarity index 83%
rename from src/Bundle/ChillPersonBundle/Resources/public/modules/accompanying_course_work_list/index.scss
rename to src/Bundle/ChillPersonBundle/Resources/public/chill/scss/accompanying_period_work.scss
index 298b72cba..9c2568395 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/modules/accompanying_course_work_list/index.scss
+++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/accompanying_period_work.scss
@@ -1,5 +1,11 @@
 
-#accompanying_course_work_list {
+.chill-entity__social-action {
+  .badge-primary {
+    background-color: var(--chill-green);
+  }
+}
+
+div.accompanying_course_work-list {
 
   .item {
     margin-bottom: 1.5rem;
@@ -21,10 +27,10 @@
       display: grid;
       grid-template-areas:
         "obj res"
-        ;
+    ;
       grid-template-columns: 50%;
       column-gap: 1rem;
-      
+
       padding: 0.3rem;
 
       .obj {
@@ -42,7 +48,7 @@
     }
 
     .objective_results:nth-child(2n+2) {
-      background-color: var(--chill-llight-gray);
+      background-color: var(--bs-chill-llight-gray);
     }
   }
 
@@ -85,7 +91,7 @@ ul.timeline {
       align-items: center;
 
       padding: 0 40px;
-      border-top: 3px solid var(--chill-green);
+      border-top: 3px solid var(--bs-chill-green);
 
       &:before {
         content: '';
@@ -93,11 +99,11 @@ ul.timeline {
         position: relative;
         width: 12px;
         height: 12px;
-        
+
         background-color: white;
         border-radius: 12px;
-        border: 2px solid var(--chill-green);
-        
+        border: 2px solid var(--bs-chill-green);
+
         top: -9px;
       }
     }
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/address_history.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/address_history.scss
new file mode 100644
index 000000000..e212db4cd
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/address_history.scss
@@ -0,0 +1,88 @@
+/*
+*  ADDRESS HISTORY
+*  context person / household
+*/
+div.address-timeline.grid {
+    display: grid;
+    grid-template-rows: auto auto auto;
+    grid-template-columns: auto 120px auto;
+
+    div.household-address & {
+        // no col-a in this context !
+        grid-template-columns: 0 120px auto;
+    }
+
+    @media only screen and (max-width: 750px) {
+        grid-template-columns: auto 1em auto;
+    }
+
+    div.top {
+        grid-column: 2;
+        text-align: center;
+        color: lightgrey;
+        margin-bottom: -20px;
+    }
+    div.col-a {
+        grid-column: 1;
+        text-align: right;
+    }
+    div.col-b,
+    div.date {
+        grid-column: 2;
+        position: relative;
+        &:after {
+            position: absolute;
+            content: '';
+            top: 0; bottom: 0;
+            left: 50%;
+            margin: auto -5px;
+            width: 10px;
+            height: 100%;
+            background-color: lightgrey;
+            z-index: -5;
+        }
+    }
+    div.col-c {
+        grid-column: 3;
+    }
+
+    div.col-b,
+    div.action,
+    div.content {
+        min-height: 30px;
+        padding: 1em;
+    }
+    div.content {
+        margin: 0.3em;
+        border: 1px dashed #00000045;
+        &.row1 { // current address
+            border: 1px solid #000;
+        }
+        div.address {
+            font-variant: small-caps;
+        }
+    }
+    div.date {
+        text-align: center;
+        background-color: lightgrey;
+        padding: 0.5em;
+        border-radius: 0.3em;
+    }
+
+    div.span2 { grid-row: span 3; }
+    div.span3 { grid-row: span 5; }
+    div.span4 { grid-row: span 7; }
+    div.span5 { grid-row: span 9; }
+
+    ul.record_actions {
+        margin: 0;
+    }
+    .fake {
+        &:after {
+            content: 'fake, just to test.. ';
+            color: lightgrey;
+            font-style: italic;
+        }
+    }
+}
+
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/sass/household_banner.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/household_banner.scss
similarity index 100%
rename from src/Bundle/ChillPersonBundle/Resources/public/sass/household_banner.scss
rename to src/Bundle/ChillPersonBundle/Resources/public/chill/scss/household_banner.scss
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/sass/person_by_phonenumber.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/person_by_phonenumber.scss
similarity index 100%
rename from src/Bundle/ChillPersonBundle/Resources/public/sass/person_by_phonenumber.scss
rename to src/Bundle/ChillPersonBundle/Resources/public/chill/scss/person_by_phonenumber.scss
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/sass/person_with_period.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/person_with_period.scss
similarity index 58%
rename from src/Bundle/ChillPersonBundle/Resources/public/sass/person_with_period.scss
rename to src/Bundle/ChillPersonBundle/Resources/public/chill/scss/person_with_period.scss
index 97c23c36a..6be613ea3 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/sass/person_with_period.scss
+++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/person_with_period.scss
@@ -2,31 +2,11 @@
 div.list-with-period,
 div.list-household-members {
 
-    .chill-entity__person {
-       .chill-entity__person__first-name,
-       .chill-entity__person__last-name {
-          font-size: 1.3em;
-          font-weight: 700;
-       }
-    }
-
-    .chill_denomination {
-       font-size: 1.3em;
-       font-weight: 700;
-    }
-
-   div.person {
-      ul.record_actions {
-         li {
-            margin-right: 0 !important;
-         }
-      }
-   }
    div.comment {
       // for the comment for household-members
    }
    div.periods {
-      div.header, 
+      div.header,
       div.list-content {
          width: calc(100% - 40px);
          margin-left: 40px;
@@ -35,17 +15,17 @@ div.list-household-members {
          position: relative;
          a.sc-button {
             position: absolute;
-            width: 30px; 
+            width: 30px;
             height: 30px;
-            top: 10px; 
+            top: 10px;
             left: -40px;
             padding: 0;
             i {
                padding: 5px;
             }
          }
-         abbr.referrer { 
-            font-size: 70%; 
+         abbr.referrer {
+            font-size: 70%;
          }
          span.user {
             margin-left: 1em;
@@ -58,3 +38,6 @@ div.list-household-members {
       }
    }
 }
+
+
+
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/render_box.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/render_box.scss
new file mode 100644
index 000000000..657129644
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/render_box.scss
@@ -0,0 +1,8 @@
+section.chill-entity {
+    &.entity-person {
+        span.firstname,
+        span.lastname,
+        span.altname {}
+    }
+}
+
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/sass/mobile-alt-solid.svg b/src/Bundle/ChillPersonBundle/Resources/public/chill/svg/mobile-alt-solid.svg
similarity index 100%
rename from src/Bundle/ChillPersonBundle/Resources/public/sass/mobile-alt-solid.svg
rename to src/Bundle/ChillPersonBundle/Resources/public/chill/svg/mobile-alt-solid.svg
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/sass/phone-alt-solid.svg b/src/Bundle/ChillPersonBundle/Resources/public/chill/svg/phone-alt-solid.svg
similarity index 100%
rename from src/Bundle/ChillPersonBundle/Resources/public/sass/phone-alt-solid.svg
rename to src/Bundle/ChillPersonBundle/Resources/public/chill/svg/phone-alt-solid.svg
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/index.js b/src/Bundle/ChillPersonBundle/Resources/public/index.js
deleted file mode 100644
index 6b939ea4d..000000000
--- a/src/Bundle/ChillPersonBundle/Resources/public/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-require('./sass/chillperson.scss');
-require('./sass/person_with_period.scss');
-require('./sass/household_banner.scss');
-require('./sass/accompanying_period_work.scss');
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/modules/accompanying_course_work_list/index.js b/src/Bundle/ChillPersonBundle/Resources/public/modules/accompanying_course_work_list/index.js
deleted file mode 100644
index cbc8531c0..000000000
--- a/src/Bundle/ChillPersonBundle/Resources/public/modules/accompanying_course_work_list/index.js
+++ /dev/null
@@ -1 +0,0 @@
-require('./index.scss');
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/modules/household_edit_metadata/index.js b/src/Bundle/ChillPersonBundle/Resources/public/page/household_edit_metadata/index.js
similarity index 91%
rename from src/Bundle/ChillPersonBundle/Resources/public/modules/household_edit_metadata/index.js
rename to src/Bundle/ChillPersonBundle/Resources/public/page/household_edit_metadata/index.js
index 511ccf90f..003786c93 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/modules/household_edit_metadata/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/page/household_edit_metadata/index.js
@@ -1,4 +1,4 @@
-import { ShowHide } from 'ShowHide/show_hide.js';
+import { ShowHide } from 'ShowHide';
 
   let
     k = document.getElementById('waitingForBirthContainer'),
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/js/person.js b/src/Bundle/ChillPersonBundle/Resources/public/page/person/index.js
similarity index 96%
rename from src/Bundle/ChillPersonBundle/Resources/public/js/person.js
rename to src/Bundle/ChillPersonBundle/Resources/public/page/person/index.js
index da40dddc7..d641e3b36 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/js/person.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/page/person/index.js
@@ -1,4 +1,4 @@
-import { ShowHide } from 'ShowHide/show_hide.js';
+import { ShowHide } from 'ShowHide';
 
 const maritalStatus = document.getElementById("maritalStatus");
 const maritalStatusDate = document.getElementById("maritalStatusDate");
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/page/person_household_history/index.js b/src/Bundle/ChillPersonBundle/Resources/public/page/person_household_history/index.js
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/sass/accompanying_period_work.scss b/src/Bundle/ChillPersonBundle/Resources/public/sass/accompanying_period_work.scss
deleted file mode 100644
index dfb885e7b..000000000
--- a/src/Bundle/ChillPersonBundle/Resources/public/sass/accompanying_period_work.scss
+++ /dev/null
@@ -1,6 +0,0 @@
-
-.chill-entity__social-action {
-  .badge-primary {
-    background-color: var(--chill-green);
-  }
-}
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/sass/index.js b/src/Bundle/ChillPersonBundle/Resources/public/sass/index.js
deleted file mode 100644
index 89e749e5c..000000000
--- a/src/Bundle/ChillPersonBundle/Resources/public/sass/index.js
+++ /dev/null
@@ -1,5 +0,0 @@
-require('./phone-alt-solid.svg');
-require('./mobile-alt-solid.svg');
-require('./person_by_phonenumber.scss');
-require('./person_with_period.scss');
-
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue
index dcb541ac8..8f6a92584 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue
@@ -1,10 +1,10 @@
 <template>
    <banner></banner>
    <sticky-nav></sticky-nav>
-   
+
    <h1 v-if="accompanyingCourse.step === 'DRAFT'">{{ $t('course.title.draft') }}</h1>
    <h1 v-else>{{ $t('course.title.active') }}</h1>
-   
+
    <persons-associated></persons-associated>
    <origin-demand></origin-demand>
    <requestor></requestor>
@@ -13,7 +13,7 @@
    <resources></resources>
    <comment v-if="accompanyingCourse.step === 'DRAFT'"></comment>
    <confirm v-if="accompanyingCourse.step === 'DRAFT'"></confirm>
-   
+
 </template>
 
 <script>
@@ -31,11 +31,11 @@ import Confirm from './components/Confirm.vue';
 
 export default {
    name: 'App',
-   components: { 
+   components: {
       Banner,
       StickyNav,
       OriginDemand,
-      PersonsAssociated, 
+      PersonsAssociated,
       Requestor,
       SocialIssue,
       Referrer,
@@ -51,12 +51,9 @@ export default {
 
 <style lang="scss">
    div#accompanying-course {
-      h1 {
-         margin: 1.5em 0;
-      }
       div.vue-component {
          h2 {
-            margin-left: 0.7em;
+            margin: 1em 0.7em;
             position: relative;
             &:before {
                position: absolute;
@@ -73,12 +70,12 @@ export default {
          }
          padding: 0em 0em;
          margin: 1em 0;
-         border: 1px dotted #718596ab; 
+         border: 1px dotted #718596ab;
          border-radius: 5px;
          border-left: 1px dotted #718596ab;
          border-right: 1px dotted #718596ab;
-         dd { 
-            margin-left: 1em; 
+         dd {
+            margin-left: 1em;
          }
          & > div {
             margin: 1em 3em 0;
@@ -86,6 +83,6 @@ export default {
          table {
          }
       }
-      
+
 }
 </style>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner.vue
index 7a91e39c3..eda06b285 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner.vue
@@ -1,49 +1,34 @@
 <template>
-   
-   <div class="vue-component" style="display: none;">
-      <dl>
-         <dt>{{ $t('course.id') }}</dt>
-         <dd>{{ accompanyingCourse.id }}</dd>
-      </dl>
-      <dl v-if="accompanyingCourse.closingDate">
-         <dt>{{ $t('course.closing_date') }}</dt>
-         <dd>{{ $d(accompanyingCourse.closingDate.datetime, 'short') }}</dd>
 
-         <dt>{{ $t('course.closing_motive') }}</dt>
-         <dd v-if="accompanyingCourse.closingMotive">{{ accompanyingCourse.closingMotive.name.fr }}</dd>
-      </dl>
-   </div>
-      
    <teleport to="#header-accompanying_course-name #banner-flags">
       <toggle-flags></toggle-flags>
    </teleport>
-   
+
    <teleport to="#header-accompanying_course-name #banner-status">
-      <div v-if="accompanyingCourse.step === 'DRAFT'">
-         <span class="badge badge-secondary">
+      <span v-if="accompanyingCourse.step === 'DRAFT'" class="d-md-block">
+         <span class="badge bg-secondary">
             {{ $t('course.step.draft') }}
          </span>
-      </div>
-      <div v-else>
-         <div>
-            <span class="badge badge-primary">
+      </span>
+      <span v-else class="text-md-end">
+         <span class="d-md-block mb-md-3">
+            <span class="badge bg-primary">
                {{ $t('course.step.active') }}
             </span>
-         </div>
-         <div>
-            <span>
+         </span>
+         <span class="d-md-block">
+            <span class="d-md-block ms-3 ms-md-0">
                <i>{{ $t('course.open_at') }}{{ $d(accompanyingCourse.openingDate.datetime, 'text') }}</i>
             </span>
-            <br>
-            <span v-if="accompanyingCourse.user">
+            <span v-if="accompanyingCourse.user" class="d-md-block ms-3 ms-md-0">
                {{ $t('course.by') }}<b>{{ accompanyingCourse.user.username }}</b>
             </span>
-         </div>
-      </div>
+         </span>
+      </span>
    </teleport>
-   
+
    <teleport to="#header-accompanying_course-details #banner-social-issues">
-      <div class="grid-12">
+      <div class="col-12">
          <social-issue
             v-for="issue in accompanyingCourse.socialIssues"
             v-bind:key="issue.id"
@@ -75,11 +60,6 @@ export default {
 <style lang="scss">
    div#banner-flags,
    div#banner-status {
-      margin: 1.5em 0;
-      div {
-         text-align: right;
-         margin-bottom: 0.8em;
-      }
       .badge {
          text-transform: uppercase;
       }
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner/SocialIssue.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner/SocialIssue.vue
index 7ed78355d..3f8f3fcc9 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner/SocialIssue.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner/SocialIssue.vue
@@ -1,5 +1,5 @@
 <template>
-  <span class="badge badge-secondary">{{ issue.text }}</span>
+  <span class="badge bg-chill-light-gray text-dark">{{ issue.text }}</span>
 </template>
 
 <script>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner/ToggleFlags.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner/ToggleFlags.vue
index 801bd8d6d..ac2c2519d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner/ToggleFlags.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner/ToggleFlags.vue
@@ -1,19 +1,21 @@
 <template>
-   <div>
-      <a @click="toggleIntensity" class="flag-toggle">
-         <span :class="{ 'on': !isRegular }">{{ $t('course.occasional') }}</span>
-         <i class="fa" :class="{ 'fa-toggle-on': isRegular, 'fa-toggle-on fa-flip-horizontal': !isRegular }"></i>
-         <span :class="{ 'on': isRegular }">{{ $t('course.regular') }}</span>
-      </a>
-   </div>
-   
-   <div>
-      <button class="badge badge-pill" :class="{ 'badge-primary': isEmergency, 'badge-secondary': !isEmergency }" @click="toggleEmergency">
-         {{ $t('course.emergency') }}
-      </button>
-      <button class="badge badge-pill" :class="{ 'badge-primary': isConfidential, 'badge-secondary': !isConfidential }" @click="toggleConfidential">
-         {{ $t('course.confidential') }}
-      </button>
+   <div class="text-md-end">
+      <span class="d-block d-sm-inline-block mb-md-2">
+         <a @click="toggleIntensity" class="flag-toggle">
+            <span :class="{ 'on': !isRegular }">{{ $t('course.occasional') }}</span>
+            <i class="fa" :class="{ 'fa-toggle-on': isRegular, 'fa-toggle-on fa-flip-horizontal': !isRegular }"></i>
+            <span :class="{ 'on': isRegular }">{{ $t('course.regular') }}</span>
+         </a>
+      </span>
+
+      <span class="d-block d-sm-inline-block ms-sm-3 ms-md-0">
+         <button class="badge rounded-pill me-1" :class="{ 'bg-primary': isEmergency, 'bg-secondary': !isEmergency }" @click="toggleEmergency">
+            {{ $t('course.emergency') }}
+         </button>
+         <button class="badge rounded-pill" :class="{ 'bg-primary': isConfidential, 'bg-secondary': !isConfidential }" @click="toggleConfidential">
+            {{ $t('course.confidential') }}
+         </button>
+      </span>
    </div>
 </template>
 
@@ -66,7 +68,6 @@ export default {
 <style lang="scss" scoped>
     a.flag-toggle {
         color: white;
-        padding: 0 10px;
         cursor: pointer;
         &:hover {
             color: white;
@@ -81,8 +82,7 @@ export default {
         }
     }
     button.badge {
-       margin-left: 0.8em;
-       &.badge-secondary {
+       &.bg-secondary {
            opacity: 0.5;
            &:hover {
               opacity: 0.7;
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
index 858d6d04e..90c52ceb0 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
@@ -30,10 +30,10 @@
             
             <ul class="record_actions">
                <li>
-                  <button type="submit" class="sc-button bt-save">{{ $t('action.save') }}</button>
+                  <button type="submit" class="btn btn-save">{{ $t('action.save') }}</button>
                </li>
                <li v-if="initialComment !== null">
-                  <a class="sc-button bt-delete" 
+                  <a class="btn btn-delete" 
                      @click="removeComment">
                      {{ $t('action.delete') }}
                   </a>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue
index c2143b72a..7beb7b029 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue
@@ -7,16 +7,16 @@
    <div>
       <p>
          {{ $t('confirm.text_draft') }}
-         <span class="badge badge-secondary">{{ $t('course.step.draft') }}</span>
+         <span class="badge bg-secondary">{{ $t('course.step.draft') }}</span>
       </p>
       <p>
          {{ $t('confirm.text_active') }}
-         <span class="badge badge-primary">{{ $t('course.step.active') }}</span>
+         <span class="badge bg-primary">{{ $t('course.step.active') }}</span>
       </p>
       
       <ul class="record_actions">
          <li>
-            <button class="sc-button bt-save" @click="modal.showModal = true">
+            <button class="btn btn-save" @click="modal.showModal = true">
                {{ $t('confirm.ok') }}
             </button>
          </li>
@@ -32,7 +32,7 @@
             <p>{{ $t('confirm.sure_description') }}</p>
          </template>
          <template v-slot:footer>
-            <button class="sc-button red" @click="confirmCourse">
+            <button class="btn btn-danger" @click="confirmCourse">
                {{ $t('confirm.ok') }}
             </button>
          </template>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
index 3ab9598c9..0155d89dc 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
@@ -3,10 +3,10 @@
    <h2><a name="section-10"></a>{{ $t('persons_associated.title')}}</h2>
    
    <div>
-      <label>{{ $tc('persons_associated.counter', counter) }}</label>
+      <label class="col-form-label">{{ $tc('persons_associated.counter', counter) }}</label>
    </div>
    
-   <table class="rounded" v-if="participations.length > 0">
+   <table class="table table-bordered table-striped border-dark align-middle" v-if="participations.length > 0">
       <thead>
          <tr>
             <th class="chill-orange">{{ $t('persons_associated.name') }}</th>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/PersonItem.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/PersonItem.vue
index 7e3abd1ba..7d07c3567 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/PersonItem.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/PersonItem.vue
@@ -27,18 +27,18 @@
             </on-the-fly>
          </li>
          <!--li>
-            <button class="sc-button bt-delete"
+            <button class="btn btn-delete"
                :title="$t('action.delete')" 
                @click.prevent="$emit('remove', participation)">
             </button>
          </li-->
          <li>
             <button v-if="!participation.endDate"
-               class="sc-button bt-remove"
+               class="btn btn-remove"
                v-bind:title="$t('action.remove')" 
                @click.prevent="$emit('close', participation)">
             </button>
-            <button v-else class="sc-button bt-remove disabled"></button>
+            <button v-else class="btn btn-remove disabled"></button>
          </li>
       </ul>
    </td>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Referrer.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Referrer.vue
index aa10b76a2..1e3e9a877 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Referrer.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Referrer.vue
@@ -3,7 +3,7 @@
    <h2><a name="section-40"></a>{{ $t('referrer.title') }}</h2>
 
    <div class="my-4">
-      <label for="selectReferrer">
+      <label class="col-form-label" for="selectReferrer">
          {{ $t('referrer.label') }}
       </label>
 
@@ -22,7 +22,7 @@
       <ul class="record_actions">
          <li>
             <button 
-               class="sc-button bt-create"
+               class="btn btn-create"
                type="button"
                name="button"
                @click="assignMe">
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
index b3353457c..dd19a7043 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
@@ -6,13 +6,13 @@
    <div v-if="accompanyingCourse.requestor" class="flex-table">
       
       <label>
-         <input type="checkbox" v-model="isAnonymous" :value="value" />
+         <input type="checkbox" v-model="isAnonymous" class="me-2" /><!--  :value="value" -->
          {{ $t('requestor.is_anonymous') }}
       </label>
       
       <div class="item-bloc">
          <h4>
-            <span class="badge badge-pill badge-secondary">{{ accompanyingCourse.requestor.type }}</span>
+            <span class="badge rounded-pill bg-secondary">{{ accompanyingCourse.requestor.type }}</span>
             {{ accompanyingCourse.requestor.text }}
          </h4>   
          
@@ -58,7 +58,7 @@
       </div>
       <ul class="record_actions">
          <li>
-            <button class="sc-button bt-remove"
+            <button class="btn btn-remove"
                :title="$t('action.remove')" 
                @click="removeRequestor">
                {{ $t('action.remove') }}
@@ -112,7 +112,7 @@ export default {
       },
       isAnonymous: {
          set(value) {
-            console.log('requestorIsAnonymous value',value);
+            //console.log('requestorIsAnonymous value',value);
             this.$store.dispatch('requestorIsAnonymous', value);
          },
          get() {
@@ -122,11 +122,11 @@ export default {
    },
    methods: {
       removeRequestor() {
-         console.log('@@ CLICK remove requestor: item');
+         //console.log('@@ CLICK remove requestor: item');
          this.$store.dispatch('removeRequestor');
       },
       addNewPersons({ selected, modal }) {
-         console.log('@@@ CLICK button addNewPersons', selected);
+         //console.log('@@@ CLICK button addNewPersons', selected);
          this.$store.dispatch('addRequestor', selected.shift());
          this.$refs.addPersons.resetSearch(); // to cast child method
          modal.showModal = false;
@@ -154,7 +154,5 @@ div.flex-table {
          margin-right: 2em;
       }
    }
-   
 }
-   
 </style>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources.vue
index 596da7483..6a39a138f 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources.vue
@@ -4,10 +4,10 @@
    <h2><a name="section-50"></a>{{ $t('resources.title')}}</h2>
    
    <div>
-      <label>{{ $tc('resources.counter', counter) }}</label>
+      <label class="col-form-label">{{ $tc('resources.counter', counter) }}</label>
    </div>
    
-   <table class="rounded" v-if="resources.length > 0">
+   <table class="table table-bordered table-striped border-dark align-middle" v-if="resources.length > 0">
       <thead>
          <tr>
             <th class="chill-orange">{{ $t('resources.text') }}</th>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue
index 9b9316fec..b8c94c998 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue
@@ -2,7 +2,7 @@
 <tr>
    
    <td>
-      <span class="badge badge-pill badge-secondary" 
+      <span class="badge rounded-pill bg-secondary" 
          v-bind:title="resource.resource.id">
          <span v-if="resource.resource.type === 'person'" >{{ $t('item.type_person') }}</span>
          <span v-if="resource.resource.type === 'thirdparty'" >{{ $t('item.type_thirdparty') }}</span>
@@ -36,7 +36,7 @@
          </li>
          <li>
             <button
-               class="sc-button bt-remove"
+               class="btn btn-remove"
                v-bind:title="$t('action.remove')" 
                @click.prevent="$emit('remove', resource)">
             </button>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/SocialIssue.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/SocialIssue.vue
index 105425c46..f1d9b67b0 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/SocialIssue.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/SocialIssue.vue
@@ -75,6 +75,14 @@ export default {
 <style src="vue-multiselect/dist/vue-multiselect.css"></style>
 <style lang="scss">
    span.multiselect__tag {
-      background: var(--chill-orange);
+      background: var(--bs-chill-orange);
+   }
+   span.multiselect__option--highlight {
+      &::after {
+         background: var(--bs-chill-green);
+      }
+      &.multiselect__option--selected::after {
+         background: var(--bs-chill-red);
+      }
    }
 </style>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StickyNav.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StickyNav.vue
index 3bc1ea33a..c42571721 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StickyNav.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StickyNav.vue
@@ -1,5 +1,5 @@
 <template>
-   <teleport to="#content_conainter .container.content .container">
+   <teleport to="#content">
       <div id="navmap">
          <nav>
             <a class="top" href="#top">
@@ -27,7 +27,7 @@ export default {
    },
    data() {
       return {
-         header: document.querySelector("header.navigation.container"),
+         header: document.querySelector("header nav.navbar"),
          bannerName: document.querySelector("#header-accompanying_course-name"),
          bannerDetails: document.querySelector("#header-accompanying_course-details"),
          container: null,
@@ -53,14 +53,14 @@ export default {
       this.ready();
       window.addEventListener('scroll', this.handleScroll);
    },
-   destroyed() {
+   unmounted() {
       window.removeEventListener('scroll', this.handleScroll);
    },
    methods: {
       ready() {
 
          // load datas DOM when mounted ready
-         this.container = document.querySelector("#content_conainter .container.content .container");
+         this.container = document.querySelector("#content");
          this.stickyNav = document.querySelector('#navmap');
          this.anchors = document.querySelectorAll("h2 a[name^='section']");
          this.initItemsMap();                  
@@ -120,7 +120,7 @@ export default {
          
          if (top > this.limit) {            
             this.stickyNav.style.position = 'absolute';
-            this.stickyNav.style.left = '-60px';
+            this.stickyNav.style.left = '10px';
          } else {
             this.stickyNav.style.position = 'fixed';
             this.stickyNav.style.left = pos['x'] + 'px';
@@ -149,36 +149,41 @@ export default {
 </script>
 
 <style lang="scss">
-div#navmap {
-   position: absolute;
-   top: 30px;
-   left: -60px; //-10%;
-   nav {
-      font-size: small;
-      a {
-         display: block;
-         box-sizing: border-box;
-         margin-bottom: -3px;
-         color: #71859669;
-         &.top {
-            color: #718596;
-         }
-         span {
-            display: none;
-         }
-         &:hover, 
-         &.active {
-            span {
-               display: inline;
-               padding-left: 8px;
+div#content {
+   position: relative;
+   
+   div#navmap {
+      position: absolute;
+      top: 30px;
+      left: 10px; //-10%;
+      nav {
+         font-size: small;
+         a {
+            display: block;
+            box-sizing: border-box;
+            margin-bottom: -3px;
+            color: #71859669;
+            text-decoration: none;
+            &.top {
+               color: #718596;
+            }
+            span {
+               display: none;
+            }
+            &:hover, 
+            &.active {
+               span {
+                  display: inline;
+                  padding-left: 8px;
+               }
+            }
+            &:hover {
+               color: #718596b5;
+            }
+            &.active {
+               color: #e2793d; //orange
+               //color: #eec84a; //jaune
             }
-         }
-         &:hover {
-            color: #718596b5;
-         }
-         &.active {
-            color: #e2793d; //orange
-            //color: #eec84a; //jaune
          }
       }
    }
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Test.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Test.vue
index a72902b25..d035077f8 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Test.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Test.vue
@@ -1,16 +1,16 @@
 <template>
 <div class="vue-component">
-   <h2></a>Tests</h2>
+   <h2>Tests</h2>
    
    <!-- Modal -->
    <ul class="record_actions">
       <li>
-         <button class="sc-button bt-create" @click="modal1.showModal = true">
+         <button class="btn btn-create" @click="modal1.showModal = true">
             {{ $t('action.show_modal') }}
          </button>
       </li>
       <li>
-         <button class="sc-button bt-create" @click="modal2.showModal = true">
+         <button class="btn btn-create" @click="modal2.showModal = true">
             Ouvrir une seconde modale
          </button>
       </li>
@@ -30,7 +30,7 @@
          <p>Quisque non erat tincidunt, lacinia justo ut, pulvinar nisl. Nunc id enim ut sem pretium interdum consectetur eu quam. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Etiam posuere erat eget augue finibus luctus. Maecenas auctor, tortor non luctus ultrices, neque neque porttitor ex, nec lacinia lorem ligula et elit. Sed tempor nulla vitae lorem sollicitudin dictum. Vestibulum nec arcu eget elit pulvinar pretium. Phasellus facilisis metus sed diam luctus, feugiat scelerisque velit dignissim.</p>
       </template>
       <template v-slot:footer>
-         <button class="sc-button green" @click="modal1.showModal = false; modal2.showModal = true">
+         <button class="btn btn-create" @click="modal1.showModal = false; modal2.showModal = true">
             {{ $t('action.next')}}</button>
       </template>
    </modal>
@@ -45,7 +45,7 @@
          <p>modal 2</p>
       </template>
       <template v-slot:footer>
-         <button class="sc-button green" @click="modal2.showModal = false">
+         <button class="btn btn-create" @click="modal2.showModal = false">
             {{ $t('action.save')}}</button>
       </template>
    </modal>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/App.vue
index 96edce825..134b35353 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/App.vue
@@ -7,13 +7,13 @@
 
     <div id="picking">
       <p>{{ $t('pick_social_issue_linked_with_action') }}</p>
-        
+
       <div v-for="si in socialIssues">
         <input type="radio" v-bind:value="si.id" name="socialIssue" v-model="socialIssuePicked"> {{ si.title.fr }}
       </div>
 
       <div v-if="hasSocialIssuePicked">
-        <h2>{{ $t('pick_an_action') }}</h2> 
+        <h2>{{ $t('pick_an_action') }}</h2>
         <vue-multiselect
           v-model="socialActionPicked"
           label="text"
@@ -22,7 +22,7 @@
           :close-on-select="true"
           :show-labels="true"
           track-by="id"
-        ></vue-multiselect> 
+        ></vue-multiselect>
       </div>
 
       <div v-if="isLoadingSocialActions">
@@ -63,15 +63,15 @@
       <div>
         <ul class="record_actions">
           <li class="cancel">
-            <a href="#" class="sc-button bt-cancel">
+            <a href="#" class="btn btn-cancel">
               {{ $t('action.cancel') }}
             </a>
           </li>
           <li v-if="hasSocialActionPicked">
-            <button class="sc-button bt-save" v-show="!isPostingWork" @click="submit">
+            <button class="btn btn-save" v-show="!isPostingWork" @click="submit">
               {{ $t('action.save') }}
             </button>
-            <button class="sc-button bt-save" v-show="isPostingWork" disabled>
+            <button class="btn btn-save" v-show="isPostingWork" disabled>
               {{ $t('Save') }}
             </button>
           </li>
@@ -86,7 +86,7 @@
 
 #awc_create_form {
   display: grid;
-  grid-template-areas: 
+  grid-template-areas:
     "picking picking"
     "start_date end_date"
     "confirm confirm"
@@ -123,7 +123,7 @@
 <script>
 import { mapState, mapActions, mapGetters } from 'vuex';
 import VueMultiselect from 'vue-multiselect';
-import { dateToISO, ISOToDate } from 'ChillMainAssets/js/date.js';
+import { dateToISO, ISOToDate } from 'ChillMainAssets/chill/js/date.js';
 import Person from 'ChillPersonAssets/vuejs/_components/Person/Person.vue';
 
 const i18n = {
@@ -175,7 +175,7 @@ export default {
         return s;
       },
       set(v) {
-        console.log('persons picked', v); 
+        console.log('persons picked', v);
         this.$store.commit('setPersonsPickedIds', v);
       }
     },
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/store.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/store.js
index 5efe3a6e9..ce5e2d9c0 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/store.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/store.js
@@ -1,6 +1,6 @@
 
 import { createStore } from 'vuex';
-import { datetimeToISO } from 'ChillMainAssets/js/date.js';
+import { datetimeToISO } from 'ChillMainAssets/chill/js/date.js';
 import { findSocialActionsBySocialIssue } from 'ChillPersonAssets/vuejs/_api/SocialWorkSocialAction.js';
 import { create } from 'ChillPersonAssets/vuejs/_api/AccompanyingCourseWork.js';
 
@@ -143,7 +143,7 @@ const store = createStore({
     },
     submit({ commit, getters, state }) {
       console.log('submit');
-      let 
+      let
         payload = getters.buildPayloadCreate,
         errors = [];
 
@@ -169,7 +169,7 @@ const store = createStore({
         });
     },
   },
- 
+
 });
 
 export { store };
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
index 15c500af2..47feed87e 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
@@ -14,7 +14,7 @@
     </div>
     <div id="comment">
       <label>Commentaire</label>
-      <ckeditor 
+      <ckeditor
         :editor="editor"
         v-model="note"
         tag-name="textarea"
@@ -32,9 +32,9 @@
           {{ $t('results_without_objective') }}
         </div>
         <div>
-          <add-result :availableResults="resultsForAction" destination="action"></add-result>  
+          <add-result :availableResults="resultsForAction" destination="action"></add-result>
         </div>
-      </div> 
+      </div>
 
       <!-- results which **are** attached to an objective -->
       <div v-for="g in goalsPicked">
@@ -42,10 +42,10 @@
           <div @click="removeGoal(g)" class="objective-title">
             <i class="fa fa-times"></i>
             {{ g.goal.title.fr }}
-          </div> 
+          </div>
         </div>
         <div>
-          <add-result destination="goal" :goal="g.goal"></add-result>  
+          <add-result destination="goal" :goal="g.goal"></add-result>
         </div>
       </div>
 
@@ -57,15 +57,15 @@
             <p>Motifs, objectifs et dispositifs disponibles pour ajout&nbsp;:</p>
 
             <ul class="list-objectives">
-              <li v-for="g in availableForCheckGoal" @click="addGoal(g)" class="badge badge-primary">
+              <li v-for="g in availableForCheckGoal" @click="addGoal(g)" class="badge bg-primary">
                 <i class="fa fa-plus"></i>
-                {{ g.title.fr }} 
+                {{ g.title.fr }}
               </li>
             </ul>
           </div>
           <ul class="record_actions">
             <li>
-              <button @click="toggleAddObjective" class="sc-button bt-create">
+              <button @click="toggleAddObjective" class="btn btn-create">
                 Ajouter un objectif
               </button>
             </li>
@@ -115,7 +115,7 @@
 
         <ul class="record_actions">
           <li>
-            <button class="sc-button bt-delete" @click="removeHandlingThirdParty">
+            <button class="btn btn-delete" @click="removeHandlingThirdParty">
               Supprimer le tiers traitant
             </button>
           </li>
@@ -139,7 +139,7 @@
             <show-address :address="t.address"></show-address>
 
             <ul class="record_actions">
-              <button class="sc-button bt-delete" @click="removeThirdParty(t)"></button>
+              <button class="btn btn-delete" @click="removeThirdParty(t)"></button>
             </ul>
           </li>
         </ul>
@@ -163,14 +163,14 @@
       <p>Veuillez corriger les erreurs suivantes:</p>
       <ul>
         <li v-for="e in errors">{{ e }}</li>
-      </ul> 
+      </ul>
     </div>
   </div>
 
   <ul class="record_actions sticky-form-buttons">
     <li v-if="!isPosting">
       <button
-        class="sc-button bt-save"
+        class="btn btn-save"
         @click="submit"
       >
         {{ $t('action.save') }}
@@ -178,7 +178,7 @@
     </li>
     <li v-if="isPosting">
       <button
-        class="sc-button bt-save"
+        class="btn btn-save"
         disabled
       >
         {{ $t('action.save') }}
@@ -192,7 +192,7 @@
 
 #workEditor {
   display: grid;
-  grid-template-areas: 
+  grid-template-areas:
     "title title"
     "startDate endDate"
     "comment comment"
@@ -205,7 +205,7 @@
 
   grid-template-columns: 50%;
   column-gap: 1rem;
-  
+
   #title {
     grid-area: title;
 
@@ -330,13 +330,13 @@
 <script>
 
 import { mapState, mapGetters, } from 'vuex';
-import { dateToISO, ISOToDate, ISOToDatetime } from 'ChillMainAssets/js/date.js';
+import { dateToISO, ISOToDate, ISOToDatetime } from 'ChillMainAssets/chill/js/date.js';
 import CKEditor from '@ckeditor/ckeditor5-vue';
-import ClassicEditor from 'ChillMainAssets/modules/ckeditor5/index.js';
-import AddResult from './_components/AddResult.vue';
+import ClassicEditor from 'ChillMainAssets/module/ckeditor5/index.js';
+import AddResult from './components/AddResult.vue';
 import Person from 'ChillPersonAssets/vuejs/_components/Person/Person.vue';
 import AddPersons from 'ChillPersonAssets/vuejs/_components/AddPersons.vue';
-import ShowAddress from 'ChillMainAssets/vuejs/_components/ShowAddress.vue';
+import ShowAddress from 'ChillMainAssets/vuejs/Address/components/ShowAddress.vue';
 
 const i18n = {
   messages: {
@@ -440,7 +440,7 @@ export default {
         return s;
       },
       set(v) {
-        console.log('persons picked', v); 
+        console.log('persons picked', v);
         this.$store.commit('setPersonsPickedIds', v);
       }
     },
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/_components/AddResult.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddResult.vue
similarity index 95%
rename from src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/_components/AddResult.vue
rename to src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddResult.vue
index 2eb1e5b33..252b1d810 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/_components/AddResult.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddResult.vue
@@ -4,12 +4,12 @@
       Aucun résultat associé
     </p>
     <ul class="list-results">
-      <li v-for="r in pickedResults" @click="removeResult(r)" class="badge badge-primary">
+      <li v-for="r in pickedResults" @click="removeResult(r)" class="badge bg-primary">
         <i class="fa fa-times"></i>
         {{ r.title.fr }}
       </li>
       <template v-if="isExpanded">
-        <li v-for="r in availableForCheckResults" @click="addResult(r)" class="badge badge-primary">
+        <li v-for="r in availableForCheckResults" @click="addResult(r)" class="badge bg-primary">
           <i class="fa fa-plus"></i>
           {{ r.title.fr }}
         </li>
@@ -17,13 +17,13 @@
     </ul>
     <ul class="record_actions">
       <li v-if="isExpanded">
-        <button @click="toggleSelect" class="sc-button bt-hide" >
+        <button @click="toggleSelect" class="btn btn-hide" >
           <i class="fa fa-eye-slash"></i>
           Masquer résultats et orientations disponibles
         </button>
       </li>
       <li v-else>
-        <button @click="toggleSelect" class="sc-button bt-show">
+        <button @click="toggleSelect" class="btn btn-show">
           Afficher résultats et orientations disponibles
         </button>
       </li>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js
index 70e516153..603a2b218 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js
@@ -1,5 +1,5 @@
 import { createStore } from 'vuex';
-import { datetimeToISO, ISOToDatetime } from 'ChillMainAssets/js/date.js';
+import { datetimeToISO, ISOToDatetime } from 'ChillMainAssets/chill/js/date.js';
 import { findSocialActionsBySocialIssue } from 'ChillPersonAssets/vuejs/_api/SocialWorkSocialAction.js';
 import { create } from 'ChillPersonAssets/vuejs/_api/AccompanyingCourseWork.js';
 
@@ -42,7 +42,7 @@ const store = createStore({
     },
     resultsPickedForGoal: (state) => (goal) => {
       let found = state.goalsPicked.find(g => g.goal.id === goal.id);
-      
+
       return found === undefined ? [] : found.results;
     },
     hasHandlingThirdParty(state) {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/App.vue
index 018ccc42c..0cf3a67c8 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/App.vue
@@ -2,7 +2,8 @@
    <div class='household__address-move'>
       <div class='household__address-move__create'>
          <div>
-            <h2>{{ $t('create_a_new_address') }}</h2>
+            <h2 v-if="!edit">{{ $t('create_a_new_address') }}</h2>
+            <h2 v-else>{{ $t('edit_a_new_address') }}</h2>
             <add-address
                @addNewAddress="addNewAddress">
             </add-address>
@@ -14,30 +15,37 @@
             </show-address>
          </div>
       </div>
-      <div class='household__address-move__valid'>
+      <div v-if="!edit" class='household__address-move__valid'>
          <h2>{{ $t('move_date') }}</h2>
-         <input
-            type="date"
-            name="validFrom"
-            :placeholder="$t('validFrom')"
-            v-model="validFrom"/>
+         
+         <div class="input-group mb-3">
+            <span class="input-group-text" id="validFrom"><i class="fa fa-fw fa-calendar"></i></span>
+            <input type="date" class="form-control form-control-lg" name="validFrom"
+               v-bind:placeholder="$t('validFrom')"
+               v-model="validFrom"
+               aria-describedby="validFrom" />
+         </div>
+         
          <div v-if="errors.length > 0">
             {{ errors }}
          </div>
          <div v-if="loading">
             {{ $t('loading') }}
          </div>
-         <div v-if="success">
+         <div v-if="success && !edit">
             {{ $t('household_address_move_success') }}
          </div>
       </div>
+      <div v-if="success && edit">
+         {{ $t('household_address_edit_success') }}
+      </div>
       <div>
          <ul class="record_actions sticky-form-buttons">
             <li class="cancel">
-               <a :href=backUrl class="sc-button bt-cancel">{{ $t('back_to_the_list') }}</a>
+               <a :href="backUrl" class="btn btn-cancel">{{ $t('back_to_the_list') }}</a>
             </li>
-            <li>
-               <button type="submit" class="sc-button bt-update centered" @click="addToHousehold">
+            <li v-if="!edit">
+               <button type="submit" class="btn btn-update" @click="addToHousehold">
                   {{ $t('add_an_address_to_household') }}
                </button>
             </li>
@@ -48,8 +56,8 @@
 
 <script>
 
-import AddAddress from 'ChillMainAssets/vuejs/_components/AddAddress.vue';
-import ShowAddress from 'ChillMainAssets/vuejs/_components/ShowAddress.vue';
+import AddAddress from 'ChillMainAssets/vuejs/Address/components/AddAddress.vue';
+import ShowAddress from 'ChillMainAssets/vuejs/Address/components/ShowAddress.vue';
 
 export default {
    name: 'App',
@@ -61,6 +69,7 @@ export default {
       return {
          edit: window.mode === 'edit',
          householdId: window.householdId,
+         addressId: window.addressId,
          backUrl: `/fr/person/household/${householdId}/addresses`, //TODO better way to pass this
          validFrom: new Date().toISOString().split('T')[0]
       }
@@ -113,7 +122,14 @@ export default {
             });
          }
 
-         this.$store.dispatch('addAddress', createdAddress);
+         if (this.edit){
+            this.$store.dispatch('updateAddress', {
+               addressId: this.addressId,
+               newAddress: createdAddress
+            });
+         } else {
+            this.$store.dispatch('addAddress', createdAddress);
+         }
 
          modal.showModal = false;
       },
@@ -124,9 +140,16 @@ export default {
             body: { validFrom: {datetime: `${this.validFrom}T00:00:00+0100`}},
             backUrl: this.backUrl
          })
+      },
+      getEditAddress() {
+         this.$store.dispatch('getEditAddress', this.addressId);
       }
-   }
+   },
+   mounted() {
+      if (this.edit) {
+         this.getEditAddress();
+      }
+   },
 };
 
 </script>
-
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/js/i18n.js
index 59a67438c..f7ee56e02 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/js/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/js/i18n.js
@@ -9,6 +9,7 @@ const appMessages = {
       move_date: 'Date du déménagement',
       back_to_the_list: 'Retour à la liste',
       household_address_move_success: 'La nouvelle adresse du ménage est enregistrée',
+      household_address_edit_success: 'L\'adresse du ménage a été mise à jour',
       loading: 'chargement en cours...'
    }
 };
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/store/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/store/index.js
index 074dbf76b..9a3e4b866 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/store/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/store/index.js
@@ -1,7 +1,7 @@
 import 'es6-promise/auto';
 import { createStore } from 'vuex';
 
-import { postAddress, postPostalCode, patchAddress } from 'ChillMainAssets/vuejs/_api/AddAddress';
+import { postAddress, postPostalCode, patchAddress, getAddress } from 'ChillMainAssets/vuejs/Address/api';
 import { postAddressToHousehold } from '../api';
 
 const debug = process.env.NODE_ENV !== 'production';
@@ -10,6 +10,7 @@ const store = createStore({
    strict: debug,
    state: {
       newAddress: {},
+      editAddress: {}, //TODO or should be newAddress?
       household: {},
       validFrom: {},
       errorMsg: [],
@@ -26,6 +27,10 @@ const store = createStore({
          console.log('@M addAddress address', address);
          state.newAddress = address;
       },
+      updateAddress(state, address) {
+         console.log('@M updateAddress address', address);
+         state.newAddress = address;
+      },
       addAddressToHousehold(state, household) {
          console.log('@M addAddressToHousehold household', household);
          state.household = household;
@@ -34,6 +39,10 @@ const store = createStore({
          console.log('@M addDateToAddress address.validFrom', validFrom);
          state.validFrom = validFrom;
       },
+      getEditAddress(state, address) {
+         console.log('@M getEditAddress address', address);
+         state.editAddress = address;
+      },
       setLoading(state, b) {
          state.loading = b;
       },
@@ -101,6 +110,50 @@ const store = createStore({
                commit('setLoading', false);
             });
       },
+      updateAddress({ commit }, payload) {
+         console.log('@A updateAddress payload', payload);
+
+         if('newPostalCode' in payload.newAddress){ // TODO change the condition because it writes new postal code in edit mode now: !writeNewPostalCode
+            let postalCodeBody = payload.newAddress.newPostalCode;
+            postalCodeBody = Object.assign(postalCodeBody, {'origin': 3});
+            postPostalCode(postalCodeBody)
+               .then(postalCode => {
+                  let body = payload.newAddress;
+                  body.postcode = {'id': postalCode.id },
+                  patchAddress(payload.addressId, body)
+                     .then(address => new Promise((resolve, reject) => {
+                        commit('updateAddress', address);
+                        commit('setSuccess', true);
+                        resolve();
+                     }))
+                     .catch((error) => {
+                        commit('catchError', error);
+                     });
+               })
+
+         } else {
+            patchAddress(payload.addressId, payload.newAddress)
+               .then(address => new Promise((resolve, reject) => {
+                  commit('updateAddress', address);
+                  commit('setSuccess', true);
+                  resolve();
+               }))
+               .catch((error) => {
+                  commit('catchError', error);
+               });
+         }
+      },
+      getEditAddress({ commit }, payload) {
+         console.log('@A getEditAddress payload', payload);
+
+         getAddress(payload).then(address => new Promise((resolve, reject) => {
+            commit('getEditAddress', address);
+            resolve();
+         }))
+         .catch((error) => {
+            commit('catchError', error);
+         });
+      },
    }
 });
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Concerned.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Concerned.vue
index cacd71fd2..eb611c9c1 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Concerned.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Concerned.vue
@@ -48,10 +48,10 @@
             <p class="move_hint">{{ $t('household_members_editor.concerned.move_to') }}:</p>
 
             <template
-              v-for="position in positions" 
+              v-for="position in positions"
             >
 
-              <button 
+              <button
                 class="btn btn-outline-primary"
                 @click="moveToPosition(conc.person.id, position.id)"
               >
@@ -60,7 +60,7 @@
 
             </template>
 
-            <button v-if="conc.allowRemove" @click="removeConcerned(conc)" class="btn bt-primary">
+            <button v-if="conc.allowRemove" @click="removeConcerned(conc)" class="btn btn-primary">
               {{ $t('household_members_editor.remove_concerned') }}
             </button>
           </div>
@@ -82,7 +82,7 @@
 
 
   <div v-if="needsPositionning" class="positions">
-    <div 
+    <div
       v-for="position in positions"
     >
       <h3>{{ position.label.fr }}</h3>
@@ -128,7 +128,7 @@ import { mapGetters } from 'vuex';
 import AddPersons from 'ChillPersonAssets/vuejs/_components/AddPersons.vue';
 import Person from 'ChillPersonAssets/vuejs/_components/Person/Person.vue';
 import MemberDetails from './MemberDetails.vue';
-import { ISOToDatetime } from 'ChillMainAssets/js/date.js';
+import { ISOToDatetime } from 'ChillMainAssets/chill/js/date.js';
 
 export default {
   name: 'Concerned',
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Confirmation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Confirmation.vue
index cc09f3c0b..227ce3d21 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Confirmation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Confirmation.vue
@@ -19,7 +19,7 @@
 
   <ul class="record_actions sticky-form-buttons">
     <li>
-      <button class="sc-button bt-save" :disabled="hasWarnings" @click="confirm">
+      <button class="btn btn-save" :disabled="hasWarnings" @click="confirm">
         {{ $t('household_members_editor.confirmation.save') }}
       </button>
     </li>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
index 8109f4742..4c4929581 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
@@ -16,7 +16,7 @@
   <ul v-if="allowChangeHousehold" class="record_actions">
     <li v-if="!showHouseholdSuggestion">
       <button
-        class="sc-button"
+        class="btn btn-misc"
         @click="toggleHouseholdSuggestion"
       >
         {{ $tc('household_members_editor.show_household_suggestion', 
@@ -25,24 +25,24 @@
     </li>
     <li v-if="showHouseholdSuggestion">
       <button
-        class="sc-button"
+        class="btn btn-misc"
         @click="toggleHouseholdSuggestion"
       >
         {{ $t('household_members_editor.hide_household_suggestion') }}
       </button>
     </li>
     <li v-if="allowHouseholdCreate">
-      <button class="sc-button bt-create" @click="createHousehold">
+      <button class="btn btn-create" @click="createHousehold">
         {{ $t('household_members_editor.household.create_household') }}
       </button>
     </li>
     <li v-if="allowHouseholdSearch">
-      <button class="sc-button">
+      <button class="btn btn-misc">
         <i class="fa fa-search"></i>{{ $t('household_members_editor.household.search_household') }}
       </button>
     </li>
     <li v-if="allowLeaveWithoutHousehold" >
-      <button @click="forceLeaveWithoutHousehold" class="sc-button bt-orange">
+      <button @click="forceLeaveWithoutHousehold" class="btn btn-orange">
         <i class="fa fa-sign-out"></i>{{ $t('household_members_editor.household.leave_without_household') }}
       </button>
     </li>
@@ -60,7 +60,7 @@
 
           <ul class="record_actions">
             <li>
-              <button class="sc-button" @click="selectHousehold(h)">
+              <button class="btn btn-misc" @click="selectHousehold(h)">
                 {{ $t('household_members_editor.select_household') }}
               </button>
             </li>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/MemberDetails.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/MemberDetails.vue
index 5552b9a2c..b55b6247c 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/MemberDetails.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/MemberDetails.vue
@@ -4,7 +4,7 @@
       <div class="item-col box-person">
         <div>
           <person :person="conc.person"></person>
-          <span v-if="isHolder" class="badge badge-primary holder">
+          <span v-if="isHolder" class="badge bg-primary holder">
             {{ $t('household_members_editor.holder') }}
           </span>
         </div>
@@ -75,7 +75,7 @@ div.participation-details {
 import { mapGetters } from 'vuex';
 import Person from 'ChillPersonAssets/vuejs/_components/Person/Person.vue';
 import CKEditor from '@ckeditor/ckeditor5-vue';
-import ClassicEditor from 'ChillMainAssets/modules/ckeditor5/index.js';
+import ClassicEditor from 'ChillMainAssets/module/ckeditor5/index.js';
 
 export default {
   name: 'MemberDetails',
@@ -112,7 +112,7 @@ export default {
    },
    methods: {
     toggleHolder() {
-      this.$store.dispatch('toggleHolder', this.conc); 
+      this.$store.dispatch('toggleHolder', this.conc);
     },
     removePosition() {
       this.$store.dispatch('removePosition', this.conc);
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js
index a670685c0..15a188cf1 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js
@@ -1,6 +1,6 @@
 import { createStore } from 'vuex';
 import { householdMove, fetchHouseholdSuggestionByAccompanyingPeriod } from './../api.js';
-import { datetimeToISO } from 'ChillMainAssets/js/date.js';
+import { datetimeToISO } from 'ChillMainAssets/chill/js/date.js';
 
 const debug = process.env.NODE_ENV !== 'production';
 
@@ -72,7 +72,7 @@ const store = createStore({
       return getters.needsPositionning === false
         || (getters.persons.length > 0 && getters.concUnpositionned.length === 0);
     },
-    persons(state) { 
+    persons(state) {
       return state.concerned.map(conc => conc.person);
     },
     concUnpositionned(state) {
@@ -85,7 +85,7 @@ const store = createStore({
     },
     personByPosition: (state) => (position_id) => {
       return state.concerned
-        .filter(conc => 
+        .filter(conc =>
           conc.position !== null ? conc.position.id === position_id : false
         )
         .map(conc => conc.person)
@@ -93,7 +93,7 @@ const store = createStore({
     },
     concByPosition: (state) => (position_id) => {
       return state.concerned
-        .filter(conc => 
+        .filter(conc =>
           conc.position !== null ? conc.position.id === position_id : false
         )
       ;
@@ -117,7 +117,7 @@ const store = createStore({
       ;
 
       if (state.forceLeaveWithoutHousehold === false) {
-        payload.destination = { 
+        payload.destination = {
             id: state.household.id,
             type: state.household.type
           };
@@ -154,9 +154,9 @@ const store = createStore({
     addConcerned(state, person) {
       let persons = state.concerned.map(conc => conc.person.id);
       if (!persons.includes(person.id)) {
-        state.concerned.push({ 
+        state.concerned.push({
           person,
-          position: null, 
+          position: null,
           allowRemove: true,
           holder: false,
           comment: "",
@@ -182,7 +182,7 @@ const store = createStore({
       conc.position = null;
     },
     removeConcerned(state, conc) {
-      state.concerned = state.concerned.filter(c => 
+      state.concerned = state.concerned.filter(c =>
         c.person.id !== conc.person.id
       )
     },
@@ -309,7 +309,7 @@ const store = createStore({
               error = household;
               for (let i in error.violations) {
                 let e = error.violations[i];
-                errors.push(e.title); 
+                errors.push(e.title);
               }
 
               commit('setErrors', errors);
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
index dac29ca72..9cd31e277 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
@@ -1,7 +1,7 @@
 <template>
    <ul class="record_actions">
       <li class="add-persons">
-         <a class="sc-button bt-create" @click="openModal">
+         <a class="btn btn-create" @click="openModal">
             {{ $t(buttonTitle) }}
          </a>
       </li>
@@ -20,7 +20,7 @@
             <div class="modal-body">
                <div class="search">
                   
-                  <label style="float: right;">
+                  <label class="col-form-label" style="float: right;">
                      {{ $tc('add_persons.suggested_counter', suggestedCounter) }}
                   </label>
 
@@ -53,7 +53,6 @@
          </template>
 
          <template v-slot:body>
-            <!--span class="discret">Selection: {{ selected }}</span-->
             <div class="results">
 
                <person-suggestion
@@ -77,9 +76,9 @@
          </template>
 
          <template v-slot:footer>
-            <button class="sc-button green" 
+            <button class="btn btn-create" 
                @click.prevent="$emit('addNewPersons', { selected, modal })">
-               <i class="fa fa-plus fa-fw"></i>{{ $t('action.add')}}
+               {{ $t('action.add')}}
             </button>
          </template>
 
@@ -155,9 +154,9 @@ export default {
          ])];
          return uniqBy(union, k => k.key);
       },
-      options() {
-         return this.options;
-      },
+      //options() {
+      //   return this.options;
+      //},
       checkUniq() {
          if (this.options.uniq === true) {
             return 'radio';
@@ -232,8 +231,9 @@ export default {
          div.search {
             position: relative;
             input { 
+               width: 100%;
                padding: 1.2em 1.5em 1.2em 2.5em;
-               margin: 1em 0;
+               //margin: 1em 0;
             }
             i {
                position: absolute;
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/PersonSuggestion.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/PersonSuggestion.vue
index c6494e461..931830fd3 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/PersonSuggestion.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/PersonSuggestion.vue
@@ -1,7 +1,7 @@
 <template>
    <div class="list-item" :class="{ checked: isChecked }">
          
-         <div class="container">
+         <div>
             <input 
                v-bind:type="type" 
                v-model="selected"
@@ -90,7 +90,8 @@ export default {
                margin-left: 0.5em;
                align-self: baseline;
             }
-            a.sc-button {
+            
+            a.btn {
                border: 1px solid lightgrey;
                font-size: 70%;
                padding: 4px;
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypePerson.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypePerson.vue
index daaa81617..1daa5d100 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypePerson.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypePerson.vue
@@ -15,7 +15,7 @@
    </div>
    <div class="right_actions">
       
-      <span class="badge badge-pill badge-secondary" :title="item.key">
+      <span class="badge rounded-pill bg-secondary" :title="item.key">
          {{ $t('item.type_person') }}
       </span>
       <on-the-fly
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeThirdParty.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeThirdParty.vue
index 5a4aa9de6..f2f0e42c6 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeThirdParty.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeThirdParty.vue
@@ -12,7 +12,7 @@
    </div>
    <div class="right_actions">
       
-      <span class="badge badge-pill badge-secondary" :title="item.key">
+      <span class="badge rounded-pill bg-secondary" :title="item.key">
          {{ $t('item.type_thirdparty') }}
       </span>
       <on-the-fly
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Household/Household.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Household/Household.vue
index def7e6971..e683daed4 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Household/Household.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Household/Household.vue
@@ -16,7 +16,7 @@
       <template v-for="(m, index) in currentMembers()" :key="m.id">
         <person :person="m.person"></person>
         <span v-if="m.holder">
-          &nbsp;<span class="badge badge-primary">{{ $t('holder') }}</span>
+          &nbsp;<span class="badge bg-primary">{{ $t('holder') }}</span>
         </span>
         <span v-if="index != (currentMembersLength() - 1)">, </span>
       </template>
@@ -76,7 +76,7 @@
 <script>
 
 import Person from 'ChillPersonAssets/vuejs/_components/Person/Person.vue';
-import ShowAddress from 'ChillMainAssets/vuejs/_components/ShowAddress.vue';
+import ShowAddress from 'ChillMainAssets/vuejs/Address/components/ShowAddress.vue';
 
 const i18n = {
   "messages":
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
index a3cf339e2..27d6b48a8 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
@@ -54,30 +54,55 @@
 </div>
 <div v-else-if="action === 'edit' || action === 'create'">
    
-   <input v-model="firstName" :placeholder="$t('person.firstname')" />
-   <input v-model="lastName" :placeholder="$t('person.lastname')" />
+   <div class="form-floating mb-3">
+      <input class="form-control form-control-lg" id="firstname" v-model="firstName" v-bind:placeholder="$t('person.firstname')" />
+      <label for="firstname">{{ $t('person.firstname') }}</label>
+   </div>
+   
+   <div class="form-floating mb-3">
+      <input class="form-control form-control-lg" id="lastname" v-model="lastName" v-bind:placeholder="$t('person.lastname')" />
+      <label for="lastname">{{ $t('person.lastname') }}</label>
+   </div>
    
    <!--  TODO fix placeholder if undefined 
-         TODO dynamically get gender options
    -->
-   <select v-model="gender">
-      <option disabled value="">{{ $t('person.gender.placeholder') }}</option> 
-      <option value="woman">{{ $t('person.gender.woman') }}</option>
-      <option value="man">{{ $t('person.gender.man') }}</option>
-      <option value="neuter">{{ $t('person.gender.neuter') }}</option>  
-   </select>
+   <div class="form-floating mb-3">
+      <select class="form-select form-select-lg" id="gender" v-model="gender">
+         <option selected disabled >{{ $t('person.gender.placeholder') }}</option> 
+         <option value="woman">{{ $t('person.gender.woman') }}</option>
+         <option value="man">{{ $t('person.gender.man') }}</option>
+         <option value="neuter">{{ $t('person.gender.neuter') }}</option>  
+      </select>
+      <label for="gender">{{ $t('person.gender.title') }}</label>
+   </div>
    
-   <i class="fa fa-birthday-cake"></i>
-   <input type="date"
-      id="chill_personbundle_person_birthdate" 
-      name="chill_personbundle_person[birthdate]" 
-      v-model="birthDate"
-   />
+   <div class="input-group mb-3">
+      <span class="input-group-text" id="birthdate"><i class="fa fa-fw fa-birthday-cake"></i></span>
+      <input type="date" 
+         class="form-control form-control-lg" 
+         id="chill_personbundle_person_birthdate" 
+         name="chill_personbundle_person[birthdate]" 
+         v-model="birthDate"
+         aria-describedby="birthdate" />
+   </div>
    
-   <i class="fa fa-phone">
-   </i><input v-model="phonenumber" :placeholder="$t('person.phonenumber')" />
-   <i class="fa fa-mobile">
-   </i><input v-model="mobilenumber" :placeholder="$t('person.mobilenumber')" />
+   <div class="input-group mb-3">
+      <span class="input-group-text" id="phonenumber"><i class="fa fa-fw fa-phone"></i></span>
+      <input class="form-control form-control-lg" 
+         v-model="phonenumber" 
+         v-bind:placeholder="$t('person.phonenumber')" 
+         v-bind:aria-label="$t('person.phonenumber')" 
+         aria-describedby="phonenumber" />
+   </div>
+   
+   <div class="input-group mb-3">
+      <span class="input-group-text" id="mobilenumber"><i class="fa fa-fw fa-mobile"></i></span>
+      <input class="form-control form-control-lg" 
+         v-model="mobilenumber" 
+         v-bind:placeholder="$t('person.mobilenumber')"
+         v-bind:aria-label="$t('person.mobilenumber')" 
+         aria-describedby="mobilenumber" />
+   </div>
    
 </div>
 </template>
@@ -162,7 +187,7 @@ export default {
          getPerson(this.id)
             .then(person => new Promise((resolve, reject) => {
                this.person = person;
-               console.log('get person', this.person);
+               //console.log('get person', this.person);
                resolve();
          }));
       },
@@ -170,7 +195,7 @@ export default {
          postPerson(this.person)
             .then(person => new Promise((resolve, reject) => {
                this.person = person;
-               console.log('post person', person);
+               //console.log('post person', person);
                resolve();
          }));
       }
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/_join_household.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/_join_household.html.twig
new file mode 100644
index 000000000..600430b31
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/_join_household.html.twig
@@ -0,0 +1,40 @@
+<div class="border border-danger">
+    <div class="alert alert-danger alert-with-actions mb-0">
+        <div class="message">
+            {{ 'Some peoples does not belong to any household currently. Add them to an household soon'|trans }}
+        </div>
+        <ul class="record_actions">
+            <li>
+                <button class="btn btn-chill-pink" data-bs-toggle="collapse" href="#withoutHouseholdList">
+                    <i class="fa fa-fw fa-caret-down"></i><span class="text-light">{{ 'Add to household now'|trans }}</span>
+                </button>
+            </li>
+        </ul>
+    </div>
+
+    <div id="withoutHouseholdList" class="collapse p-3">
+        <form method="GET"
+              action="{{ chill_path_add_return_path('chill_person_household_members_editor') }}">
+
+            <h3>{{ 'household.Select people to move'|trans }}</h3>
+            <ul>
+                {% for p in withoutHousehold %}
+                    <li>
+                        <input type="checkbox" name="persons[]" value="{{ p.id }}" checked />
+                        {{ p|chill_entity_render_box }}
+                    </li>
+                {% endfor %}
+            </ul>
+
+            <input type="hidden" name="expand_suggestions" value="true" />
+            <input type="hidden" name="accompanying_period_id" value="{{ accompanyingCourse.id }}" />
+            <ul class="record_actions mb-0">
+                <li>
+                    <button type="submit" class="btn btn-edit">
+                        {{ 'household.Household editor'|trans }}
+                    </button>
+                </li>
+            </ul>
+        </form>
+    </div>
+</div>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/banner.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/banner.html.twig
index c80dbb4db..b405f9bae 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/banner.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/banner.html.twig
@@ -1,30 +1,35 @@
-<div class="subheader banner banner-accompanying-course">
-    <div class="grid-12 parent" id="header-accompanying_course-name" >
-        <div class="grid-10 push-1 grid-mobile-12 grid-tablet-12 push-mobile-0 push-tablet-0 parent">
+<div class="banner banner-accompanying-course">
+    <div id="header-accompanying_course-name" class="header-name">
+        <div class="container-xxl">
+            <div class="row">
+
+                <div class="col-md-6 ps-md-5 ps-xxl-0">
+                    <h1>
+                        <i class="fa fa-random fa-fw"></i>
+                        {{ 'Accompanying Course'|trans }}
+                        <span class="id-number">{{ accompanyingCourse.id }}</span>
+                    </h1>
+                </div>
+
+                {# vue teleport fragment here #}
+                <div class="col-md-3 mt-3 mb-1 my-md-3" id="banner-flags"></div>
+
+                {# vue teleport fragment here #}
+                <div class="col-md-3 mt-1 mb-3 my-md-3 pe-md-5 pe-xxl-0" id="banner-status"></div>
 
-            <div class="grid-6">
-                <h1>
-                    <i class="fa fa-random fa-fw"></i>
-                    {{ 'Accompanying Course'|trans }}
-                    <span class="id-number">{{ accompanyingCourse.id }}</span>
-                </h1>
             </div>
+        </div>
 
-            {# vue teleport fragment here #}
-            <div class="grid-3" id="banner-flags"></div>
+    </div>
+    <div id="header-accompanying_course-details" class="header-details">
+        <div class="container-xxl">
+            <div class="row justify-content-md-right">
 
-            {# vue teleport fragment here #}
-            <div class="grid-3" id="banner-status"></div>
-
-        </div>
-    </div>
-    <div class="grid-12 parent" id="header-accompanying_course-details" >
-        <div class="grid-10 push-1 grid-mobile-12 grid-tablet-12 push-mobile-0 push-tablet-0 parent">
-
-            {# vue teleport fragment here #}
-            <div id="banner-social-issues"></div>
+                {# vue teleport fragment here #}
+                <div class="col-md-10 ps-md-5 ps-xxl-0" id="banner-social-issues"></div>
 
+            </div>
         </div>
     </div>
+    <a id="banner-accompanying-course"></a>
 </div>
-<span id="banner-accompanying-course"></span>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/edit.html.twig
index 65edd5155..3e9d6c86f 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/edit.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/edit.html.twig
@@ -1,4 +1,4 @@
-{% extends 'ChillPersonBundle:AccompanyingCourse:layout.html.twig' %}
+{% extends '@ChillPerson/AccompanyingCourse/layout.html.twig' %}
 
 {% set title = 'DRAFT' == accompanyingCourse.step ? 'New accompanying course' : 'Edit accompanying course' %}
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/history.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/history.html.twig
index 57d3382b4..5b0ada868 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/history.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/history.html.twig
@@ -1,4 +1,4 @@
-{% extends 'ChillPersonBundle:AccompanyingCourse:layout.html.twig' %}
+{% extends '@ChillPerson/AccompanyingCourse/layout.html.twig' %}
 
 {% block title %}
     {{ 'Accompanying Course Details'|trans }}
@@ -48,8 +48,8 @@
                         </li>
                     </ul>
                     <ul class="record_actions">
-                        <li><button type="button" class="sc-button bt-show"></button></li>
-                        <li><button type="button" class="sc-button bt-edit"></button></li>
+                        <li><button type="button" class="btn btn-show"></button></li>
+                        <li><button type="button" class="btn btn-edit"></button></li>
                     </ul>
                 </div>
                 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
index 3da64f52b..bb42a390a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
@@ -1,14 +1,25 @@
-{% extends 'ChillPersonBundle:AccompanyingCourse:layout.html.twig' %}
-{% import '@ChillMain/Address/macro.html.twig' as address %}
+{% extends '@ChillPerson/AccompanyingCourse/layout.html.twig' %}
 
 {% block title %}
     {{ 'Resume Accompanying Course'|trans }}
 {% endblock %}
 
+{%  macro button_person(person) %}
+    {% if person.isSharingHousehold %}
+        <li>
+            <a href="{{ chill_path_add_return_path('chill_person_household_summary', { 'household_id': person.getCurrentHousehold.id }) }}"
+               class="btn btn-chill-pink" title="{{ 'Show household'|trans ~ ' n° ' ~ person.getCurrentHousehold.id }}">
+                <i class="fa fa-home"></i>
+            </a>
+        </li>
+    {% endif %}
+{% endmacro %}
+
 {% block content %}
+<div class="accompanyingcourse-resume">
 
     {% if 'DRAFT' == accompanyingCourse.step %}
-        <div class="grid-8 centered error flash_message">
+        <div class="col-8 alert alert-danger flash_message mb-5">
             <span>
                 {{ 'This accompanying course is still a draft'|trans }}
                 <a href="{{ path('chill_person_accompanying_course_edit', { 'accompanying_period_id': accompanyingCourse.id } ) }}">
@@ -18,348 +29,101 @@
         </div>
     {% endif %}
 
-    {% if withoutHousehold|length > 0 %}
-       <div class="alert alert-danger alert-with-actions">
-         <div class="message">
-        {{ 'Some peoples does not belong to any household currently. Add them to an household soon'|trans }}
-         </div>
-         <ul class="record_actions">
-           <li>
-            <button class="btn btn-primary" data-toggle="collapse" href="#withoutHouseholdList">
-              {{ 'Add to household now'|trans }}
-            </button>
-           </li>
-         </ul>
-       </div>
-
-        <div id="withoutHouseholdList" class="collapse">
-          <form method="GET" action="{{ chill_path_add_return_path('chill_person_household_members_editor') }}">
-
-            <h3>{{ 'household.Select people to move'|trans }}</h3>
-            <ul>
-              {% for p in withoutHousehold %}
-              <li>
-                <input type="checkbox" name="persons[]" value="{{ p.id }}" checked />
-                {{ p|chill_entity_render_box }}
-              </li>
-              {% endfor %}
-            </ul>
-
-            <input type="hidden" name="expand_suggestions" value="true" />
-            <input type="hidden" name="accompanying_period_id", value="{{ accompanyingCourse.id }}" />
-
-            <ul class="record_actions">
-              <li>
-                <button type="submit" class="sc-button bt-edit">
-                  {{ 'household.Household editor'|trans }}
-                </button>
-              </li>
-            </ul>
-          </form>
+    <div class="associated-persons mb-5">
+        <h2 class="mb-3">{{ 'Associated peoples'|trans }}</h2>
+        <div class="flex-table mb-3">
+            {% for participation in accompanyingCourse.participations %}
+                {% if participation.enddate is null %}
+                    <div class="item-bloc">
+                        {{ participation.person|chill_entity_render_box({
+                            'render': 'bloc', 'addLink': false, 'addInfo': true,
+                            'customButtons': { 'before': _self.button_person(participation.person) }
+                        }) }}
+                    </div>
+                {% endif %}
+            {% endfor %}
         </div>
+        {% if withoutHousehold|length > 0 %}
+            {% include '@ChillPerson/AccompanyingCourse/_join_household.html.twig' with {} %}
+        {% endif %}
+    </div>
 
-    {% endif %}
-
-    <h2>{{ 'Associated peoples'|trans }}</h2>
-    <div class="flex-table">
-    {% for p in accompanyingCourse.participations %}
-        {% if p.enddate is null %}
-            <div class="item-bloc">
-                <div class="item-row">
-                    <div class="item-col">
-                        <h3>{{ p.person.firstname ~ ' ' ~ p.person.lastname }}</h3>
-                        <p>
-                            {% set born = (p.person.gender == 'woman') ? 'née': 'né' %}
-                            {% set gender = (p.person.gender == 'woman') ? 'fa-venus' :
-                                (p.person.gender == 'man') ? 'fa-mars' : 'fa-neuter' %}
-                            {% set genderTitle = (p.person.gender == 'woman') ? 'femme' :
-                                (p.person.gender == 'man') ? 'homme' : 'neutre' %}
-                            <i class="fa fa-fw {{ gender }}" title="{{ genderTitle }}"></i>{{ born ~ ' le ' ~ p.person.birthdate|format_date('short') }}
-                        </p>
-                    </div>
-                    <div class="item-col">
-                        <ul class="list-content fa-ul">
-                            <li>
-                                {% if p.person.mobilenumber %}
-                                    <i class="fa fa-li fa-mobile"></i><a href="{{ 'tel:' ~ p.person.mobilenumber }}">
-                                    {{ p.person.mobilenumber|chill_format_phonenumber }}</a>
-                                {% else %}
-                                    <i class="fa fa-li fa-phone"></i>
-                                    {% if p.person.phonenumber %}
-                                        <a href="{{ 'tel:' ~ p.person.phonenumber }}">{{ p.person.phonenumber|chill_format_phonenumber }}</a>
-                                    {% else %}
-                                        <span class="chill-no-data-statement">{{ 'No data given'|trans }}</span>
-                                    {% endif %}
-                                {% endif %}
-                            </li>
-                            <li>
-                                <i class="fa fa-li fa-map-marker"></i>
-                                {%- if p.person.lastAddress is not empty -%}
-                                    {{ p.person.currentHouseholdAddress|chill_entity_render_box({'with_valid_from': false}) }}
-                                {%- else -%}
-                                    <span class="chill-no-data-statement">{{ 'No address given'|trans }}</span>
-                                {%- endif -%}
-                            </li>
-                        </ul>
-                        <ul class="record_actions">
-                            <li>
-                                <a href="{{ path('chill_person_view', { person_id: p.person.id }) }}" class="sc-button bt-show" target="_blank" title="Voir"></a>
-                            </li>
-                            {% if p.person.isSharingHousehold %}
-                            <li>
-                                <a
-                                  href="{{ chill_path_add_return_path(
-                                    'chill_person_household_summary',
-                                    { 'household_id': p.person.getCurrentHousehold.id }
-                                    ) }}"
-                                  class="sc-button">
-                                  <i class="fa fa-home"></i>
-                                  n°&nbsp;{{ p.person.getCurrentHousehold.id }}
-                                </a>
-                            </li>
-                            {% endif %}
-                        </ul>
-                    </div>
+    <div class="requestor mb-5">
+        <h2 class="mb-3">{{ 'Requestor'|trans }}</h2>
+        {% if accompanyingCourse.requestorPerson is not empty %}
+            {% set requestor = accompanyingCourse.requestorPerson %}
+            {% set info = true %}
+        {% elseif accompanyingCourse.requestor is not empty %}
+            {% set requestor = accompanyingCourse.requestorThirdParty %}
+            {% set info = false %}
+        {% endif %}
+        {% if accompanyingCourse.requestor == null %}
+            <p class="chill-no-data-statement">{{ 'Any requestor to this accompanying course'|trans }}</p>
+        {% else %}
+            <div class="flex-bloc row row-cols-1 g-0">
+                <div class="item-bloc col">
+                {{ requestor|chill_entity_render_box({
+                    'render': 'bloc', 'addLink': false, 'addEntity': true, 'addInfo': info
+                }) }}
                 </div>
             </div>
         {% endif %}
-    {% endfor %}
     </div>
 
-    <h2>{{ 'Requestor'|trans }}</h2>
+    <div class="resources mb-5">
+        <h2 class="mb-3">{{ 'Resources'|trans }}</h2>
+        {% if accompanyingCourse.resources|length == 0 %}
+            <p class="chill-no-data-statement">{{ 'Any resource for this accompanying course'|trans }}</p>
+        {% else %}
+            <div class="flex-bloc row row-cols-1 row-cols-sm-2 row-cols-xl-3 row-cols-xxl-4 g-0">
+            {% for r in accompanyingCourse.resources %}
+                <div class="item-bloc col">
+                    {% if r.person %}
+                        {{ r.person|chill_entity_render_box({
+                            'render': 'bloc', 'addLink': false, 'addEntity': true, 'addInfo': true
+                        }) }}
+                    {% endif %}
+                    {% if r.thirdParty %}
+                        {{ r.thirdParty|chill_entity_render_box({
+                            'render': 'bloc', 'addLink': false, 'addEntity': true, 'addInfo': false
+                        }) }}
+                    {% endif %}
+                </div>
+            {% endfor %}
+            </div>
+        {% endif %}
+    </div>
 
-    {% if accompanyingCourse.requestor == null %}
-      <p>{{ 'Any requestor to this accompanying course'|trans }}</p>
-    {% elseif accompanyingCourse.requestorPerson is not empty %}
-      {% set r = accompanyingCourse.requestorPerson %}
-      <div class="item-row">
-          <div class="item-col">
-              <h3>
-                  {{ r.firstname ~ ' ' ~ r.lastname }}
-                  <span class="badge badge-pill badge-secondary">{{ 'Usager' }}</span>
-              </h3>
-              <p>
-                  {% set born = (r.gender == 'woman') ? 'née': 'né' %}
-                  {% set gender = (r.gender == 'woman') ? 'fa-venus' :
-                      (r.gender == 'man') ? 'fa-mars' : 'fa-neuter' %}
-                  {% set genderTitle = (r.gender == 'woman') ? 'femme' :
-                      (r.gender == 'homme') ? 'fa-mars' : 'neutre' %}
-                  <i class="fa fa-fw {{ gender }}" title="{{ genderTitle }}"></i>{{ born ~ ' le ' ~ r.birthdate|format_date('short') }}
-              </p>
-          </div>
-          <div class="item-col">
-              <ul class="list-content fa-ul">
-                  <li>
-                      {% if r.mobilenumber %}
-                          <i class="fa fa-li fa-mobile"></i><a href="{{ 'tel:' ~ r.mobilenumber }}">
-                          {{ r.mobilenumber|chill_format_phonenumber }}</a>
-                      {% else %}
-                          <i class="fa fa-li fa-phone"></i>
-                          {% if r.phonenumber %}
-                              <a href="{{ 'tel:' ~ r.phonenumber }}">{{ r.phonenumber|chill_format_phonenumber }}</a>
-                          {% else %}
-                              <span class="chill-no-data-statement">{{ 'No data given'|trans }}</span>
-                          {% endif %}
-                      {% endif %}
-                  </li>
-                  <li>
-                      <i class="fa fa-li fa-map-marker"></i>
-                      {%- if r.lastAddress is not empty -%}
-                          {{ r.getLastAddress|chill_entity_render_box({'with_valid_from': false}) }}
-                      {%- else -%}
-                          <span class="chill-no-data-statement">{{ 'No address given'|trans }}</span>
-                      {%- endif -%}
-                  </li>
-              </ul>
-              <ul class="record_actions">
-                  <li>
-                      <a href="{{ path('chill_person_view', { person_id: r.id }) }}" class="sc-button bt-show" target="_blank" title="Voir"></a>
-                  </li>
-              </ul>
-          </div>
-      </div>
-
-  {% elseif accompanyingCourse.requestorThirdParty is not empty %}
-    {% set r = accompanyingCourse.requestorThirdParty %}
-      <div class="item-row">
-          <div class="item-col">
-              <h3>
-                  {{ r.name }}
-                  <span class="badge badge-pill badge-secondary">{{ 'Tiers' }}</span>
-              </h3>
-          </div>
-          <div class="item-col">
-              <ul class="list-content fa-ul">
-                  <li><i class="fa fa-li fa-envelope-o"></i>
-                      <a href="{{ 'mailto:' ~ r.email }}">
-                          {{ r.email|chill_print_or_message("thirdparty.No_email") }}
-                      </a>
-                  </li>
-                  <li><i class="fa fa-li fa-phone"></i>
-                      {% if r.telephone %}
-                          <a href="{{ 'tel:' ~ r.telephone }}">{{ r.telephone|chill_format_phonenumber }}</a>
-                      {% else %}
-                          <span class="chill-no-data-statement">{{ 'thirdparty.No_phonenumber'|trans }}</span>
-                      {% endif %}
-                  </li>
-                  <li><i class="fa fa-li fa-map-marker"></i>
-                      {%- if r.address is not empty -%}
-                          {{ r.getAddress|chill_entity_render_box({'with_valid_from': false}) }}
-                      {%- else -%}
-                          <span class="chill-no-data-statement">{{ 'No address given'|trans }}</span>
-                      {%- endif -%}
-                  </li>
-              </ul>
-              <ul class="record_actions">
-                  <li>
-                      <a href="{{ path('chill_3party_3party_show', { thirdparty_id: r.id }) }}" class="sc-button bt-show" target="_blank" title="Voir"></a>
-                  </li>
-              </ul>
-          </div>
-      </div>
-    {% endif %}
-
-    <h2>{{ 'Resources'|trans }}</h2>
-
-    {% if accompanyingCourse.resources|length == 0 %}
-      <p class="chill-no-data-statement">{{ 'Any resource for this accompanying course'|trans }}</p>
-    {% else %}
-      <div class="flex-bloc">
-      {% for r in accompanyingCourse.resources %}
-          <div class="item-bloc">
-          {% if r.person %}
-
-              <div class="item-row">
-                  <div class="item-col">
-                      <h3>
-                          {{ r.person.firstname ~ ' ' ~ r.person.lastname }}
-                          <span class="badge badge-pill badge-secondary">{{ 'Usager' }}</span>
-                      </h3>
-                      <p>
-                          {% set born = (r.person.gender == 'woman') ? 'née': 'né' %}
-                          {% set gender = (r.person.gender == 'woman') ? 'fa-venus' :
-                              (r.person.gender == 'man') ? 'fa-mars' : 'fa-neuter' %}
-                          {% set genderTitle = (r.person.gender == 'woman') ? 'femme' :
-                              (r.person.gender == 'homme') ? 'fa-mars' : 'neutre' %}
-                          <i class="fa fa-fw {{ gender }}" title="{{ genderTitle }}"></i>{{ born ~ ' le ' ~ r.person.birthdate|format_date('short') }}
-                      </p>
-                  </div>
-                  <div class="item-col">
-                      <ul class="list-content fa-ul">
-                          <li>
-                              {% if r.person.mobilenumber %}
-                                  <i class="fa fa-li fa-mobile"></i><a href="{{ 'tel:' ~ r.person.mobilenumber }}">{{ r.person.mobilenumber }}</a>
-                              {% else %}
-                                  <i class="fa fa-li fa-phone"></i>
-                                  {% if r.person.phonenumber %}
-                                      <a href="{{ 'tel:' ~ r.person.phonenumber }}">{{ r.person.phonenumber }}</a>
-                                  {% else %}
-                                      <span class="chill-no-data-statement">{{ 'No data given'|trans }}</span>
-                                  {% endif %}
-                              {% endif %}
-                          </li>
-                          <li>
-                              <i class="fa fa-li fa-map-marker"></i>
-                              {%- if r.person.lastAddress is not empty -%}
-                                  {{ r.person.getLastAddress|chill_entity_render_box({'with_valid_from': false}) }}
-                              {%- else -%}
-                                  <span class="chill-no-data-statement">{{ 'No address given'|trans }}</span>
-                              {%- endif -%}
-                          </li>
-                      </ul>
-                      <ul class="record_actions">
-                          <li>
-                              <a href="{{ path('chill_person_view', { person_id: r.person.id }) }}" class="sc-button bt-show" target="_blank" title="Voir"></a>
-                          </li>
-                      </ul>
-                  </div>
-              </div>
-
-          {% endif %}
-          {% if r.thirdParty %}
-
-              <div class="item-row">
-                  <div class="item-col">
-                      <h3>
-                          {{ r.thirdParty.name }}
-                          <span class="badge badge-pill badge-secondary">{{ 'Tiers' }}</span>
-                      </h3>
-                  </div>
-                  <div class="item-col">
-                      <ul class="list-content fa-ul">
-                          <li><i class="fa fa-li fa-envelope-o"></i>
-                              <a href="{{ 'mailto:' ~ r.thirdParty.email }}">
-                                  {{ r.thirdParty.email|chill_print_or_message("thirdparty.No_email") }}
-                              </a>
-                          </li>
-                          <li><i class="fa fa-li fa-phone"></i>
-                              {% if r.thirdParty.telephone %}
-                                  <a href="{{ 'tel:' ~ r.thirdParty.telephone }}">{{ r.thirdParty.telephone }}</a>
-                              {% else %}
-                                  <span class="chill-no-data-statement">{{ 'thirdparty.No_phonenumber'|trans }}</span>
-                              {% endif %}
-                          </li>
-                          <li><i class="fa fa-li fa-map-marker"></i>
-                              {%- if r.thirdParty.address is not empty -%}
-                                  {{ r.thirdParty.getAddress|chill_entity_render_box({'with_valid_from': false}) }}
-                              {%- else -%}
-                                  <span class="chill-no-data-statement">{{ 'No address given'|trans }}</span>
-                              {%- endif -%}
-                          </li>
-                      </ul>
-                      <ul class="record_actions">
-                          <li>
-                              <a href="{{ path('chill_3party_3party_show', { thirdparty_id: r.thirdParty.id }) }}" class="sc-button bt-show" target="_blank" title="Voir"></a>
-                          </li>
-                      </ul>
-                  </div>
-              </div>
-
-          {% endif %}
-          </div>
-      {% endfor %}
-      </div>
-    {% endif %}
-
-    <h2>{{ 'Social actions'|trans }}</h2>
-
-    <div id="accompanying_course_work_list" class="short">
-      {% for w in works %}
-      <div class="item">
-          <div class="title">
-          <p class="title_label">{{ 'accompanying_course_work.action'|trans }}</p >
-            <h2 class="action_title">
-              {{ w.socialAction|chill_entity_render_box({ 'no-badge': false }) }}
-            </h2>
-          </div>
-
-        <div class="actions">
-          <ul class="record_actions">
-            <li>
-              <a 
-                class="sc-button bt-edit"
-                href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_edit', { 'id': w.id }) }}">{{ 'Edit'|trans }}</a>
-            </li>
-          </ul>
+    <div class="social-actions mb-5">
+        <h2 class="mb-3">{{ 'Social actions'|trans }}</h2>
+        {% for w in works %}
+        <div class="item">
+            <div class="title">
+            <p class="title_label">{{ 'accompanying_course_work.action'|trans }}</p >
+                <h2 class="action_title">
+                  {{ w.socialAction|chill_entity_render_box({ 'no-badge': false }) }}
+                </h2>
+            </div>
+            <div class="actions">
+                <ul class="record_actions">
+                    <li>
+                        <a class="btn btn-edit"
+                            href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_edit', { 'id': w.id }) }}">{{ 'Edit'|trans }}</a>
+                    </li>
+                </ul>
+            </div>
         </div>
-      </div>
-      {% else %}
-        <p class="chill-no-data-statement">{{ 'accompanying_course_work.Any work'|trans }}</p>    
-      {% endfor %}
+        {% else %}
+          <p class="chill-no-data-statement">{{ 'accompanying_course_work.Any work'|trans }}</p>
+        {% endfor %}
     </div>
 
-
     {% block contentActivity %}
+    <div class="activity mb-5">
         {% set person = null %}
-        {% include 'ChillActivityBundle:Activity:list.html.twig' with {'context': 'accompanyingCourse', 'context': 'accompanyingCourse'} %}
+        {% include 'ChillActivityBundle:Activity:list.html.twig' with { 'context': 'accompanyingCourse' } %}
+    </div>
     {% endblock %}
 
-    {#  ==> insert accompanyingCourse vue component  #}
-    <div id="accompanying-course"></div>
-{% endblock %}
-
-
-{% block css %}
-  {{ parent() }}
-  {{ encore_entry_link_tags('accompanying_course_work_list') }}
+</div>
 {% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/layout.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/layout.html.twig
index 58591a618..8ccccb3d4 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/layout.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/layout.html.twig
@@ -1,16 +1,20 @@
-{% extends "ChillMainBundle::layoutWithVerticalMenu.html.twig" %}
+{% extends "@ChillMain/layoutWithVerticalMenu.html.twig" %}
 
 {% block top_banner %}
-    {{ include('ChillPersonBundle:AccompanyingCourse:banner.html.twig', { title: block('title') }) }}
+    {{ include('@ChillPerson/AccompanyingCourse/banner.html.twig', { title: block('title') }) }}
 {% endblock %}
 
 {% block layout_wvm_content %}
-    {% block content %}{% endblock %}
+    <div class="row justify-content-center">
+        <div class="col-md-10 col-xxl">
+            {% block content %}{% endblock %}
+        </div>
+    </div>
 {% endblock  %}
 
 {% block vertical_menu_content %}
     {{ chill_menu('accompanyingCourse', {
-        'layout': 'ChillPersonBundle:AccompanyingCourse:menu.html.twig',
+        'layout': '@ChillPerson/menu.html.twig',
         'args' : { 'accompanyingCourse': accompanyingCourse }
     }) }}
 {% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/menu.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/menu.html.twig
deleted file mode 100644
index a60abe7eb..000000000
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/menu.html.twig
+++ /dev/null
@@ -1,7 +0,0 @@
-<ul class="tab-nav">
-    {% for menu in menus %}
-        <li class="">
-            <a href="{{ menu.uri }}" >{{ menu.label|upper }}</a>
-        </li>
-    {% endfor %}
-</ul>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/create.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/create.html.twig
index d19c1f93f..b1d4682d8 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/create.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/create.html.twig
@@ -4,10 +4,13 @@
 
 
 {% block content %}
-  <h1>{{ block('title') }}</h1>
+<div class="accompanying_course_work-create">
 
-  <div id="accompanying_course_work_create"></div>
+            <h1>{{ block('title') }}</h1>
 
+            <div id="accompanying_course_work_create"></div>
+
+</div>
 {% endblock %}
 
 {% block js %}
@@ -15,10 +18,10 @@
     window.accompanyingCourse = {{ json|json_encode|raw }};
   </script>
 
-  {{ encore_entry_script_tags('accompanying_course_work_create') }}
+  {{ encore_entry_script_tags('vue_accourse_work_create') }}
 {% endblock %}
 
 {% block css %}
   {{ parent() }}
-  {{ encore_entry_link_tags('accompanying_course_work_create') }}
+  {{ encore_entry_link_tags('vue_accourse_work_create') }}
 {% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/edit.html.twig
index 53314cf17..bb670d9d6 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/edit.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/edit.html.twig
@@ -4,10 +4,13 @@
 
 
 {% block content %}
-  <h1>{{ block('title') }}</h1>
+<div class="accompanying_course_work-edit">
 
-  <div id="accompanying_course_work_edit"></div>
+            <h1>{{ block('title') }}</h1>
 
+            <div id="accompanying_course_work_edit"></div>
+
+</div>
 {% endblock %}
 
 {% block js %}
@@ -16,10 +19,10 @@
     window.accompanyingCourseWork = {{ json|json_encode|raw }};
   </script>
 
-  {{ encore_entry_script_tags('accompanying_course_work_edit') }}
+  {{ encore_entry_script_tags('vue_accourse_work_edit') }}
 {% endblock %}
 
 {% block css %}
   {{ parent() }}
-  {{ encore_entry_link_tags('accompanying_course_work_edit') }}
+  {{ encore_entry_link_tags('vue_accourse_work_edit') }}
 {% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_by_accompanying_period.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_by_accompanying_period.html.twig
index b12f3c932..8bd53b1f3 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_by_accompanying_period.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_by_accompanying_period.html.twig
@@ -4,9 +4,11 @@
 
 
 {% block content %}
+<div class="accompanying_course_work-list">
+
   <h1>{{ block('title') }}</h1>
 
-  <div id="accompanying_course_work_list">
+
     {% for w in works %}
       <div class="item">
         <div class="title">
@@ -55,7 +57,7 @@
               <p class="title_label">{{ 'accompanying_course_work.results'|trans }}</p>
               <ul class="result_list">
                 {% for r in w.results %}
-                  <li class="badge badge-primary">{{ r.title|localize_translatable_string }}</li>
+                  <li class="badge bg-primary">{{ r.title|localize_translatable_string }}</li>
                 {% endfor %}
               </ul>
             </div>
@@ -77,7 +79,7 @@
                   <p class="title_label">{{ 'accompanying_course_work.results'|trans }}</p>
                   <ul class="result_list">
                     {% for r in g.results %}
-                      <li class="badge badge-primary">{{ r.title|localize_translatable_string }}</li>
+                      <li class="badge bg-primary">{{ r.title|localize_translatable_string }}</li>
                     {% endfor %}
                   </ul>
                 {% endif %}
@@ -94,8 +96,8 @@
         <div class="actions">
           <ul class="record_actions">
             <li>
-              <a 
-                class="sc-button bt-edit"
+              <a
+                class="btn btn-edit"
                 href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_edit', { 'id': w.id }) }}">{{ 'Edit'|trans }}</a>
             </li>
           </ul>
@@ -104,21 +106,17 @@
     {% else %}
       <p class="chill-no-data-statement">{{ 'accompanying_course_work.Any work'|trans }}</p>
     {% endfor %}
-   </div>
+
 
   <ul class="record_actions sticky-form-buttons">
     <li>
       <a href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_new', { 'id': accompanyingCourse.id }) }}"
-        class="sc-button bt-new">
+        class="btn btn-new">
         {{ 'accompanying_course_work.create'|trans }}
       </a>
     </li>
   </ul>
 
+</div>
 {% endblock %}
 
-
-{% block css %}
-  {{ parent() }}
-  {{ encore_entry_link_tags('accompanying_course_work_list') }}
-{% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig
index 0b4604283..7b4ac4a61 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig
@@ -8,23 +8,23 @@
                     {{'period'|trans}} <b>#{{ accompanying_period.id }}</b>
                     {% if accompanying_period.emergency %}
                     &nbsp;
-                    <span class="badge badge-primary">
+                    <span class="badge bg-primary">
                         {{- 'Emergency'|trans|upper -}}
                     </span>
                     {% endif %}
                     {% if accompanying_period.confidential %}
                     &nbsp;
-                    <span class="badge badge-primary">
+                    <span class="badge bg-primary">
                         {{- 'Confidential'|trans|upper -}}
                     </span>
                     {% endif %}
                     {% if accompanying_period.step == 'DRAFT' %}
                     &nbsp;
-                    <span class="badge badge-primary">
+                    <span class="badge bg-primary">
                         {{- 'Draft'|trans|upper -}}
                     </span>
                     {% else %}
-                    <span class="badge badge-primary">
+                    <span class="badge bg-primary">
                         {{- 'Confirmed'|trans|upper -}}
                     </span>
                     {% endif %}
@@ -103,22 +103,26 @@
                 <ul class="record_actions">
                     {# TODO if enable_accompanying_course_with_multiple_persons is true ... #}
                     <li>
-                        <a href="{{ path('chill_person_accompanying_course_index', { 'accompanying_period_id': accompanying_period.id }) }}" class="sc-button bt-show"></a>
+                        <a href="{{ path('chill_person_accompanying_course_index', { 'accompanying_period_id': accompanying_period.id }) }}"
+                           class="btn btn-primary" title="{{ 'See accompanying period'|trans }}">
+                            <i class="fa fa-random"></i>
+                            {{ 'See this period'|trans }}
+                        </a>
                     </li>
                     {#
                     <li>
-                        <a  href="{{ path('chill_person_accompanying_period_update', {'person_id' : person.id, 'period_id' : accompanying_period.id } ) }}" class="sc-button bt-update no-content"></a>
+                        <a  href="{{ path('chill_person_accompanying_period_update', {'person_id' : person.id, 'period_id' : accompanying_period.id } ) }}" class="btn btn-update no-content"></a>
                     </li>
                     {% if accompanying_period.isOpen == true %}
                     <li>
-                        <a href="{{ path('chill_person_accompanying_period_close', {'person_id' : person.id}) }}" class="sc-button bt-update has-hidden change-icon">
+                        <a href="{{ path('chill_person_accompanying_period_close', {'person_id' : person.id}) }}" class="btn btn-update has-hidden change-icon">
                             <i class="fa fa-lock" aria-hidden="true"></i><span class="show-on-hover">{{'Close accompanying period'|trans }}</span>
                         </a>
                     </li>
                     {% endif %}
                     {% if accompanying_period.canBeReOpened(person) == true %}
                     <li>
-                        <a href="{{ path('chill_person_accompanying_period_re_open', {'person_id' : person.id, 'period_id' : accompanying_period.id } ) }}" class="sc-button bt-create change-icon has-hidden">
+                        <a href="{{ path('chill_person_accompanying_period_re_open', {'person_id' : person.id, 'period_id' : accompanying_period.id } ) }}" class="btn btn-create change-icon has-hidden">
                             <i class="fa fa-unlock" aria-hidden="true"></i><span class="show-on-hover">{{'Re-open accompanying period'|trans }}</span>
                         </a>
                     </li>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/form.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/form.html.twig
index 45b43a2f1..1fb97c0b6 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/form.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/form.html.twig
@@ -1,4 +1,4 @@
-{% extends "@ChillPerson/layout.html.twig"  %}
+{% extends "@ChillPerson/Person/layout.html.twig"  %}
 
 {% set activeRouteKey = null %}
 
@@ -50,10 +50,10 @@
 
 <ul class="record_actions sticky-form-buttons">
     <li class="cancel">
-    <a href="{{ path('chill_person_accompanying_period_list', { 'person_id' : person.id } ) }}" class="sc-button bt-cancel">{{ 'Back to the list'|trans }}</a>
+    <a href="{{ path('chill_person_accompanying_period_list', { 'person_id' : person.id } ) }}" class="btn btn-cancel">{{ 'Back to the list'|trans }}</a>
     </li>
     <li>
-    <button type="submit" class="sc-button bt-save">
+    <button type="submit" class="btn btn-save">
         {% if form.vars.action == 'update' %}
             {{ 'Update accompanying period'|trans }}
         {% elseif form.vars.action == 'open' %}
@@ -71,4 +71,4 @@
 {{ form_end(form) }}
 
 
-{% endblock personcontent %}
+{% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/list.html.twig
index 6b388857d..8ca4dd26e 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/list.html.twig
@@ -1,4 +1,4 @@
-{% extends "@ChillPerson/layout.html.twig"  %}
+{% extends "@ChillPerson/Person/layout.html.twig"  %}
 
 {% set activeRouteKey = 'chill_person_accompanying_period_list' %}
 
@@ -11,24 +11,24 @@
 
 <ul class="record_actions sticky-form-buttons">
     <li class="cancel">
-        <a href="{{ path ('chill_person_view', {'person_id' : person.id } ) }}" class="sc-button bt-cancel">
+        <a href="{{ path ('chill_person_view', {'person_id' : person.id } ) }}" class="btn btn-cancel">
             {{ 'Person details'|trans }}
         </a>
     </li>
     <li>
-        <a href="{{ path ('chill_person_accompanying_course_new', {'person_id' : [ person.id ] } ) }}" class="sc-button bt-create">
+        <a href="{{ path ('chill_person_accompanying_course_new', {'person_id' : [ person.id ] } ) }}" class="btn btn-create">
           {{ 'Create an accompanying period'|trans }}
         </a>
     </li>
     {#
     <li>
-        <a href="{{ path ('chill_person_accompanying_period_create', {'person_id' : person.id } ) }}" class="sc-button bt-create has-hidden">
+        <a href="{{ path ('chill_person_accompanying_period_create', {'person_id' : person.id } ) }}" class="btn btn-create has-hidden">
             <span class="show-on-hover">{{ 'Add an accompanying period in the past'|trans }}</span>
         </a>
     </li>
     {% if person.isOpen == false %}
     <li>
-        <a href="{{ path('chill_person_accompanying_period_open', {'person_id' : person.id} ) }}" class="sc-button bt-create change-icon has-hidden">
+        <a href="{{ path('chill_person_accompanying_period_open', {'person_id' : person.id} ) }}" class="btn btn-create change-icon has-hidden">
             <i class="fa fa-unlock" aria-hidden="true"></i>
             <span class="show-on-hover">{{'Begin a new accompanying period'|trans }}</span>
         </a>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/re_open.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/re_open.html.twig
index 258ffd66e..b75dcee5d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/re_open.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/re_open.html.twig
@@ -1,4 +1,4 @@
-{% extends "@ChillPerson/layout.html.twig"  %}
+{% extends "@ChillPerson/Person/layout.html.twig"  %}
 
 {% set activeRouteKey = 'chill_person_accompanying_period_list' %}
 
@@ -12,16 +12,16 @@
 
     <ul class="record_actions">
         <li class="cancel">
-            <a href="{{ path('chill_person_accompanying_period_list', { 'person_id' : person.id } ) }}" class="sc-button bt-cancel">
+            <a href="{{ path('chill_person_accompanying_period_list', { 'person_id' : person.id } ) }}" class="btn btn-cancel">
                 {{ 'Cancel'|trans }}
             </a>
         </li>
         <li>
-            <a href="{{ path('chill_person_accompanying_period_re_open', {'confirm' : true, 'person_id' : person.id, 'period_id' : period.id } ) }}" class="sc-button bt-create">
+            <a href="{{ path('chill_person_accompanying_period_re_open', {'confirm' : true, 'person_id' : person.id, 'period_id' : period.id } ) }}" class="btn btn-create">
                 {{'Confirm'|trans }}
             </a>
         </li>
     </ul>
     
    
-{% endblock personcontent %}
+{% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/showInNotification.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/showInNotification.html.twig
new file mode 100644
index 000000000..d92de8cba
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/showInNotification.html.twig
@@ -0,0 +1,3 @@
+<a href="{{ path('chill_person_accompanying_course_index', {'accompanying_period_id': notification.relatedEntityId })  }}">
+    Go to Acc. period.
+</a>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig
index ffdfaea86..5f5a4a888 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig
@@ -14,31 +14,33 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
-{% extends "@ChillPerson/layout.html.twig"  %}
+{% extends "@ChillPerson/Person/layout.html.twig" %}
 
 {% set activeRouteKey = '' %}
 
 {% block title 'Modify address for %name%'|trans({ '%name%': person.firstName ~ ' ' ~ person.lastName } ) %}
 
 {% block personcontent %}
+<div class="address-new">
+            
+            {% block content %}
+                <h1>{{ block('title') }}</h1>
+                <div id="address"></div>
+            {% endblock %}
 
-    {% block content %}
-        <h1>{{ block('title') }}</h1>
-        <div id="address"></div>
-    {% endblock %}
+</div>
+{% endblock %}
 
-    {% block stylesheets %}
-        <link href="{{ asset('build/address.css') }}" type="text/css" rel="stylesheet" />
-    {% endblock %}
+{% block css %}
+    {{ encore_entry_link_tags('vue_address') }}
+{% endblock %}
 
-    {% block js %}
-        <script type="text/javascript">
-            window.personId = {{ person.id|e('js') }};
-            window.addressId = {{ address.id|e('js') }};
-            window.mode = 'edit';
-            window.vueRootComponent = 'app';
-        </script>
-        {{ encore_entry_script_tags('address') }}
-    {% endblock %}
-
-{% endblock personcontent %}
+{% block js %}
+    <script type="text/javascript">
+        window.personId = {{ person.id|e('js') }};
+        window.addressId = {{ address.id|e('js') }};
+        window.mode = 'edit';
+        window.vueRootComponent = 'app';
+    </script>
+    {{ encore_entry_script_tags('vue_address') }}
+{% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Address/list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Address/list.html.twig
index 638d38b36..60de27e37 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Address/list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Address/list.html.twig
@@ -1,5 +1,5 @@
 {#
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
+ * Copyright (C) 2014-2021, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
  *
  * This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU Affero General Public License as
@@ -14,79 +14,96 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
-{% extends "@ChillPerson/layout.html.twig"  %}
-
-{% import '@ChillMain/Address/macro.html.twig' as address_macros %}
+{% extends "@ChillPerson/Person/layout.html.twig"  %}
 
 {% set activeRouteKey = '' %}
 
-{% block title %}{{ 'Addresses\'history for %name%'|trans({ '%name%': person.firstName ~ ' ' ~ person.lastName } ) }}{% endblock %}
+{% block title %}{{ 'Addresses history for %name%'|trans({ '%name%': person.firstName ~ ' ' ~ person.lastName } ) }}{% endblock %}
 
 {% block personcontent %}
+<div class="person-address">
+
+    <h1>{{ 'Addresses history'|trans }}</h1>
+
+    <ul class="record_actions my-3">
+        <li style="margin: auto;">
+            <a class="btn btn-lg btn-create"
+               href="{{ path('chill_person_address_new', { 'person_id' : person.id } ) }}">
+                {{ 'Add an address'|trans }}
+            </a>
+        </li>
+    </ul>
 
-    <h1>{{ 'Addresses\'history for %name%'|trans({ '%name%': person.firstName ~ ' ' ~ person.lastName } ) }}</h1>
-    
     <div class="address-timeline grid">
-        
+
         {% if person.addresses|length == 0 %}
             <span class="chill-no-data-statement">{{ 'No address given'|trans }}</span>
         {% else %}
             <div class="top"><i class="fa fa-caret-up fa-3x"></i></div>
         {% endif %}
-        
+
+        <div class="col-a">
+            <h3 class="mb-5">{{ 'Person addresses'|trans }}</h3>
+        </div>
+        <div class="col-b"></div>
+        <div class="col-c">
+            <h3 class="mb-5">{{ 'Household addresses'|trans }}</h3>
+        </div>
+
+        {% set row = 0 %}
+        {% set previousRowFrom = null %}
+
         {% for address in person.addresses %}
-            
-            {# if person address #}
-            <div class="col-a content{{ ' row' ~ loop.index }}">
-                <div class="address">
-                    {% if address.isNoAddress == true %}
-                        <div class="chill_address_is_noaddress">{{ 'address.consider homeless'|trans }}</div>
-                    {% else %}
-                            
-                        {% if address.street is not empty %}
-                        <div class="street">
-                            <span class="streetNumber">{{ address.street }}</span>
-                            {% if address.streetNumber is not empty %}
-                                <span class="streetNumber">, {{ address.streetNumber }}</span>
-                            {% endif %}
-                        </div>
-                        {% endif %}
-                        
-                        {% if address.postCode is not empty %}
-                        <div class="postCode">
-                            <span>{{ address.postCode.code }}</span> <span>{{ address.postCode.name }}</span>
-                            <span class="country">({{ address.postCode.country.name|localize_translatable_string }})</span>
-                        </div>
-                        {% endif %}
-                        
+
+            {% set row = row + 1 %}
+            {% if address.validTo is not empty and address.validTo < previousRowFrom %}
+                <div class="{{ 'row' ~ row ~ ' ' }}col-a action">
+                    <a href="" class="btn btn-sm btn-create">{{ 'Insert an address'|trans }}</a></div>
+                <div class="{{ 'row' ~ row ~ ' ' }}col-b"></div>
+                <div class="{{ 'row' ~ row ~ ' ' }}col-c action">
+                    <a href="" class="btn btn-sm btn-create">{{ 'Insert an address'|trans }}</a></div>
+                <div class="date">
+                    {% if address.validTo is not empty %}
+                        {{ address.validTo|format_date('short') }}
                     {% endif %}
-                        
+                </div>
+
+                {% set row = row + 1 %}
+            {% endif %}
+
+
+            {# if person address #}
+                <div class="{{ 'row' ~ row ~ ' ' }}col-a content">
+                    {{ address|chill_entity_render_box({
+                        'render': 'bloc',
+                        'multiline': true,
+                        'extended_infos': true,
+                        'has_no_address': true
+                    }) }}
                     <ul class="record_actions">
-                        <li>
-                            <a href="{{ path('chill_person_address_edit', { 'person_id': person.id, 'address_id' : address.id } ) }}" class="sc-button bt-edit"></a>
-                        </li>
+                        <li><a href="{{ path('chill_person_address_edit', { 'person_id': person.id, 'address_id' : address.id } ) }}" class="btn btn-edit"></a></li>
                     </ul>
                 </div>
-            </div>
             {# endif #}
-            
-            <div class="col-b"></div>
-            
-            {# if household address #}{# 
+
+            <div class="{{ 'row' ~ row ~ ' ' }}col-b"></div>
+
+            {# if household address #}{#
                 <div class="col-c content rowXX">
                     <div class="address">...</div>
                 </div>
             #}{# endif #}
-            
+
             <div class="date">
                 {% if address.validFrom is not empty %}
-                    {{ address.validFrom|format_date('long') }}
+                    {{ address.validFrom|format_date('short') }}
                 {% endif %}
             </div>
-                
+
+            {% set previousRowFrom = address.validFrom %}
         {% endfor %}
-        
-        {# TEST HOUSEHOLD POSITION 
+
+        {# TEST HOUSEHOLD POSITION
         #}
         <div class="col-b"></div>
         <div class="col-c content fake">
@@ -98,25 +115,26 @@
                 <div class="postCode">
                     <span>10850</span> <span>Nanterre</span> <span class="country">(France)</span>
                 </div>
-                <ul class="record_actions"><li><a href="" class="sc-button bt-edit"></a></li></ul>
+                <ul class="record_actions"><li><a href="" class="btn btn-edit"></a></li></ul>
             </div>
         </div>
-        <div class="date">01 janvier 1970</div>
-        
+        <div class="date">01/01/1970</div>
+        {# END TEST #}
+
     </div>
 
-    <ul class="record_actions">
+    <ul class="record_actions sticky-form-buttons">
         <li class="cancel">
-            <a href="{{ path('chill_person_view', { 'person_id' : person.id } ) }}" class="sc-button bt-cancel">
-                    {{ 'Back to the person details'|trans }}
-                </a>
+            <a href="{{ path('chill_person_view', { 'person_id' : person.id } ) }}" class="btn btn-cancel">
+                {{ 'Back to the person details'|trans }}
+            </a>
         </li>
         <li>
-            <a class="sc-button bt-create"
+            <a class="btn btn-create"
                 href="{{ path('chill_person_address_new', { 'person_id' : person.id } ) }}">
                 {{ 'Add an address'|trans }}
             </a>
         </li>
     </ul>
-
-{% endblock personcontent %}
+</div>
+{% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig
index 49e8fca5c..2365c2d03 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig
@@ -14,32 +14,32 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
-{% extends "@ChillPerson/layout.html.twig"  %}
+{% extends "@ChillPerson/Person/layout.html.twig" %}
 
 {% set activeRouteKey = '' %}
 
 {% block title %}{{ 'New address for %name%'|trans({ '%name%': person.firstName|capitalize ~ ' ' ~ person.lastName } )|capitalize }}{% endblock %}
 
 {% block personcontent %}
+<div class="address-new">
 
-    {% block content %}
-        <h1>{{ block('title') }}</h1>
-        <div id="address"></div>
-    {% endblock %}
+            {% block content %}
+                <h1>{{ block('title') }}</h1>
+                <div id="address"></div>
+            {% endblock %}
+            
+</div>
+{% endblock %}
 
-    {% block stylesheets %}
-        <link href="{{ asset('build/address.css') }}" type="text/css" rel="stylesheet" />
-    {% endblock %}
+{% block css %}
+    {{ encore_entry_link_tags('vue_address') }}
+{% endblock %}
 
-    {% block js %}
-        <script type="text/javascript">
-            window.personId = {{ person.id|e('js') }};
-            window.mode = 'new';
-            window.vueRootComponent = 'app';
-        </script>
-        {{ encore_entry_script_tags('address') }}
-    {% endblock %}
-
-
-
-{% endblock personcontent %}
+{% block js %}
+    <script type="text/javascript">
+        window.personId = {{ person.id|e('js') }};
+        window.mode = 'new';
+        window.vueRootComponent = 'app';
+    </script>
+    {{ encore_entry_script_tags('vue_address') }}
+{% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Admin/layout.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Admin/layout.html.twig
index 04398026a..600fdcc3b 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Admin/layout.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Admin/layout.html.twig
@@ -25,7 +25,7 @@
 {% endblock %}
 
 {% block layout_wvm_content %}
-    <div class="grid-12 centered">
+    <div class="col-12 centered">
     <h1>{{ 'Configuration of person bundle' |trans }}</h1>
     
     <p>{{ 'person_admin.What would you like to configure ?'|trans }}</p>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/CRUD/_index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/CRUD/_index.html.twig
index 14e10af4e..78308a27f 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/CRUD/_index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/CRUD/_index.html.twig
@@ -4,7 +4,7 @@
     <ul class="record_actions sticky-form-buttons">
     {% block add_new %}
         <li>
-            <a href="{{ chill_path_add_return_path('chill_crud_' ~ crud_name ~ '_new', { 'person_id': person.id }) }}" class="sc-button bt-new">{{ ('crud.'~crud_name~'.index.add_new')|trans( {'%crud_name%': crud_name} ) }}</a>
+            <a href="{{ chill_path_add_return_path('chill_crud_' ~ crud_name ~ '_new', { 'person_id': person.id }) }}" class="btn btn-new">{{ ('crud.'~crud_name~'.index.add_new')|trans( {'%crud_name%': crud_name} ) }}</a>
         </li>
     {% endblock %}
     </ul>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/CRUD/_new_content.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/CRUD/_new_content.html.twig
index 83f35fcc7..db46aede9 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/CRUD/_new_content.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/CRUD/_new_content.html.twig
@@ -2,28 +2,28 @@
 
 {% block content_form_actions_back %}
     <li class="cancel">
-        <a class="sc-button bt-cancel" href="{{ chill_return_path_or('chill_crud_'~crud_name~'_index', { 'person_id': person.id }) }}">
+        <a class="btn btn-cancel" href="{{ chill_return_path_or('chill_crud_'~crud_name~'_index', { 'person_id': person.id }) }}">
             {{ 'Cancel'|trans }}
         </a>
     </li>
 {% endblock %} 
 {% block content_form_actions_save_and_close %}
     <li class="">
-        <button type="submit" name="submit" value="save-and-close" class="sc-button bt-create">
+        <button type="submit" name="submit" value="save-and-close" class="btn btn-create">
             {{ 'crud.new.save_and_close'|trans }}
         </button>
     </li>
 {% endblock %}
 {% block content_form_actions_save_and_show %}
     <li class="">
-        <button type="submit" name="submit" value="save-and-show" class="sc-button bt-create">
+        <button type="submit" name="submit" value="save-and-show" class="btn btn-create">
             {{ 'crud.new.save_and_show'|trans }}
         </button>
     </li>
 {% endblock %}
 {% block content_form_actions_save_and_new %}
     <li class="">
-        <button type="submit" name="submit" value="save-and-new" class="sc-button bt-create">
+        <button type="submit" name="submit" value="save-and-new" class="btn btn-create">
             {{ 'crud.new.save_and_new'|trans }}
         </button>
     </li>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/CRUD/_view_content.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/CRUD/_view_content.html.twig
index e7076bf55..273b64cc7 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/CRUD/_view_content.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/CRUD/_view_content.html.twig
@@ -2,7 +2,7 @@
 
 {% block content_view_actions_back %}
     <li class="cancel">
-        <a class="sc-button bt-cancel" href="{{ chill_return_path_or('chill_crud_'~crud_name~'_index', { 'person_id': person.id }) }}">
+        <a class="btn btn-cancel" href="{{ chill_return_path_or('chill_crud_'~crud_name~'_index', { 'person_id': person.id }) }}">
             {{ 'Cancel'|trans }}
         </a>
     </li>
@@ -13,7 +13,7 @@
     {% if chill_crud_action_exists(crud_name, 'delete') %}
     {% if is_granted(chill_crud_config('role', crud_name, 'delete'), entity) %}
     <li class="">
-        <a class="sc-button bt-delete" href="{{ chill_path_add_return_path('chill_crud_'~crud_name~'_delete', { 'id': entity.id, 'person_id': person.id }) }}">
+        <a class="btn btn-delete" href="{{ chill_path_add_return_path('chill_crud_'~crud_name~'_delete', { 'id': entity.id, 'person_id': person.id }) }}">
             {{ 'crud.delete.link_to_form'|trans }}
         </a>
     </li>
@@ -25,7 +25,7 @@
     {% if chill_crud_action_exists(crud_name, 'new') %}
     {% if is_granted(chill_crud_config('role', crud_name, 'new'), entity) %}
         <li>
-            <a class="sc-button bt-duplicate" href="{{ chill_path_add_return_path('chill_crud_'~crud_name~'_new', { 'duplicate_id': entity.id, 'duplicate': true, 'person_id': person.id }) }}">
+            <a class="btn btn-duplicate" href="{{ chill_path_add_return_path('chill_crud_'~crud_name~'_new', { 'duplicate_id': entity.id, 'duplicate': true, 'person_id': person.id }) }}">
                 {{ 'crud.view.link_duplicate'|trans }}
             </a>
         </li>
@@ -37,7 +37,7 @@
     {% if chill_crud_action_exists(crud_name, 'edit') %}
     {% if is_granted(chill_crud_config('role', crud_name, 'edit'), entity) %}
         <li>
-            <a class="sc-button bt-edit" href="{{ chill_path_forward_return_path('chill_crud_'~crud_name~'_edit', { 'id': entity.id, 'person_id': person.id }) }}">
+            <a class="btn btn-edit" href="{{ chill_path_forward_return_path('chill_crud_'~crud_name~'_edit', { 'id': entity.id, 'person_id': person.id }) }}">
                 {{ 'crud.new.link_edit'|trans }}
             </a>
         </li>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/CRUD/delete.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/CRUD/delete.html.twig
index ca132c3dd..51eae1c29 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/CRUD/delete.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/CRUD/delete.html.twig
@@ -1,4 +1,4 @@
-{% extends '@ChillPerson/layout.html.twig' %}
+{% extends '@ChillPerson/Person/layout.html.twig' %}
 
 {% set person = entity.person %}
 {% set activeRouteKey = '' %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/CRUD/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/CRUD/edit.html.twig
index 08f8a589d..2ea43a3ff 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/CRUD/edit.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/CRUD/edit.html.twig
@@ -1,4 +1,4 @@
-{% extends '@ChillPerson/layout.html.twig' %}
+{% extends '@ChillPerson/Person/layout.html.twig' %}
 
 {% set person = entity.person %}
 {% set activeRouteKey = '' %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/CRUD/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/CRUD/index.html.twig
index f7e3aa2f2..9356c0e7a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/CRUD/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/CRUD/index.html.twig
@@ -1,4 +1,4 @@
-{% extends '@ChillPerson/layout.html.twig' %}
+{% extends '@ChillPerson/Person/layout.html.twig' %}
 
 {% set activeRouteKey = '' %}
 
@@ -8,8 +8,8 @@
     {% embed '@ChillPerson/CRUD/_index.html.twig' %}
         {% block add_new %}
             <li>
-                <a href="{{ chill_path_add_return_path('chill_crud_' ~ crud_name ~ '_new', { 'person_id': person.id } ) }}" class="sc-button bt-new">{{ ('crud.'~crud_name~'.index.add_new')|trans( {'%crud_name%': crud_name} ) }}</a>
+                <a href="{{ chill_path_add_return_path('chill_crud_' ~ crud_name ~ '_new', { 'person_id': person.id } ) }}" class="btn btn-new">{{ ('crud.'~crud_name~'.index.add_new')|trans( {'%crud_name%': crud_name} ) }}</a>
             </li>
         {% endblock %}
     {% endembed %}
-{% endblock personcontent %}
+{% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/CRUD/new.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/CRUD/new.html.twig
index aae169447..fbb9f5492 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/CRUD/new.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/CRUD/new.html.twig
@@ -1,4 +1,4 @@
-{% extends '@ChillPerson/layout.html.twig' %}
+{% extends '@ChillPerson/Person/layout.html.twig' %}
 
 {% set person = entity.person %}
 {% set activeRouteKey = '' %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/CRUD/view.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/CRUD/view.html.twig
index 148b4bc34..762d5e4b0 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/CRUD/view.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/CRUD/view.html.twig
@@ -1,4 +1,4 @@
-{% extends '@ChillPerson/layout.html.twig' %}
+{% extends '@ChillPerson/Person/layout.html.twig' %}
 
 {% set person = entity.person %}
 {% set activeRouteKey = '' %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/ClosingMotive/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/ClosingMotive/index.html.twig
index fcf91dbec..bdddd6782 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/ClosingMotive/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/ClosingMotive/index.html.twig
@@ -24,11 +24,11 @@
                 <td>
                     <ul class="record_actions">
                         <li>
-                            <a href="{{ chill_path_add_return_path('chill_crud_closing_motive_edit', { 'id': entity.id }) }}" class="sc-button bt-edit"></a>
+                            <a href="{{ chill_path_add_return_path('chill_crud_closing_motive_edit', { 'id': entity.id }) }}" class="btn btn-edit"></a>
                         </li>
                         {% if entity.active %}
                         <li>
-                            <a href="{{ chill_path_add_return_path('chill_crud_closing_motive_new', { 'parent_id': entity.id } ) }}" class="sc-button bt-new">{{ 'closing_motive.new child'|trans }}</a>
+                            <a href="{{ chill_path_add_return_path('chill_crud_closing_motive_new', { 'parent_id': entity.id } ) }}" class="btn btn-new">{{ 'closing_motive.new child'|trans }}</a>
                         </li>
                         {% endif %}
                     </ul>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig
index 24afd7bf3..1c75bcac1 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig
@@ -1,17 +1,135 @@
-<span class="chill-entity chill-entity__person">
-  {%- if addLink and is_granted('CHILL_PERSON_SEE', person) -%}
-    {%- set showLink = true -%}<a href="{{ chill_path_add_return_path('chill_person_view', { 'person_id': person.id }) }}">{%- endif -%}
-    <span class="chill_denomination">{{ person.firstName }}</span>
-    <span class="chill_denomination">{{ person.lastName }}</span>
-    {%- if addAltNames -%}
-      {%- for n in person.altNames -%}
-        {%- if loop.first -%}({% else %} {%- endif -%}
-          <span class="chill-entity__person__alt-name chill-entity__person__altname--{{ n.key }}">
-            {{- n.label -}}
-          </span>
-        {%- if loop.last -%}) {%- endif -%}
-      {%- endfor -%}
+{#
+    Template to render a person
+    OPTIONS
+    * render        string ['raw'|'label'|'bloc']
+    * addAltNames   bool
+    * addLink       bool
+    * addEntity     bool
+    * addId         bool
+    * addInfo       bool
+    * addAge        bool
+    * hLevel        integer
+    * customButtons [
+        'before'    Twig\Markup, (injected with macro)
+        'replace'   Twig\Markup,
+        'after'     Twig\Markup
+    ]
+#}
+
+{% macro raw(person, options) %}
+    <span class="firstname">{{ person.firstName }}</span>
+    <span class="lastname">{{ person.lastName }}</span>
+    {%- if options['addAltNames'] -%}
+        <span class="altnames">
+        {%- for n in person.altNames -%}
+            <span class="altname altname-{{ n.key }}">
+                {{- n.label -}}
+            </span>
+        {%- endfor -%}
+        </span>
     {%- endif -%}
-  {%- if showLink is defined -%}</a>{%- endif -%}
-{#- tricks to remove easily whitespace after template -#}
-{%- if true -%}</span>{%- endif -%}
+{% endmacro raw %}
+
+{% macro label(person, options) %}
+    <div class="entity-label">
+
+        <div class="denomination {{ 'h' ~ options['hLevel'] }}">
+            {%- if options['addLink'] and is_granted('CHILL_PERSON_SEE', person) -%}
+                <a href="{{ chill_path_add_return_path('chill_person_view', { 'person_id': person.id }) }}">
+                    {{ _self.raw(person, options) }}
+                </a>
+            {%- else -%}
+                {{ _self.raw(person, options) }}
+            {%- endif -%}
+            {%- if options['addEntity'] -%}
+                <span class="badge rounded-pill bg-secondary">{{ 'Person'|trans }}</span>
+            {%- endif -%}
+            {%- if options['addId'] -%}
+                <span class="id-number" title="{{ 'Person'|trans ~ ' n° ' ~ person.id }}">
+                    {{ person.id|upper }}
+                </span>
+            {%- endif -%}
+        </div>
+        {%- if options['addInfo'] -%}
+            {% set gender = (person.gender == 'woman') ? 'fa-venus' :
+                (person.gender == 'man') ? 'fa-mars' : 'fa-neuter' %}
+            {% set genderTitle = (person.gender == 'woman') ? 'woman' :
+                (person.gender == 'man') ? 'man' : 'neuter' %}
+            <p class="moreinfo">
+                <i class="fa fa-fw {{ gender }}" title="{{ genderTitle|trans }}"></i>
+                <time datetime="{{ person.birthdate|date('Y-m-d') }}" title="{{ 'Birthdate'|trans }}">
+                {{ 'Born the date'|trans({'gender': person.gender,
+                    'birthdate': person.birthdate|format_date("medium") }) }}
+                </time>
+                {%- if options['addAge'] -%}
+                    <span class="age">
+                        {{ 'years_old'|trans({ 'age': person.age }) }}
+                    </span>
+                {%- endif -%}
+            </p>
+        {%- endif -%}
+    {#- tricks to remove easily whitespace after template -#}
+    {%- if true -%}</div>{%- endif -%}
+{% endmacro label %}
+
+
+{%- if render == 'raw' -%}
+    {{ _self.raw(person, options) }}
+{%- endif -%}
+
+{%- if render == 'label' -%}
+    {{ _self.label(person, options) }}
+{%- endif -%}
+
+{%- if render == 'bloc' -%}
+<div class="item-row entity-bloc">
+    <div class="item-col">
+        {{ _self.label(person, options) }}
+    </div>
+    <div class="item-col">
+        <ul class="list-content fa-ul">
+            {{ person.getLastAddress|chill_entity_render_box({
+                'render': 'list',
+                'with_picto': true,
+                'multiline': false,
+                'with_valid_from': false
+            }) }}
+            <li>
+                {% if person.mobilenumber %}
+                    <i class="fa fa-li fa-mobile"></i><a href="{{ 'tel:' ~ person.mobilenumber }}">
+                        {{ person.mobilenumber|chill_format_phonenumber }}
+                    </a>
+                {% else %}
+                    <i class="fa fa-li fa-phone"></i>
+                    {% if person.phonenumber %}
+                        <a href="{{ 'tel:' ~ person.phonenumber }}">
+                            {{ person.phonenumber|chill_format_phonenumber }}
+                        </a>
+                    {% else %}
+                        <span class="chill-no-data-statement">{{ 'No data given'|trans }}</span>
+                    {% endif %}
+                {% endif %}
+            </li>
+        </ul>
+        <ul class="record_actions">
+            {% if options['customButtons']['before'] is defined %}
+                {{ options['customButtons']['before'] }}
+            {% endif %}
+
+            {%- if options['customButtons']['replace'] is not defined and is_granted('CHILL_PERSON_SEE', person) -%}
+                <li>
+                    <a class="btn btn-show" target="_blank" title="{{ 'Show person'|trans }}"
+                    href="{{ path('chill_person_view', { person_id: person.id }) }}"></a>
+                </li>
+            {%- else -%}
+                {{ options['customButtons']['replace'] }}
+            {%- endif -%}
+
+            {% if options['customButtons']['after'] is defined %}
+                {{ options['customButtons']['after'] }}
+            {% endif %}
+        </ul>
+    </div>
+</div>
+{%- endif -%}
+
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Entity/social_action.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Entity/social_action.html.twig
index 858643e95..d8971c41b 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Entity/social_action.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Entity/social_action.html.twig
@@ -1,6 +1,6 @@
 {% set reversed_parents = parents|reverse %}
 <span class="chill-entity chill-entity__social-action">
-  <span class="{% if not options['no-badge'] %}badge badge-primary{% endif %}">
+  <span class="{% if not options['no-badge'] %}badge bg-primary{% endif %}">
     {%- for p in reversed_parents %}
     <span class="chill-entity__social-action__parent--{{ loop.revindex0 }}">
       {{ p.title|localize_translatable_string }}{{ options['default.separator'] }}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Entity/social_issue.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Entity/social_issue.html.twig
index 2db894e3c..997fd4eda 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Entity/social_issue.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Entity/social_issue.html.twig
@@ -1,6 +1,6 @@
 {% set reversed_parents = parents|reverse %}
 <span class="chill-entity chill-entity__social-issue">
-  <span class="badge badge-primary">
+  <span class="badge bg-primary">
     {%- for p in reversed_parents %}
     <span class="chill-entity__social-issue__parent--{{ loop.revindex0 }}">
       {{ p.title|localize_translatable_string }}{{ options['default.separator'] }}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Form/go_to_form.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Form/go_to_form.html.twig
index 8e72a48e2..78c65fc34 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Form/go_to_form.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Form/go_to_form.html.twig
@@ -1 +1 @@
-<a class="sc-button black" href="{{ path(form_path_key, form_path_args) }}">{{ 'Edit'|trans|upper }}</a>
\ No newline at end of file
+<a class="btn btn-dark" href="{{ path(form_path_key, form_path_args) }}">{{ 'Edit'|trans|upper }}</a>
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/Member/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/Member/edit.html.twig
index 01d605d9d..85fee6ec9 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/Member/edit.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/Member/edit.html.twig
@@ -13,13 +13,13 @@
   <li class="cancel">
     <a 
       href="{{ chill_return_path_or('chill_person_household_summary', { 'household_id': household.id}) }}"
-      class="sc-button bt-cancel"
+      class="btn btn-cancel"
       >
       {{ 'Cancel'|trans }}
     </a>
   </li>
   <li>
-    <button type="submit" class="sc-button bt-save">{{ 'Save'|trans }}</button>
+    <button type="submit" class="btn btn-save">{{ 'Save'|trans }}</button>
   </li>
 </ul>
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/accompanying_period.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/accompanying_period.html.twig
index 132bf5a33..b060087d8 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/accompanying_period.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/accompanying_period.html.twig
@@ -3,23 +3,26 @@
 {% block title 'Household accompanying period'|trans %}
 
 {% block content %}
-<h1>{{ block('title') }}</h1>
+<div class="household-members">
 
-{% include 'ChillPersonBundle:AccompanyingPeriod:_list.html.twig' %}
+            <h1>{{ block('title') }}</h1>
+
+            {% include 'ChillPersonBundle:AccompanyingPeriod:_list.html.twig' %}
+
+            <div class="form_control">
+                <ul class="record_actions">
+                    <li class="cancel">
+                        <a href="{{ path ('chill_person_household_summary', {'household_id' : household.id } ) }}" class="btn btn-cancel">
+                            {{ 'Household summary'|trans }}
+                        </a>
+                    </li>
+                    {#<li>
+                        <a href="{{ path ('chill_person_household_accompanying_course_new', {'household_id' : [ household.id ] } ) }}" class="btn btn-create">
+                          {{ 'Create an accompanying period'|trans }}
+                        </a>
+                    </li>#}
+                </ul>
+            </div>
 
-<div class="form_control">
-    <ul class="record_actions">
-        <li class="cancel">
-            <a href="{{ path ('chill_person_household_summary', {'household_id' : household.id } ) }}" class="sc-button bt-cancel">
-                {{ 'Household summary'|trans }}
-            </a>
-        </li>
-        {#<li>
-            <a href="{{ path ('chill_person_household_accompanying_course_new', {'household_id' : [ household.id ] } ) }}" class="sc-button bt-create">
-              {{ 'Create an accompanying period'|trans }}
-            </a>
-        </li>#}
-    </ul>
 </div>
-
 {% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig
index 95c57d7bc..935eb70fa 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig
@@ -10,7 +10,7 @@
     </div>
 
     {% block stylesheets %}
-        <link href="{{ asset('build/address.css') }}" type="text/css" rel="stylesheet" />
+        {{ encore_entry_link_tags('vue_address') }}
     {% endblock %}
 
     {% block js %}
@@ -20,7 +20,7 @@
             window.mode = 'edit';
             window.vueRootComponent = 'app';
         </script>
-        {{ encore_entry_script_tags('household_address') }}
+        {{ encore_entry_script_tags('vue_household_address') }}
     {% endblock %}
 
 {% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig
index 16f693e61..095ae26ff 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig
@@ -10,7 +10,7 @@
     </div>
 
     {% block stylesheets %}
-        <link href="{{ asset('build/address.css') }}" type="text/css" rel="stylesheet" />
+        {{ encore_entry_link_tags('vue_address') }}
     {% endblock %}
 
     {% block js %}
@@ -18,7 +18,7 @@
             window.householdId = {{ household.id|e('js') }};
             window.vueRootComponent = 'app';
         </script>
-        {{ encore_entry_script_tags('household_address') }}
+        {{ encore_entry_script_tags('vue_household_address') }}
     {% endblock %}
 
 {% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig
index 8cfbd6c9b..2f66447f8 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig
@@ -3,67 +3,85 @@
 {% block title 'Addresses history for household'|trans %}
 
 {% block content %}
-<h1>{{ block('title') }}</h1>
+<div class="household-address">
 
-<div class="address-timeline grid">
+    <h1>{{ block('title') }}</h1>
 
-    {% if household.addresses|length == 0 %}
-        <span class="chill-no-data-statement">{{ 'No address given'|trans }}</span>
-    {% else %}
-        <div class="top"><i class="fa fa-caret-up fa-3x"></i></div>
-    {% endif %}
+    <ul class="record_actions my-3">
+        <li style="margin: auto;">
+            <a class="btn btn-lg btn-create"
+               href="{{ chill_path_add_return_path('chill_person_household_address_move', { 'household_id': household.id }) }}">
+                {{ 'Move household'|trans }}
+            </a>
+        </li>
+    </ul>
 
-    {% for address in household.addresses %}
+    <div class="address-timeline grid">
 
-        <div class="col-b"></div>
+        {% if household.addresses|length == 0 %}
+            <span class="chill-no-data-statement">{{ 'No address given'|trans }}</span>
+        {% else %}
+            <div class="top"><i class="fa fa-caret-up fa-3x"></i></div>
+        {% endif %}
 
-        <div class="col-c content{{ ' row' ~ loop.index }}">
-            <div class="address">
-                {% if address.isNoAddress == true %}
-                    <div class="chill_address_is_noaddress">{{ 'address.consider homeless'|trans }}</div>
-                {% else %}
-                    {% if address.street is not empty %}
-                    <div class="street">
-                        <span class="streetNumber">{{ address.street }}</span>
-                        {% if address.streetNumber is not empty %}
-                            <span class="streetNumber">, {{ address.streetNumber }}</span>
-                        {% endif %}
-                    </div>
-                    {% endif %}
-                    {% if address.postCode is not empty %}
-                        <div class="postCode">
-                            <span>{{ address.postCode.code }}</span> <span>{{ address.postCode.name }}</span>
-                            <span class="country">({{ address.postCode.country.name|localize_translatable_string }})</span>
-                        </div>
+        {% set row = 0 %}
+        {% set previousRowFrom = null %}
+
+        {% for address in household.addresses %}
+
+            {% set row = row + 1 %}
+            {% if address.validTo is not empty and address.validTo < previousRowFrom %}
+
+                <div class="{{ 'row' ~ row ~ ' ' }}col-b"></div>
+                <div class="{{ 'row' ~ row ~ ' ' }}col-c action">
+                    <a href="" class="btn btn-sm btn-create">{{ 'Insert an address'|trans }}</a></div>
+                <div class="date">
+                    {% if address.validTo is not empty %}
+                        {{ address.validTo|format_date('short') }}
                     {% endif %}
+                </div>
 
+                {% set row = row + 1 %}
+            {% endif %}
+
+            <div class="{{ 'row' ~ row ~ ' ' }}col-b"></div>
+            <div class="{{ 'row' ~ row ~ ' ' }}col-c content">
+                {{ address|chill_entity_render_box({
+                    'render': 'bloc',
+                    'multiline': true,
+                    'extended_infos': true,
+                    'has_no_address': true
+                }) }}
+                <ul class="record_actions">
+                    <li>
+                        <a href="{{ path('chill_person_household_address_edit', { 'household_id': household.id, 'address_id' : address.id } ) }}" class="btn btn-edit"></a>
+                    </li>
+                </ul>
+            </div>
+
+            <div class="date">
+                {% if address.validFrom is not empty %}
+                    {{ address.validFrom|format_date('short') }}
                 {% endif %}
             </div>
 
-            {#<ul class="record_actions">
-                <li>
-                    <a href="{{ path('chill_person_household_address_edit', { 'household_id': household.id, 'address_id' : address.id } ) }}" class="sc-button bt-edit"></a>
-                </li>
-            </ul> #}
-        </div>
+            {% set previousRowFrom = address.validFrom %}
+        {% endfor %}
+    </div>
 
-        <div class="date">
-            {% if address.validFrom is not empty %}
-                {{ address.validFrom|format_date('long') }}
-            {% endif %}
-        </div>
-
-    {% endfor %}
+    <ul class="record_actions sticky-form-buttons">
+        <li class="cancel">
+            <a href="{{ path('chill_person_household_summary', { 'household_id' : household.id } ) }}" class="btn btn-cancel">
+                {{ 'Back to household'|trans }}
+            </a>
+        </li>
+        <li>
+            <a class="btn btn-create"
+            href="{{ chill_path_add_return_path('chill_person_household_address_move', { 'household_id': household.id }) }}">
+            {{ 'Move household'|trans }}
+            </a>
+        </li>
+    </ul>
 
 </div>
-
-<ul class="record_actions">
-    <li>
-        <a class="sc-button bt-create"
-        href="{{ chill_path_add_return_path('chill_person_household_address_move', { 'household_id': household.id }) }}">
-        {{ 'Move household'|trans }}
-        </a>
-    </li>
-</ul>
-
 {% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/banner.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/banner.html.twig
index ba06b47a5..7d358de80 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/banner.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/banner.html.twig
@@ -1,64 +1,72 @@
-<div class="subheader banner banner-household">
-    <div class="grid-12 parent" id="header-household-name" >
-        <div class="grid-10 push-1 grid-mobile-12 grid-tablet-12 push-mobile-0 push-tablet-0 parent">
+<div class="banner banner-household">
+    <div id="header-household-name" class="header-name">
+        <div class="container-xxl">
+            <div class="row">
 
-            <div class="grid-7">
-                <h1>
-                    <i class="fa fa-home"></i>
-                    {{ 'household.Household'|trans }}
-                    <span class="id-number">{{ household.id }}</span>
-                </h1>
-            </div>
+                <div class="col-md-4 col-lg-3 ps-md-5 ps-xxl-0">
+                    <h1>
+                        <i class="fa fa-home"></i>
+                        {{ 'household.Household'|trans }}
+                        <span class="id-number">{{ household.id }}</span>
+                    </h1>
+                </div>
 
-            <div class="grid-5">
-                <ul class="list-content fa-ul">
-                    <li>
-                        {% set address = household.currentAddress %}
-                        <i class="fa fa-li fa-map-marker"></i>
-                        {% if address is empty %}
-                        <p class="chill-no-data-statement">{{ 'household.Household does not have any address currently'|trans }}</p>
-                        {% else %}
-                            {{ address|chill_entity_render_box({'multiline': false, 'with_valid_from': false}) }}
-                        {% endif %}
-                    </li>
-                </ul>
-            </div>
-
-        </div>
-    </div>
-    <div class="grid-12 parent" id="header-household-details" >
-        <div class="grid-10 push-1 grid-mobile-12 grid-tablet-12 push-mobile-0 push-tablet-0 parent">
-            
-            <div id="banner-misc" class="members">
-                {%- set members = household.getCurrentMembersOrdered() -%}
-                {%- if members|length > 0 -%}
-                    <span class="current-members-explain" style="display: none;">
-                        {{- 'household.Current household members'|trans }}
-                        <i class="fa fa-fw fa-users" title="{{- 'household.Current household members'|trans }}"></i>
-                    </span>
-                    
-                    {%- for m in members|slice(0, 5) -%}
-                        <span 
-                            class="badge-member{%- if m.holder %} holder{% endif -%}{%- if m.position.ordering >= 2 %} child{% endif -%}"
-                            title="{{ m.position.label.fr }}">
-                            {%- if m.holder %} 
-                            <span class="badge badge-secondary">
-                                {{ 'household.holder'|trans }}
+                <div class="col-md-8 col-lg-9">
+                    <div class="household-members my-3 pe-md-5 pe-xxl-0 justify-content-md-end">
+                        {%- set members = household.getCurrentMembersOrdered() -%}
+                        {%- if members|length > 0 -%}
+                            <span class="current-members-explain" style="display: none;">
+                                {{- 'household.Current household members'|trans }}
+                                <i class="fa fa-fw fa-users" title="{{- 'household.Current household members'|trans }}"></i>
                             </span>
-                            {% endif -%}
-                            {{- m.person|chill_entity_render_box({'addLink': false}) -}}
-                        </span>
-                    {%- endfor -%}
-                    
-                    {% if members|length > 5 %}
-                        <span class="current-members-more">
-                            {{ 'household.and x other persons'|trans({'x': members|length-5}) }}
-                        </span>
-                    {% endif %} 
-                {%- endif -%}
+
+                            {%- for m in members|slice(0, 5) -%}
+                                <span
+                                    class="badge-member{%- if m.holder %} holder{% endif -%}{%- if m.position.ordering >= 2 %} child{% endif -%}"
+                                    title="{{ m.position.label.fr }}">
+                                    {%- if m.holder %}
+                                        <span class="badge bg-chill-light-gray text-chill-gray">
+                                        {{ 'household.holder'|trans }}
+                                    </span>
+                                    {% endif -%}
+                                    {{- m.person|chill_entity_render_box({'addLink': false}) -}}
+                                </span>
+                            {%- endfor -%}
+
+                            {% if members|length > 5 %}
+                                <span class="current-members-more">
+                                    {{ 'household.and x other persons'|trans({'x': members|length-5}) }}
+                                </span>
+                            {% endif %}
+                        {%- endif -%}
+                    </div>
+                </div>
+
             </div>
-            
         </div>
     </div>
+    <div id="header-household-details" class="header-details">
+        <div class="container-xxl">
+            <div class="row justify-content-md-right">
+
+                <div class="contact col-md-12 ps-md-5 ps-xxl-0">
+                    {% set address = household.currentAddress %}
+                    {% if address is empty %}
+                        <span class="chill-no-data-statement">
+                            {{ 'household.Household does not have any address currently'|trans }}
+                        </span>
+                    {% else %}
+                        <span class=" d-block d-sm-inline-block">
+                            {{ address|chill_entity_render_box({
+                                'render': 'inline', 'multiline': false, 'with_picto': true, 'with_delimiter': true
+                            }) }}
+                        </span>
+                    {% endif %}
+
+                </div>
+
+            </div>
+        </div>
+    </div>
+    <a id="banner-household"></a>
 </div>
-<span id="banner-household"></span>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/edit_member_metadata.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/edit_member_metadata.html.twig
index 74ccf87bd..23cff6bb9 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/edit_member_metadata.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/edit_member_metadata.html.twig
@@ -19,15 +19,15 @@
 
 <ul class="record_actions sticky-form-buttons">
   <li class="cancel">
-    <a 
+    <a
       href="{{ chill_path_add_return_path('chill_person_household_members', { 'household_id': household.id }) }}"
-      class="sc-button bt-cancel"
+      class="btn btn-cancel"
       />
       {{ 'Cancel'|trans }}
     </a>
   </li>
   <li>
-    <button type="submit" class="sc-button bt-save">
+    <button type="submit" class="btn btn-save">
       {{ 'Save'|trans }}
     </button>
   </li>
@@ -38,5 +38,5 @@
 {% endblock %}
 
 {% block js %}
-{{ encore_entry_script_tags('household_edit_metadata') }}
+{{ encore_entry_script_tags('page_household_edit_metadata') }}
 {% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/layout.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/layout.html.twig
index 6b8faa4b0..d97de654f 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/layout.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/layout.html.twig
@@ -1,17 +1,20 @@
-{% extends "ChillMainBundle::layoutWithVerticalMenu.html.twig" %}
+{% extends "@ChillMain/layoutWithVerticalMenu.html.twig" %}
 
 {% block top_banner %}
     {{ include('@ChillPerson/Household/banner.html.twig', { title: block('title') }) }}
 {% endblock %}
 
 {% block layout_wvm_content %}
-    {% block content %}{% endblock %}
+    <div class="row justify-content-center">
+        <div class="col-md-10 col-xxl">
+            {% block content %}{% endblock %}
+        </div>
+    </div>
 {% endblock  %}
 
 {% block vertical_menu_content %}
     {{ chill_menu('household', {
-        'layout': '@ChillPerson/Household/menu.html.twig',
+        'layout': '@ChillPerson/menu.html.twig',
         'args' : { 'household': household }
     }) }}
 {% endblock %}
-
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/members.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/members.html.twig
deleted file mode 100644
index afffc2edb..000000000
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/members.html.twig
+++ /dev/null
@@ -1,198 +0,0 @@
-{% extends '@ChillPerson/Household/layout.html.twig' %}
-
-{% block title 'household.Household members'|trans %}
-
-{% block content %}
-<h1>{{ block('title') }}</h1>
-
-{% if form is not null %}
-  {{ form_start(form) }}
-
-  {{ form_row(form.commentMembers) }}
-
-  <div id="waitingForBirthContainer">
-  {{ form_row(form.waitingForBirth) }}
-  </div>
-
-  <div id="waitingForBirthDateContainer">
-  {{ form_row(form.waitingForBirthDate) }}
-  </div>
-
-  <ul class="record_actions">
-    <li>
-      <button type="submit" class="sc-button bt-save">
-        {{ 'Save'|trans }}
-      </button>
-    </li>
-  </ul>
-
-  {{ form_end(form) }}
-
-{% else %}
-
-  {% if not household.commentMembers.isEmpty() %}
-      {{ household.commentMembers|chill_entity_render_box }}
-  {% endif %}
-
-  {% if household.waitingForBirth %}
-    {% if household.waitingForBirthDate is not null %}
-    {{ 'household.Expecting for birth on date'|trans({ 'date': household.waitingForBirthDate|format_date('long') }) }}
-    {% else %}
-    {{ 'household.Expecting for birth'|trans }}
-    {% endif %}
-  {% else %}
-    <p class="chill-no-data-statement">
-      {{ 'household.Any expecting birth'|trans }}
-    </p>
-  {% endif %}
-
-  <ul class="record_actions">
-    <li>
-      <a 
-        href="{{ chill_path_add_return_path('chill_person_household_members', { 'household_id': household.id, 'edit': 1 }) }}"
-        class="sc-button bt-edit"
-        >
-        {{ 'household.Comment and expecting birth'|trans }}
-      </a>
-    </li>
-  </ul>
-
-{% endif %}
-
-{% for p in positions %}
-  <h3>{{ p.label|localize_translatable_string }}</h3>
-
-  {% if false == p.shareHousehold %}
-    <p>{{ 'household.Those members does not share address'|trans }}</p>
-  {% endif %}
-
-  {%- set members = household.currentMembersByPosition(p) %}
-  {% if members|length > 0 %}
-    <div class="flex-table list-household-members">
-      {% for m in members %}
-        <div class="item-bloc">
-          <div class="item-row person">
-            <div class="item-col box-person">
-              <div>
-                {{ m.person|chill_entity_render_box({'addLink': true}) }}
-                {% if m.holder %}
-                  <span class="badge badge-primary">{{ 'household.holder'|trans }}</span>
-                {% endif %}
-              </div>
-              <div>
-                {{ 'Born the date'|trans({ 'gender': m.person.gender, 'birthdate': m.person.birthdate|format_date('long') }) }}
-              </div>
-            </div>
-            <div class="item-col box-where">
-              <ul class="list-content fa-ul">
-                {% if m.startDate is not empty %}
-                  <li>{{ 'Since %date%'|trans({'%date%': m.startDate|format_date('long') }) }}</li>
-                {% endif %}
-                {% if m.endDate is not empty %}
-                  <li>{{ 'Until %date%'|trans({'%date%': m.endDate|format_date('long') }) }}</li>
-                {% endif %}
-              </ul>
-              <ul class="record_actions">
-                <li>
-                  <a 
-                  href="{{ chill_path_add_return_path('chill_person_household_members_editor', {
-                      'persons': [ m.person.id ], 
-                      'allow_leave_without_household': true 
-                    } ) }}" class="sc-button" title="{{ 'household.Leave household'|trans }}" />
-                    <i class="fa fa-sign-out"></i>
-                    {{ 'household.Leave household'|trans }}
-                  </a>
-                </li>
-                <li>
-                    <a href="{{ chill_path_add_return_path('chill_person_household_member_edit', { 'id': m.id }) }}" 
-                    class="sc-button bt-edit" title="{{ 'household.Update membership'|trans }}"/></a>
-                </li>
-              </ul>
-            </div>
-          </div>
-          {% if m.comment is not empty %}
-            <div class="item-row comment">
-              <blockquote class="chill-user-quote">
-                {{ m.comment|chill_markdown_to_html }}
-              </blockquote>
-            </div>
-          {% endif %}
-        </div>
-      {% endfor %}
-    </div>
-  {% else %}
-  <p class="chill-no-data-statement">{{ 'household.Any persons into this position'|trans }}</p>
-  {% endif %}
-
-  {% set members = household.nonCurrentMembersByPosition(p) %}
-  {% if members|length > 0 %}
-    <p><!-- force a space after table --></p>
-    <button class="sc-button bt-green" type="button" data-toggle="collapse" data-target="#nonCurrent_{{ p.id }}" aria-expanded="false" aria-controls="collapse non current members">
-      {{ 'household.Show future or past memberships'|trans({'length': members|length}) }}
-    </button>
-
-    <div id="nonCurrent_{{ p.id }}" class="collapse">
-      <div class="flex-table list-household-members">
-        {% for m in members %}
-          <div class="item-bloc">
-            <div class="item-row person">
-              <div class="item-col box-person">
-                <div>
-                  {{ m.person|chill_entity_render_box({'addLink': true}) }}
-                  {% if m.holder %}
-                    <span class="badge badge-primary">{{ 'household.holder'|trans }}</span>
-                  {% endif %}
-                </div>
-                <div>
-                  {{ 'Born the date'|trans({ 'gender': m.person.gender, 'birthdate': m.person.birthdate|format_date('long') }) }}
-                </div>
-              </div>
-              <div class="item-col box-where">
-                <ul class="list-content fa-ul">
-                  {% if m.startDate is not empty %}
-                    <li>{{ 'Since %date%'|trans({'%date%': m.startDate|format_date('long') }) }}</li>
-                  {% endif %}
-                  {% if m.endDate is not empty %}
-                    <li>{{ 'Until %date%'|trans({'%date%': m.endDate|format_date('long') }) }}</li>
-                  {% endif %}
-                </ul>
-                <ul class="record_actions">
-                  <li>
-                    <a 
-                    href="{{ chill_path_add_return_path('chill_person_household_member_edit', { 'id': m.id }) }}" 
-                    class="sc-button bt-edit" title="{{ 'household.Update membership'|trans }}" /></a>
-                  </li>
-                </ul>
-              </div>
-            </div>
-            {% if m.comment is not empty %}
-            <div class="item-row comment">
-              <blockquote class="chill-user-quote">
-                {{ m.comment|chill_markdown_to_html }}
-              </blockquote>
-            </div>
-            {% endif %}
-          </div>
-        {% endfor %}
-      </div>
-    </div>
-
-  {% endif %}
-
-{% endfor %}
-
-<ul class="record_actions sticky-form-buttons">
-  <li>
-    <a 
-    href="{{ chill_path_add_return_path('chill_person_household_members_editor', {'household': household.id }) }}"
-      class="sc-button bt-create">
-      {{ 'household.Add a member'|trans }}
-    </a>
-  </li>
-</ul>
-
-{% endblock %}
-
-{% block js %}
-{{ encore_entry_script_tags('household_edit_metadata') }}
-{% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/members_editor.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/members_editor.html.twig
index cf02833da..86a4a1e79 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/members_editor.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/members_editor.html.twig
@@ -4,12 +4,12 @@
 {% block title 'household.Edit household members'|trans  %}
 
 {% block content %}
-  <div class="grid-12 parent">
-    <div class="grid-10 push-1 parent">
-      <h1>{{ block('title') }}</h1>
-      <div id="household_members_editor"></div>
-    </div>
-  </div>
+<div class="col-md-10 col-xxl household-members">
+
+    <h1>{{ block('title') }}</h1>
+    <div id="household_members_editor"></div>
+
+</div>
 {% endblock %}
 
 {% block js %}
@@ -17,9 +17,9 @@
     window.household_members_editor_data = {{ data|json_encode|raw }};
     window.household_members_editor_expand_suggestions = {{ expandSuggestions }};
   </script>
-  {{ encore_entry_script_tags('household_members_editor') }}
+  {{ encore_entry_script_tags('vue_household_members_editor') }}
 {% endblock %}
 
 {% block css %}
-  {{ encore_entry_link_tags('household_members_editor') }}
+  {{ encore_entry_link_tags('vue_household_members_editor') }}
 {% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/menu.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/menu.html.twig
deleted file mode 100644
index a60abe7eb..000000000
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/menu.html.twig
+++ /dev/null
@@ -1,7 +0,0 @@
-<ul class="tab-nav">
-    {% for menu in menus %}
-        <li class="">
-            <a href="{{ menu.uri }}" >{{ menu.label|upper }}</a>
-        </li>
-    {% endfor %}
-</ul>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
index 3393722c4..45b77a2bb 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
@@ -3,6 +3,8 @@
 {% block title 'household.Household summary'|trans %}
 
 {% block content %}
+<div class="household-summary">
+
 <h1>{{ block('title') }}</h1>
 
 <h2>{{ 'household.Current address'|trans }}</h2>
@@ -34,7 +36,7 @@
 
   <ul class="record_actions">
     <li>
-      <button type="submit" class="sc-button bt-save">
+      <button type="submit" class="btn btn-save">
         {{ 'Save'|trans }}
       </button>
     </li>
@@ -61,10 +63,8 @@
 
   <ul class="record_actions">
     <li>
-      <a 
-        href="{{ chill_path_add_return_path('chill_person_household_summary', { 'household_id': household.id, 'edit': 1 }) }}"
-        class="sc-button bt-edit"
-        >
+      <a href="{{ chill_path_add_return_path('chill_person_household_summary', { 'household_id': household.id, 'edit': 1 }) }}"
+        class="btn btn-edit">
         {{ 'household.Comment and expecting birth'|trans }}
       </a>
     </li>
@@ -90,7 +90,7 @@
               <div>
                 {{ m.person|chill_entity_render_box({'addLink': true}) }}
                 {% if m.holder %}
-                  <span class="badge badge-primary">{{ 'household.holder'|trans }}</span>
+                  <span class="badge bg-primary">{{ 'household.holder'|trans }}</span>
                 {% endif %}
               </div>
               <div>
@@ -108,40 +108,24 @@
               </ul>
               <ul class="record_actions">
                 <li>
-                  <a 
-                  href="{{ chill_path_add_return_path('chill_person_household_member_edit', { 'id': m.id }) }}" 
-                  class="sc-button bt-edit" 
-                  />
-                    {{ 'household.Update membership'|trans }}
-                  </a>
+                    <a href="{{ chill_path_add_return_path('chill_person_household_member_edit', { 'id': m.id }) }}"
+                        class="btn btn-edit" />
+                        {{ 'household.Update membership'|trans }}
+                    </a>
                 </li>
                 <li>
-                  <a 
-                  href="{{ chill_path_add_return_path(
-                    'chill_person_household_members_editor', 
-                    {
-                      'persons': [ m.person.id ],
-                      'household': household.id
-                    } ) }}"
-                    class="sc-button" 
-                    />
-                    <i class="fa fa-arrows-h"></i>
-                    {{ 'household.Change position'|trans }}
-                  </a>
+                    <a href="{{ chill_path_add_return_path('chill_person_household_members_editor', {'persons': [ m.person.id ], 'household': household.id} ) }}"
+                        class="btn btn-misc" />
+                        <i class="fa fa-arrows-h"></i>
+                        {{ 'household.Change position'|trans }}
+                    </a>
                 </li>
                 <li>
-                  <a 
-                  href="{{ chill_path_add_return_path(
-                    'chill_person_household_members_editor', 
-                    {
-                      'persons': [ m.person.id ], 
-                      'allow_leave_without_household': true 
-                    } ) }}"
-                    class="sc-button" 
-                    />
-                    <i class="fa fa-sign-out"></i>
-                    {{ 'household.Leave'|trans }}
-                  </a>
+                    <a href="{{ chill_path_add_return_path('chill_person_household_members_editor', {'persons': [ m.person.id ], 'allow_leave_without_household': true } ) }}"
+                        class="btn btn-misc" />
+                        <i class="fa fa-sign-out"></i>
+                        {{ 'household.Leave'|trans }}
+                    </a>
                 </li>
               </ul>
             </div>
@@ -163,7 +147,7 @@
   {% set members = household.nonCurrentMembersByPosition(p) %}
   {% if members|length > 0 %}
     <p><!-- force a space after table --></p>
-    <button class="sc-button bt-green" type="button" data-toggle="collapse" data-target="#nonCurrent_{{ p.id }}" aria-expanded="false" aria-controls="collapse non current members">
+    <button class="btn btn-green" type="button" data-bs-toggle="collapse" data-bs-target="#nonCurrent_{{ p.id }}" aria-expanded="false" aria-controls="collapse non current members">
       {{ 'household.Show future or past memberships'|trans({'length': members|length}) }}
     </button>
 
@@ -176,7 +160,7 @@
                 <div>
                   {{ m.person|chill_entity_render_box({'addLink': true}) }}
                   {% if m.holder %}
-                    <span class="badge badge-primary">{{ 'household.holder'|trans }}</span>
+                    <span class="badge bg-primary">{{ 'household.holder'|trans }}</span>
                   {% endif %}
                 </div>
                 <div>
@@ -194,10 +178,8 @@
                 </ul>
                 <ul class="record_actions">
                   <li>
-                    <a 
-                    href="{{ chill_path_add_return_path('chill_person_household_member_edit', { 'id': m.id }) }}" 
-                    class="sc-button bt-edit" 
-                    />
+                    <a href="{{ chill_path_add_return_path('chill_person_household_member_edit', { 'id': m.id }) }}"
+                    class="btn btn-edit">
                       {{ 'household.Update membership'|trans }}
                     </a>
                   </li>
@@ -221,17 +203,16 @@
 
 <ul class="record_actions">
   <li>
-    <a 
-    href="{{ chill_path_add_return_path('chill_person_household_members_editor', {'household': household.id }) }}"
-      class="sc-button bt-create">
+    <a href="{{ chill_path_add_return_path('chill_person_household_members_editor', {'household': household.id }) }}"
+      class="btn btn-create">
       {{ 'household.Add a member'|trans }}
     </a>
   </li>
 </ul>
 
+</div>
 {% endblock %}
 
 {% block js %}
-{{ encore_entry_script_tags('household_edit_metadata') }}
+{{ encore_entry_script_tags('page_household_edit_metadata') }}
 {% endblock %}
-
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/MaritalStatus/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/MaritalStatus/index.html.twig
index 65935aa96..52c9d5307 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/MaritalStatus/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/MaritalStatus/index.html.twig
@@ -16,7 +16,7 @@
                 <td>
                     <ul class="record_actions">
                         <li>
-                            <a href="{{ chill_path_add_return_path('chill_crud_marital_status_edit', { 'id': entity.id }) }}" class="sc-button bt-edit"></a>
+                            <a href="{{ chill_path_add_return_path('chill_crud_marital_status_edit', { 'id': entity.id }) }}" class="btn btn-edit"></a>
                         </li>
                     </ul>
                 </td>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/banner.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/banner.html.twig
new file mode 100644
index 000000000..b603dd70c
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/banner.html.twig
@@ -0,0 +1,68 @@
+<div class="banner banner-person">
+    <div id="header-person-name" class="header-name">
+        <div class="container-xxl">
+            <div class="row">
+
+                <div class="col-md-6 ps-md-5 ps-xxl-0">
+                    {{ person|chill_entity_render_box({
+                        'render': 'label', 'addInfo': true, 'addAge': true, 'addId': true, 'hLevel': 1
+                    }) }}
+                </div>
+
+                <div class="col-md-6">
+                    {{ include('@ChillPerson/Person/banner_custom.html.twig') }}
+                </div>
+
+            </div>
+        </div>
+    </div>
+    <div id="header-person-details" class="header-details">
+        <div class="container-xxl">
+            <div class="row justify-content-between">
+
+                <div class="col-md-12 ps-md-5 ps-xxl-0">
+                    <div class="contact">
+                        {% if person.phonenumber %}
+                            <span class="phonenumber d-block d-sm-inline-block">
+                                <i class="fa fa-fw fa-phone"></i>
+                                <a href="{{ 'tel:' ~ person.phonenumber }}" class="phone mr-3" title="{{ 'Phonenumber'|trans }}">
+                                    {{ person.phonenumber|chill_format_phonenumber }}</a>
+                            </span>
+                        {% endif %}
+                        {% if person.mobilenumber %}
+                            <span class="mobilenumber d-block d-sm-inline-block">
+                                <i class="fa fa-fw fa-mobile"></i>
+                                <a href="{{ 'tel:' ~ person.mobilenumber }}" class="phone mr-3" title="{{ 'Mobilenumber'|trans }}">
+                                    {{ person.mobilenumber|chill_format_phonenumber }}</a>
+                            </span>
+                        {% endif %}
+                        {% if person.email %}
+                            <span class="email d-block d-sm-inline-block">
+                                <i class="fa fa-fw fa-envelope-o"></i>
+                                <a href="{{ 'mailto:' ~ person.email }}" class="email" title="{{ 'Email'|trans }}">
+                                    {{ person.email }}
+                                </a>
+                            </span>
+                        {% endif %}
+
+                        {% set address = null %}
+                        {%- if person.currentHouseholdAddress is not empty -%}
+                            {% set address = person.currentHouseholdAddress %}
+                        {%- elseif person.lastAddress is not empty -%}
+                            {% set address = person.lastAddress %}
+                        {%- endif -%}
+                        {%- if address is not null -%}
+                            <span class=" d-block d-sm-inline-block">
+                                {{ address|chill_entity_render_box({
+                                    'render': 'inline', 'multiline': false, 'with_picto': true, 'with_delimiter': true
+                                }) }}
+                            </span>
+                        {%- endif -%}
+                    </div>
+                </div>
+
+            </div>
+        </div>
+    </div>
+    <a id="banner-person"></a>
+</div>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/banner_custom.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/banner_custom.html.twig
new file mode 100644
index 000000000..d01a53c22
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/banner_custom.html.twig
@@ -0,0 +1,27 @@
+{#
+    Overwrite this file to display client specific datas in custom area
+#}
+<div id="banner-person-custom" class="my-3 pe-md-5 pe-xxl-0 justify-content-end">
+    <div class="text-md-end mb-1">
+        {%- if chill_person.fields.nationality == 'visible' -%}
+            <span class="open_sansbold">
+                {{ 'Nationality'|trans|upper}} :
+            </span>
+            {% if person.nationality is not null %}
+                {{ person.nationality.name|localize_translatable_string }}
+            {% else %}
+                <span class="chill-no-data-statement">
+                    {% trans %}Without nationality{% endtrans %}
+                </span>
+            {% endif %}
+        {%- endif -%}
+    </div>
+    <div class="text-md-end">
+        {%- if chill_person.fields.spoken_languages == 'visible' -%}
+            <span class="open_sansbold">
+                {{ 'Center'|trans|upper}} :
+            </span>
+            {{  person.center.name|upper }}
+        {%- endif -%}
+    </div>
+</div>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
index a55e69b6b..036dc5d01 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
@@ -1,7 +1,6 @@
 {#
  * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
+ * * This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU Affero General Public License as
  * published by the Free Software Foundation, either version 3 of the
  *  License, or (at your option) any later version.
@@ -17,33 +16,33 @@
 {% extends "@ChillMain/layout.html.twig" %}
 
 {% block title %}{{ 'Add a person'|trans }}{% endblock title %}
-    
+
 {% block content %}
-    <div class="grid-12 parent" >
-        <div class="grid-10 push-1 grid-mobile-12 grid-tablet-12 push-mobile-0 push-tablet-0 parent">
-            {{ form_start(form) }}
-            
-                <h1>{{ 'Add a person'|trans }}</h1>
-            
-                {{ form_row(form.firstName, { 'label' : 'First name'|trans }) }}  
-                            
-                {{ form_row(form.lastName, { 'label' : 'Last name'|trans }) }}
-                
-                {% if form.altNames is defined %}
-                    {{ form_widget(form.altNames) }}
-                {% endif %}
-                            
-                {{ form_row(form.birthdate, { 'label' : 'Date of birth'|trans }) }}
-                            
-                {{ form_row(form.gender, { 'label' : 'Gender'|trans }) }} 
-                            
-                {{ form_row(form.creation_date, { 'label' : 'Creation date'|trans }) }}             
-                    
-                {{ form_rest(form) }}
-            
-                <button class="sc-button green" type="submit" alt="add a person"><i class="fa fa-plus"></i> {{ 'Add the person'|trans }}</button>
-    
-            {{ form_end(form) }}
-        </div>
-    </div>
-{% endblock content %}
\ No newline at end of file
+<div class="col-md-10 col-xxl person-new">
+
+    {{ form_start(form) }}
+
+        <h1>{{ 'Add a person'|trans }}</h1>
+
+        {{ form_row(form.firstName, { 'label' : 'First name'|trans }) }}
+
+        {{ form_row(form.lastName, { 'label' : 'Last name'|trans }) }}
+
+        {% if form.altNames is defined %}
+            {{ form_widget(form.altNames) }}
+        {% endif %}
+
+        {{ form_row(form.birthdate, { 'label' : 'Date of birth'|trans }) }}
+
+        {{ form_row(form.gender, { 'label' : 'Gender'|trans }) }}
+
+        {{ form_rest(form) }}
+
+        <button class="btn btn-create" type="submit" alt="add a person">
+            {{ 'Add the person'|trans }}
+        </button>
+
+    {{ form_end(form) }}
+
+</div>
+{% endblock content %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/create_review.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/create_review.html.twig
index 2d01fb08e..cf3e37beb 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/create_review.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/create_review.html.twig
@@ -17,76 +17,81 @@
 {% extends "@ChillMain/layout.html.twig" %}
 
 {% block title %}{{ 'Alreay existing person'|trans }}{% endblock title %}
-    
+
 {% block content %}
-    <div class="grid-12 parent" >
-        <div class="grid-10 push-1 grid-mobile-12 grid-tablet-12 push-mobile-0 push-tablet-0 parent">
-            
-            <div class="warning flash_message">
-                <span>
-                {% transchoice alternatePersons|length with { '%nb%': alternatePersons|length } %}
-                %nb% person with similar name. Please verify that this is a new person
-                {% endtranschoice %}
-                </span>
-            </div>
-            
-            {% if alternatePersons is not empty %}
-                <table>
-                    <thead>
-                        <tr>
-                            <th class="chill-red">{{ 'Name'|trans }}</th>
-                            <th class="chill-green">{{ 'Date of birth'|trans }}</th>
-                            <th class="chill-orange">{{ 'Nationality'|trans }}</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        {% for person in alternatePersons %}
-                            <tr>
-                                <td>
-                                    <a href="{{ path('chill_person_view', {'person_id': person.id } ) }}">
-                                        {{ person|chill_entity_render_string }}{% apply spaceless %}
-                                            {% if person.isOpen == false %}
-                                                <i class="icon-lock"></i>
-                                            {% endif %}
-                                        {% endapply %}
-                                    </a>
-                                </td>
-                                <td>{% if person.birthdate is not null %}{{ person.birthdate|format_date('long') }}{% else %}&nbsp;{% endif %}</td>
-                                <td>
-                                    {% if person.nationality is not null %}{{ person.nationality.name|localize_translatable_string }}{%  else  %}{{ 'Without nationality'|trans }}{% endif %}
-                                </td>
-                            </tr>
-                        {% endfor %}
-                    </tbody>
-                </table>
-            {% endif %}
-        
-            <div id="person_details">
-                {{ form_start(form) }}
-                    <h2>{{ 'You will create this person'|trans }}</h2>
-                    <dl>
-                        <dt>{{ 'Name'|trans }}</dt>
-                        <dd>{{ person|chill_entity_render_string }}</dd>
-                        
-                        <dt>{{ 'Date of birth'|trans }}</dt>
-                        <dd>{{ birthdate|format_date('long')|default( 'Unknown date of birth'|trans ) }}</dd>
-                        
-                        <dt>{{ 'Gender'|trans }}</dt>
-                        <dd>{{ gender|trans }}</dd>
-                        
-                        <dt>{{ 'Creation date'|trans }}</dt>
-                        <dd>{{ creation_date|format_date('long') }}</dd>
-                        
-                        {% if form.altNames is defined %}
-                            {# mark as rendered #}
-                            {{ form_widget(form.altNames) }}
-                        {% endif %}
-                    </dl>
-        
-                    {{ form_rest(form) }}
-                    <button class="sc-button bt-create change-icon" type="submit"><i class="fa fa-check"></i> {{ 'Confirm the creation'|trans }}</button>
-                {{ form_end(form) }}
-            </div>
-        </div>
+<div class="col-md-10 col-xxl person-new">
+
+    <div class="alert alert-warning flash_message">
+        <span>
+        {% transchoice alternatePersons|length with { '%nb%': alternatePersons|length } %}
+        %nb% person with similar name. Please verify that this is a new person
+        {% endtranschoice %}
+        </span>
     </div>
-{% endblock content %}
\ No newline at end of file
+
+    {% if alternatePersons is not empty %}
+        <table class="table table-bordered border-dark">
+            <thead>
+                <tr>
+                    <th class="chill-red">{{ 'Name'|trans }}</th>
+                    <th class="chill-green">{{ 'Date of birth'|trans }}</th>
+                    <th class="chill-orange">{{ 'Nationality'|trans }}</th>
+                </tr>
+            </thead>
+            <tbody>
+                {% for person in alternatePersons %}
+                    <tr>
+                        <td>
+                            <a href="{{ path('chill_person_view', {'person_id': person.id } ) }}">
+                                {{ person|chill_entity_render_string }}{% apply spaceless %}
+                                    {% if person.isOpen == false %}
+                                        <i class="icon-lock"></i>
+                                    {% endif %}
+                                {% endapply %}
+                            </a>
+                        </td>
+                        <td>{% if person.birthdate is not null %}{{ person.birthdate|format_date('long') }}{% else %}&nbsp;{% endif %}</td>
+                        <td>
+                            {% if person.nationality is not null %}{{ person.nationality.name|localize_translatable_string }}{%  else  %}{{ 'Without nationality'|trans }}{% endif %}
+                        </td>
+                    </tr>
+                {% endfor %}
+            </tbody>
+        </table>
+    {% endif %}
+
+    <div id="person_details" class="my-5">
+        {{ form_start(form) }}
+            <h2>{{ 'You will create this person'|trans }}</h2>
+            <dl>
+                <dt>{{ 'Name'|trans }}</dt>
+                <dd>{{ person|chill_entity_render_string }}</dd>
+
+                <dt>{{ 'Date of birth'|trans }}</dt>
+                {% if birthdate is empty %}
+                    <dd>{{ 'Unknown date of birth'|trans }}</dd>
+                {% else %}
+                    <dd>{{ birthdate|format_date('long') }}</dd>
+                {% endif %}
+
+                <dt>{{ 'Gender'|trans }}</dt>
+                <dd>{{ gender|trans }}</dd>
+
+                {% if form.altNames is defined %}
+                    {# mark as rendered #}
+                    {{ form_widget(form.altNames) }}
+                {% endif %}
+            </dl>
+
+            {{ form_rest(form) }}
+            <ul class="record_actions">
+                <li>
+                    <button class="sc-button bt-create change-icon" type="submit"><i class="fa fa-check"></i> {{ 'Confirm the creation'|trans }}</button>
+                </li>
+            </ul>
+        {{ form_end(form) }}
+
+    </div>
+
+</div>
+{% endblock content %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig
index 549025429..4c7fd0c9a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig
@@ -14,136 +14,133 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
-{% extends "@ChillPerson/layout.html.twig"  %}
+{% extends "@ChillPerson/Person/layout.html.twig"  %}
 
 {% set activeRouteKey = '' %}
 
 {% block title %}{{ 'Update details for %name%'|trans({ '%name%': person.firstName|capitalize ~ ' ' ~ person.lastName } )|capitalize }}{% endblock %}
 
 {% block personcontent %}
+<div class="person-edit">
 
     <h1>{{ 'Update details for %name%'|trans({ '%name%': person.firstName|capitalize ~ ' ' ~ person.lastName|capitalize } ) }}</h1>
 
-{% form_theme form '@ChillMain/Form/fields.html.twig' %}
+    {% form_theme form '@ChillMain/Form/fields.html.twig' %}
+    {{ form_start(form) }}
 
-{{ form_start(form) }}
-
-{% if form.memo is defined %}
-<fieldset>
-    <legend><h2>{{ 'Memo'|trans }}</h2></legend>
-    {{ form_row(form.memo, {'label' : 'Memo'} ) }}
-</fieldset>
-{% endif %}
-
-<fieldset>
-    <legend><h2>{{ 'General information'|trans }}</h2></legend>
-    {{ form_row(form.firstName, {'label' : 'First name'}) }}
-    {{ form_row(form.lastName, {'label' : 'Last name'}) }}
-    {% if form.altNames is defined %}
-        {{ form_widget(form.altNames, { 'label': 'Alternative names'}) }}
+    {% if form.memo is defined %}
+    <fieldset>
+        <legend><h2>{{ 'Memo'|trans }}</h2></legend>
+        {{ form_row(form.memo, {'label' : 'Memo'} ) }}
+    </fieldset>
     {% endif %}
-    {{ form_row(form.gender, {'label' : 'Gender'}) }}
-    {{ form_row(form.genderComment, { 'label' : 'Comment on the gender'} ) }}
-</fieldset>
 
-<fieldset>
-    <legend><h2>{{ 'Birth information'|trans }}</h2></legend>
-    {{ form_row(form.birthdate, {'label': 'Date of birth'} ) }}
-    {%- if form.placeOfBirth is defined -%}
-    {{ form_row(form.placeOfBirth, { 'label' : 'Place of birth'} ) }}
-    {%- endif -%}
-    {%- if form.countryOfBirth is defined -%}
-    {{ form_row(form.countryOfBirth, { 'label' : 'Country of birth' } ) }}
-    {%- endif -%}
-    {%- if form.deathdate is defined -%}
-    {{ form_row(form.deathdate, { 'label' : 'Date of death' } ) }}
-    {%- endif -%}
-</fieldset>
+    <fieldset>
+        <legend><h2>{{ 'General information'|trans }}</h2></legend>
+        {{ form_row(form.firstName, {'label' : 'First name'}) }}
+        {{ form_row(form.lastName, {'label' : 'Last name'}) }}
+        {% if form.altNames is defined %}
+            {{ form_widget(form.altNames, { 'label': 'Alternative names'}) }}
+        {% endif %}
+        {{ form_row(form.gender, {'label' : 'Gender'}) }}
+        {{ form_row(form.genderComment, { 'label' : 'Comment on the gender'} ) }}
+    </fieldset>
 
-{%- if form.nationality is defined or form.spokenLanguages is defined -%}
-<fieldset>
-    <legend><h2>{{ 'Administrative information'|trans }}</h2></legend>
-    {%- if form.nationality is defined -%}
-    {{ form_row(form.nationality, { 'label' : 'Nationality'|trans} ) }}
-    {%- endif -%}
-    {%- if form.spokenLanguages is defined -%}
-    {{ form_row(form.spokenLanguages, {'label' : 'Spoken languages'}) }}
-    {%- endif -%}
-</fieldset>
-{%- endif -%}
+    <fieldset>
+        <legend><h2>{{ 'Birth information'|trans }}</h2></legend>
+        {{ form_row(form.birthdate, {'label': 'Date of birth'} ) }}
+        {%- if form.placeOfBirth is defined -%}
+        {{ form_row(form.placeOfBirth, { 'label' : 'Place of birth'} ) }}
+        {%- endif -%}
+        {%- if form.countryOfBirth is defined -%}
+        {{ form_row(form.countryOfBirth, { 'label' : 'Country of birth' } ) }}
+        {%- endif -%}
+        {%- if form.deathdate is defined -%}
+        {{ form_row(form.deathdate, { 'label' : 'Date of death' } ) }}
+        {%- endif -%}
+    </fieldset>
 
-{%- if form.numberOfChildren is defined or form.maritalStatus is defined -%}
-<fieldset>
-    <legend><h2>{{ 'Marital status'|trans }}</h2></legend>
-    {{ form_row(form.numberOfChildren, {'label' : 'Number of children'}) }}
-    {%- if form.maritalStatus is defined -%}
-    <div id="maritalStatus">
-        {{ form_row(form.maritalStatus, { 'label' : 'Marital status'} ) }}
-    </div>
-    <div id="maritalStatusDate">
-        {{ form_row(form.maritalStatusDate, { 'label' : 'Date of last marital status change'} ) }}
-        {{ form_row(form.maritalStatusComment, { 'label' : 'Comment on the marital status'} ) }}
-    </div>
-    {%- endif -%}
-</fieldset>
-{%- endif -%}
-
-{%- if form.email is defined or form.phonenumber is defined or form.mobilenumber is defined or form.contactInfo is defined-%}
-<fieldset>
-    <legend><h2>{{ 'Contact information'|trans }}</h2></legend>
-    {%- if form.email is defined -%}
-    <div id="personEmail">
-        {{ form_row(form.email, {'label': 'Email'}) }}
-    </div>
-    <div id="personAcceptEmail">
-        {{ form_row(form.acceptEmail, {'label' : 'Accept emails ?'}) }}
-    </div>
+    {%- if form.nationality is defined or form.spokenLanguages is defined -%}
+    <fieldset>
+        <legend><h2>{{ 'Administrative information'|trans }}</h2></legend>
+        {%- if form.nationality is defined -%}
+        {{ form_row(form.nationality, { 'label' : 'Nationality'|trans} ) }}
+        {%- endif -%}
+        {%- if form.spokenLanguages is defined -%}
+        {{ form_row(form.spokenLanguages, {'label' : 'Spoken languages'}) }}
+        {%- endif -%}
+    </fieldset>
     {%- endif -%}
 
-    {%- if form.phonenumber is defined -%}
-    {{ form_row(form.phonenumber, {'label': 'Phonenumber'}) }}
+    {%- if form.numberOfChildren is defined or form.maritalStatus is defined -%}
+    <fieldset>
+        <legend><h2>{{ 'Marital status'|trans }}</h2></legend>
+        {{ form_row(form.numberOfChildren, {'label' : 'Number of children'}) }}
+        {%- if form.maritalStatus is defined -%}
+        <div id="maritalStatus">
+            {{ form_row(form.maritalStatus, { 'label' : 'Marital status'} ) }}
+        </div>
+        <div id="maritalStatusDate">
+            {{ form_row(form.maritalStatusDate, { 'label' : 'Date of last marital status change'} ) }}
+            {{ form_row(form.maritalStatusComment, { 'label' : 'Comment on the marital status'} ) }}
+        </div>
+        {%- endif -%}
+    </fieldset>
     {%- endif -%}
-    {%- if form.mobilenumber is defined -%}
-    <div id="personPhoneNumber">
-        {{ form_row(form.mobilenumber, {'label': 'Mobilenumber'}) }}
-    </div>
-    <div id="personAcceptSMS">
-        {{ form_row(form.acceptSMS, {'label' : 'Accept short text message ?'}) }}
-    </div>
+
+    {%- if form.email is defined or form.phonenumber is defined or form.mobilenumber is defined or form.contactInfo is defined-%}
+    <fieldset>
+        <legend><h2>{{ 'Contact information'|trans }}</h2></legend>
+        {%- if form.email is defined -%}
+            <div id="personEmail">
+                {{ form_row(form.email, {'label': 'Email'}) }}
+            </div>
+            <div id="personAcceptEmail">
+                {{ form_row(form.acceptEmail, {'label' : 'Accept emails ?'}) }}
+            </div>
+        {%- endif -%}
+
+        {%- if form.phonenumber is defined -%}
+            {{ form_row(form.phonenumber, {'label': 'Phonenumber'}) }}
+        {%- endif -%}
+        {%- if form.mobilenumber is defined -%}
+            <div id="personPhoneNumber">
+                {{ form_row(form.mobilenumber, {'label': 'Mobilenumber'}) }}
+            </div>
+            <div id="personAcceptSMS">
+                {{ form_row(form.acceptSMS, {'label' : 'Accept short text message ?'}) }}
+            </div>
+        {%- endif -%}
+        {%- if form.otherPhoneNumbers is defined -%}
+            {{ form_widget(form.otherPhoneNumbers) }}
+            {{ form_errors(form.otherPhoneNumbers) }}
+        {%- endif -%}
+        {%- if form.contactInfo is defined -%}
+            {{ form_row(form.contactInfo, {'label': 'Notes on contact information'}) }}
+        {%- endif -%}
+    </fieldset>
     {%- endif -%}
-    {%- if form.otherPhoneNumbers is defined -%}
-        {{ form_widget(form.otherPhoneNumbers) }}
-        {{ form_errors(form.otherPhoneNumbers) }}
-    {%- endif -%}
-    {%- if form.contactInfo is defined -%}
-    {{ form_row(form.contactInfo, {'label': 'Notes on contact information'}) }}
-    {%- endif -%}
-</fieldset>
-{%- endif -%}
 
+    {{ form_rest(form) }}
 
-{{ form_rest(form) }}
+    <ul class="record_actions sticky-form-buttons">
+        <li class="cancel">
+            <a href="{{ path('chill_person_view',  {'person_id' : person.id}) }}" class="btn btn-cancel">
+                {{ 'Return'|trans }}
+            </a>
+        </li>
+        <li>
+            <button class="btn btn-save" type="submit">
+                {{ 'Save'|trans }}
+            </button>
+        </li>
+    </ul>
 
+    {{ form_end(form) }}
 
-<ul class="grid-12 sticky-form-buttons record_actions ">
-    <li class="cancel">
-        <a href="{{ path('chill_person_view',  {'person_id' : person.id}) }}" class="sc-button grey center margin-5">
-            <i class="fa fa-arrow-left"></i>
-            {{ 'Return'|trans }}
-        </a>
-    </li>
-    <li>
-    <button class="sc-button bt-save" type="submit">{{ 'Save'|trans }}</button>
-    </li>
-</ul>
-
-
-{{ form_end(form) }}
-
-
-{% endblock personcontent %}
-
+</div>
+{% endblock %}
 
 {% block js %}
-    <script type="text/javascript" src="{{ asset('build/person.js') }}"></script>
-{% endblock js %}
+    {{ encore_entry_link_tags('page_person') }}
+{% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/household_history.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/household_history.html.twig
index d48ce42b7..e0e4df125 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/household_history.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/household_history.html.twig
@@ -1,201 +1,179 @@
-{% extends "@ChillPerson/layout.html.twig"  %}
+{% extends "@ChillPerson/Person/layout.html.twig"  %}
 
 {% set activeRouteKey = 'chill_person_view' %}
 
 {% block title 'household.Household history for %name%'|trans({'name': person|chill_entity_render_string}) %}
 
-
 {% block personcontent %}
-<h1>{{ block('title') }}</h1>
+<div class="person-household">
+                
+            <h1>{{ block('title') }}</h1>
+            <h2>{{ 'household.Household shared'|trans }}</h2>
 
-<h2>{{ 'household.Household shared'|trans }}</h2>
+            {% set memberships = person.getHouseholdParticipationsShareHousehold() %}
 
-{% set memberships = person.getHouseholdParticipationsShareHousehold() %}
+            {% if memberships|length == 0 %}
+                <p class="chill-no-data-statement">{{ 'household.Never in any household'|trans }}</p>
 
-{% if memberships|length == 0 %}
-  <p class="chill-no-data-statement">{{ 'household.Never in any household'|trans }}</p>
+                <ul class="record_actions">
+                    <li>
+                        <a class="btn btn-misc" href="{{chill_path_add_return_path('chill_person_household_members_editor', { 'persons': [ person.id ]}) }}">
+                            <i class="fa fa-sign-out"></i>
+                            {{ 'household.Join'|trans }}
+                        </a>
+                    </li>
+                </ul>
 
-  <ul class="record_actions">
-    <li>
-      <a class="sc-button"
-        href="{{ 
-          chill_path_add_return_path(
-          'chill_person_household_members_editor', 
-            { 'persons': [ person.id ]}) }}"
-      >
-        <i class="fa fa-sign-out"></i>
-        {{ 'household.Join'|trans }}
-      </a>
-    </li>
-  </ul>
-
-{% else %}
-
-  <div class="household">
-      <div class="household__address">
-
-          {% if not person.isSharingHousehold() %}
-            <div class="row">
-                <div class="household__address--date"></div>
-                <div class="household__address--content">
-                    <div class="cell">
-                      <a class="sc-button"
-                      href="{{ 
-                        chill_path_add_return_path(
-                        'chill_person_household_members_editor', 
-                          { 'persons': [ person.id ]}) }}"
-                      >
-                      <i class="fa fa-sign-out"></i>
-                      {{ 'household.Join'|trans }}
-                      </a>
-                    </div>
-                </div>
-            </div>
-          {% endif %}
-
-          {% for p in memberships %}
-          <div class="row">
-              <div class="household__address--date">
-                  <div class="cell">
-                      <div class="pill">
-                        {{ p.startDate|format_date('long') }}
-                      </div>
-                  </div>
-              </div>
-              <div class="household__address--content">
-                  <div class="cell">
-                      <i class="dot"></i>
-                      <div>
-                        <div>
-                          <p>
-                          <i class="fa fa-home"></i>
-                          <a 
-                             href="{{ chill_path_add_return_path(
-                              'chill_person_household_summary',
-                              { 'household_id': p.household.id }
-                              ) }}"
-                              >
-                          {{ 'household.Household number'|trans({'household_num': p.household.id }) }}
-                          </a>
-                          </p>
-                          <p>{{ p.position.label|localize_translatable_string }} {% if p.holder %}<span class="badge badge-primary">{{ 'household.holder'|trans }}</span>{% endif %} 
-                        </div>
-                        <div>
-                          {% set simultaneous = p.household.getMembersDuringMembership(p) %}
-                          {% if simultaneous|length == 0 %}
-                            <p class="chill-no-data-statement">
-                            {{ 'household.Any simultaneous members'|trans }}
-                            </p>
-                          {% else %}
-                            {{ 'household.Members at same time'|trans }}: 
-                            {% for p in simultaneous -%}
-                              {{- p.person|chill_entity_render_box({'addLink': true }) -}}
-                              {%- if p.holder %} <span class="badge badge-primary">{{'household.holder'|trans }}</span> {% endif %}
-                              {%- if not loop.last %}, {% endif -%}
-                            {%- endfor -%}
-                            {% endif %}
-                            <ul class="record_actions">
-                              <li>
-                                <a 
-                                  href="{{ chill_path_add_return_path('chill_person_household_member_edit', { id: p.id }) }}"
-                                  class="sc-button bt-edit"
-                                  ></a>
-                              </li>
-                              {% if p.isCurrent() %}
-                                <li>
-                                  <a class="sc-button"
-                                  href="{{ chill_path_add_return_path(
-                                    'chill_person_household_members_editor', 
-                                      { 'persons': [ person.id ], 'allow_leave_without_household': true }) }}"
-                                  >
-                                  <i class="fa fa-sign-out"></i>
-                                  {{ 'household.Leave'|trans }}
-                                  </a>
-                                </li>
-                              {% endif %}
-                            </ul>
-                        </div>
-                      </div>
-                  </div>
-              </div>
-          </div>
-          {% endfor %}
-      </div>
-
-  </div>
-{% endif %}
-
-<h2>{{ 'household.Household not shared'|trans }}</h2>
-
-{% set memberships = person.getHouseholdParticipationsNotShareHousehold() %}
-
-{% if memberships|length == 0 %}
-  <p class="chill-no-data-statement">{{ 'household.Never in any household'|trans }}</p>
-{% else %}
-  <table>
-    <thead>
-      <tr>
-        <th>{{ 'household.from'|trans }}</th>
-        <th>{{ 'household.to'|trans }}</th>
-        <th>{{ 'household.Household'|trans }}</th>
-      </tr>
-    </thead>
-    <tbody>
-      {% for p in memberships %}
-      <tr>
-        <td>{{ p.startDate|format_date('long') }}</td>
-        <td>
-            {% if p.endDate is not empty %}
-              {{ p.endDate|format_date('long') }}
             {% else %}
-              {{ 'household.Membership currently running'|trans }}
-            {% endif %}
-        </td>
-        <td>
-          <div>
-            <p>
-            <i class="fa fa-home"></i>
-            <a 
-               href="{{ chill_path_add_return_path(
-                'chill_person_household_summary',
-                { 'household_id': p.household.id }
-                ) }}"
-                >
-            {{ 'household.Household number'|trans({'household_num': p.household.id }) }}
-            </a>
-            </p>
-            <p>{{ p.position.label|localize_translatable_string }} {% if p.holder %}<span class="badge badge-primary">{{ 'household.holder'|trans }}</span>{% endif %} 
-          </div>
-          <div>
-            {% set simultaneous = p.household.getMembersDuringMembership(p) %}
-            {% if simultaneous|length == 0 %}
-              <p class="chill-no-data-statement">
-              {{ 'household.Any simultaneous members'|trans }}
-              </p>
-            {% else %}
-              {{ 'household.Members at same time'|trans }}: 
-              {% for p in simultaneous -%}
-                {{- p.person|chill_entity_render_box({'addLink': true }) -}}
-                {%- if p.holder %} <span class="badge badge-primary">{{'household.holder'|trans }}</span> {% endif %}
-                {%- if not loop.last %}, {% endif -%}
-              {%- endfor -%}
-            {% endif %}
-          </div>
-        </td>
-        <td>
-          <ul class="record_actions">
-            <li>
-              <a 
-                href="{{ chill_path_add_return_path('chill_person_household_member_edit', { id: p.id }) }}"
-                class="sc-button bt-edit"
-                ></a>
-            </li>
-          </ul>
-        </td>
-      </tr>
-      {% endfor %}
-    </tbody>
-  </table>
-{% endif %}
 
+            <div class="household">
+                <div class="household__address">
+
+                    {% if not person.isSharingHousehold() %}
+                        <div class="row">
+                            <div class="household__address--date"></div>
+                            <div class="household__address--content">
+                                <div class="cell">
+                                    <a class="btn btn-misc" href="{{ chill_path_add_return_path('chill_person_household_members_editor', { 'persons': [ person.id ]}) }}">
+                                        <i class="fa fa-sign-out"></i>
+                                        {{ 'household.Join'|trans }}
+                                    </a>
+                                </div>
+                            </div>
+                        </div>
+                    {% endif %}
+
+                    {% for p in memberships %}
+                    <div class="row">
+                        <div class="household__address--date">
+                            <div class="cell">
+                                <div class="pill">
+                                    {{ p.startDate|format_date('long') }}
+                                </div>
+                            </div>
+                        </div>
+                        <div class="household__address--content">
+                            <div class="cell">
+                                <i class="dot"></i>
+                                <div>
+                                    <div>
+                                        <p>
+                                            <i class="fa fa-home"></i>
+                                            <a href="{{ chill_path_add_return_path('chill_person_household_summary',{ 'household_id': p.household.id }) }}">
+                                                {{ 'household.Household number'|trans({'household_num': p.household.id }) }}
+                                            </a>
+                                        </p>
+                                        <p>{{ p.position.label|localize_translatable_string }} {% if p.holder %}<span class="badge bg-primary">{{ 'household.holder'|trans }}</span>{% endif %} 
+                                    </div>
+                                    <div>
+                                        {% set simultaneous = p.household.getMembersDuringMembership(p) %}
+                                        {% if simultaneous|length == 0 %}
+                                            <p class="chill-no-data-statement">
+                                                {{ 'household.Any simultaneous members'|trans }}
+                                            </p>
+                                        {% else %}
+                                            {{ 'household.Members at same time'|trans }}: 
+                                            {% for p in simultaneous -%}
+                                                {{- p.person|chill_entity_render_box({'addLink': true }) -}}
+                                                {%- if p.holder %} <span class="badge bg-primary">{{'household.holder'|trans }}</span> {% endif %}
+                                                {%- if not loop.last %}, {% endif -%}
+                                            {%- endfor -%}
+                                        {% endif %}
+                                        <ul class="record_actions">
+                                            <li>
+                                                <a href="{{ chill_path_add_return_path('chill_person_household_member_edit', { id: p.id }) }}"
+                                                    class="btn btn-edit"></a>
+                                            </li>
+                                            {% if p.isCurrent() %}
+                                            <li>
+                                                <a class="btn btn-misc" href="{{ chill_path_add_return_path( 'chill_person_household_members_editor', { 'persons': [ person.id ], 'allow_leave_without_household': true }) }}">
+                                                    <i class="fa fa-sign-out"></i>
+                                                    {{ 'household.Leave'|trans }}
+                                                </a>
+                                            </li>
+                                            {% endif %}
+                                        </ul>
+                                    </div>
+                                  </div>
+                              </div>
+                          </div>
+                      </div>
+                      {% endfor %}
+                  </div>
+
+              </div>
+            {% endif %}
+
+            <h2>{{ 'household.Household not shared'|trans }}</h2>
+
+            {% set memberships = person.getHouseholdParticipationsNotShareHousehold() %}
+
+            {% if memberships|length == 0 %}
+                <p class="chill-no-data-statement">{{ 'household.Never in any household'|trans }}</p>
+            {% else %}
+                <table class="table table-bordered border-dark">
+                    <thead>
+                        <tr>
+                            <th>{{ 'household.from'|trans }}</th>
+                            <th>{{ 'household.to'|trans }}</th>
+                            <th>{{ 'household.Household'|trans }}</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        {% for p in memberships %}
+                        <tr>
+                            <td>{{ p.startDate|format_date('long') }}</td>
+                            <td>
+                                {% if p.endDate is not empty %}
+                                    {{ p.endDate|format_date('long') }}
+                                {% else %}
+                                    {{ 'household.Membership currently running'|trans }}
+                                {% endif %}
+                            </td>
+                            <td>
+                                <div>
+                                <p>
+                                    <i class="fa fa-home"></i>
+                                    <a href="{{ chill_path_add_return_path('chill_person_household_summary', { 'household_id': p.household.id }) }}">
+                                        {{ 'household.Household number'|trans({'household_num': p.household.id }) }}
+                                    </a>
+                                </p>
+                                <p>
+                                    {{ p.position.label|localize_translatable_string }} 
+                                    {% if p.holder %}
+                                        <span class="badge bg-primary">{{ 'household.holder'|trans }}</span>
+                                    {% endif %} 
+                                </div>
+                                <div>
+                                {% set simultaneous = p.household.getMembersDuringMembership(p) %}
+                                {% if simultaneous|length == 0 %}
+                                    <p class="chill-no-data-statement">
+                                        {{ 'household.Any simultaneous members'|trans }}
+                                    </p>
+                                {% else %}
+                                    {{ 'household.Members at same time'|trans }}: 
+                                    {% for p in simultaneous -%}
+                                        {{- p.person|chill_entity_render_box({'addLink': true }) -}}
+                                        {%- if p.holder %} <span class="badge bg-primary">{{'household.holder'|trans }}</span> {% endif %}
+                                        {%- if not loop.last %}, {% endif -%}
+                                    {%- endfor -%}
+                                {% endif %}
+                              </div>
+                            </td>
+                            <td>
+                                <ul class="record_actions sticky-form-buttons">
+                                    <li>
+                                        <a href="{{ chill_path_add_return_path('chill_person_household_member_edit', { id: p.id }) }}"
+                                            class="btn btn-edit">
+                                        </a>
+                                    </li>
+                                </ul>
+                            </td>
+                        </tr>
+                        {% endfor %}
+                    </tbody>
+                </table>
+            {% endif %}
+
+</div>
 {% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/layout.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/layout.html.twig
new file mode 100644
index 000000000..677829066
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/layout.html.twig
@@ -0,0 +1,43 @@
+{#
+ * Copyright (C) 2014-2021, Champs Libres Cooperative SCRLFS, 
+ <info@champs-libres.coop> / <http://www.champs-libres.coop>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#}
+
+{% extends "@ChillMain/layoutWithVerticalMenu.html.twig" %}
+
+{% block top_banner %}
+    {{ include('@ChillPerson/Person/banner.html.twig', { title: block('title') }) }}
+{% endblock %}
+
+{% block layout_wvm_content %}
+    <div class="row justify-content-center">
+        <div class="col-md-10 col-xxl">
+            {% block personcontent %}{# block personcontent empty #}{% endblock %}
+        </div>
+    </div>
+{% endblock %}
+
+{% block vertical_menu_content %}
+    {{ chill_menu('person', {
+        'layout': '@ChillPerson/menu.html.twig',
+        'args' : {'person_id': person.id, 'person': person },
+        'activeRouteKey': activeRouteKey
+    }) }}
+    
+    <div class="block-post-menu">
+        {{ chill_delegated_block('person_post_vertical_menu', { 'person': person } ) }}
+    </div>
+{% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/list.html.twig
index 19f0838dc..2371ded7b 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/list.html.twig
@@ -18,7 +18,7 @@
 
 <p>
     {{ '%total% persons matching the search pattern:'|transchoice( total, { '%total%' : total}) }}
-    <a href="{{ path('chill_main_advanced_search', { "name": search_name, "q": pattern } ) }}" class="sc-button button-small">
+    <a href="{{ path('chill_main_advanced_search', { "name": search_name, "q": pattern } ) }}" class="btn btn-sm">
                 <i class="fa fa-search" aria-hidden="true"></i> {{ pattern }}
     </a>
 </p>
@@ -68,9 +68,9 @@
                     </td>
                     <td>
                         <ul class="record_actions">
-                            <li><a class="sc-button bt-show" href="{{ path('chill_person_view', { person_id : person.getId }) }}"></a></li>
+                            <li><a class="btn btn-show" href="{{ path('chill_person_view', { person_id : person.getId }) }}"></a></li>
                             {% if is_granted('CHILL_PERSON_UPDATE', person) %}
-                            <li><a class="sc-button bt-update" href="{{ path('chill_person_general_edit', { person_id : person.getId }) }}"></a></li>
+                            <li><a class="btn btn-update" href="{{ path('chill_person_general_edit', { person_id : person.getId }) }}"></a></li>
                             {% endif %}
                         </ul>
                     </td>
@@ -82,7 +82,7 @@
             <ul class="record_actions">
                 {% if is_granted('CHILL_PERSON_CREATE') %}
                 <li>
-                    <a href="{{ path('chill_person_new') }}" class="sc-button bt-create">
+                    <a href="{{ path('chill_person_new') }}" class="btn btn-create">
                         {{ 'Add a person'|trans }}
                     </a>
                 </li>
@@ -90,14 +90,14 @@
 
                 {% if search_name != "person_similarity" %}
                 <li>
-                    <a href="{{ path('chill_main_advanced_search', { "name": search_name, "q": pattern } ) }}" class="sc-button bt-action">
+                    <a href="{{ path('chill_main_advanced_search', { "name": search_name, "q": pattern } ) }}" class="btn btn-action">
                         <i class="fa fa-search" aria-hidden="true"></i> {{ 'Advanced search'|trans }}
                     </a>
                 </li>
                 {% endif %}
                 {% if preview == true and persons|length < total %}
                 <li>
-                    <a href="{{ path('chill_main_search', { "name": search_name|default('abcd'), "q" : pattern }) }}" class="sc-button">
+                    <a href="{{ path('chill_main_search', { "name": search_name|default('abcd'), "q" : pattern }) }}" class="btn btn-misc">
                         {{ 'See all results'|trans }}
                     </a>
                 </li>
@@ -106,7 +106,7 @@
 {% else %}
     <ul class="record_actions">
         <li>
-            <a href="{{ path('chill_main_advanced_search', { "name": search_name, "q": pattern } ) }}" class="sc-button bt-action">
+            <a href="{{ path('chill_main_advanced_search', { "name": search_name, "q": pattern } ) }}" class="btn btn-action">
                 <i class="fa fa-search" aria-hidden="true"></i> {{ 'Advanced search'|trans }}
             </a>
         </li>
@@ -116,4 +116,3 @@
 {% if preview == false %}
 {{ chill_pagination(paginator) }}
 {% endif %}
-
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/list_by_phonenumber.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/list_by_phonenumber.html.twig
index e3196653f..c182047b2 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/list_by_phonenumber.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/list_by_phonenumber.html.twig
@@ -18,7 +18,7 @@
 
 <p>
     {{ '%total% persons matching the search pattern:'|transchoice( total, { '%total%' : total}) }}
-    <a href="{{ path('chill_main_advanced_search', { "name": search_name, "q": pattern } ) }}" class="sc-button button-small">
+    <a href="{{ path('chill_main_advanced_search', { "name": search_name, "q": pattern } ) }}" class="btn btn-sm">
                 <i class="fa fa-search" aria-hidden="true"></i> {{ pattern }}
     </a>
 </p>
@@ -73,9 +73,9 @@
                     </td>
                     <td>
                         <ul class="record_actions">
-                            <li><a class="sc-button bt-show" href="{{ path('chill_person_view', { person_id : person.getId }) }}"></a></li>
+                            <li><a class="btn btn-show" href="{{ path('chill_person_view', { person_id : person.getId }) }}"></a></li>
                             {% if is_granted('CHILL_PERSON_UPDATE', person) %}
-                            <li><a class="sc-button bt-update" href="{{ path('chill_person_general_edit', { person_id : person.getId }) }}"></a></li>
+                            <li><a class="btn btn-update" href="{{ path('chill_person_general_edit', { person_id : person.getId }) }}"></a></li>
                             {% endif %}
                         </ul>
                     </td>
@@ -87,14 +87,14 @@
             <ul class="record_actions">
                 {% if is_granted('CHILL_PERSON_CREATE') %}
                 <li>
-                    <a href="{{ path('chill_person_new') }}" class="sc-button bt-create">
+                    <a href="{{ path('chill_person_new') }}" class="btn btn-create">
                         {{ 'Add a person'|trans }}
                     </a>
                 </li>
                 {% endif %}
                 {% if preview == true and persons|length < total %}
                 <li>
-                    <a href="{{ path('chill_main_search', { "name": search_name|default('abcd'), "q" : pattern }) }}" class="sc-button">
+                    <a href="{{ path('chill_main_search', { "name": search_name|default('abcd'), "q" : pattern }) }}" class="btn btn-misc">
                         {{ 'See all results'|trans }}
                     </a>
                 </li>
@@ -105,4 +105,3 @@
 {% if preview == false %}
 {{ chill_pagination(paginator) }}
 {% endif %}
-
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig
index 10c0e0bc7..5c0d7da78 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig
@@ -2,7 +2,7 @@
 
 <p>
     {{ '%total% persons matching the search pattern:'|transchoice( total, { '%total%' : total}) }}
-    <a href="{{ path('chill_main_advanced_search', { "name": search_name, "q": pattern } ) }}" class="sc-button button-small">
+    <a href="{{ path('chill_main_advanced_search', { "name": search_name, "q": pattern } ) }}" class="btn btn-sm">
         <i class="fa fa-fw fa-search" aria-hidden="true"></i> {{ pattern }}
     </a>
 </p>
@@ -12,14 +12,14 @@
 <ul class="record_actions">
     {% if is_granted('CHILL_PERSON_CREATE') %}
         <li>
-            <a href="{{ path('chill_person_new') }}" class="sc-button bt-create">
+            <a href="{{ path('chill_person_new') }}" class="btn btn-create">
                 {{ 'Add a person'|trans }}
             </a>
         </li>
     {% endif %}
     {% if search_name != "person_similarity" %}
         <li>
-            <a href="{{ path('chill_main_advanced_search', { "name": search_name, "q": pattern } ) }}" class="sc-button bt-action">
+            <a href="{{ path('chill_main_advanced_search', { "name": search_name, "q": pattern } ) }}" class="btn btn-action">
                 <i class="fa fa-fw fa-search" aria-hidden="true"></i>
                 {{ 'Advanced search'|trans }}
             </a>
@@ -27,7 +27,7 @@
     {% endif %}
     {% if preview == true and persons | length < total %}
         <li>
-            <a href="{{ path('chill_main_search', { "name": search_name|default('abcd'), "q" : pattern }) }}" class="sc-button">
+            <a href="{{ path('chill_main_search', { "name": search_name|default('abcd'), "q" : pattern }) }}" class="btn btn-misc">
                 {{ 'See all results'|trans }}
             </a>
         </li>
@@ -39,21 +39,24 @@
 
     <div class="flex-table list-with-period">
         {% for person in persons %}
-      
+
             <div class="item-bloc">
                 <div class="item-row person">
-                    
+
                     <div class="item-col box-person">
-                        <div>{{ person|chill_entity_render_box({'addLink': true}) }}</div>
-                        <div>{{ 'Born the %date%'|transchoice(person.genderNumeric, { '%date%': person.birthdate|format_date("medium") }) }}</div>
+                        <div>
+                            {{ person|chill_entity_render_box({
+                                'render': 'label', 'addLink': true, 'addInfo': true
+                            }) }}
+                        </div>
                     </div>
-                    
+
                     <div class="item-col box-where">
                         <ul class="list-content fa-ul">
                             <li><i class="fa fa-li fa-long-arrow-right"></i>
                                 {{ person.center }}
                             </li>
-                            
+
                             <li>
                             {% if person.mobilenumber is not empty %}
                                 <i class="fa fa-li fa-mobile"></i> <a href="{{ 'tel:' ~ person.mobilenumber }}">{{ person.mobilenumber|chill_format_phonenumber }}</a>
@@ -66,7 +69,7 @@
                                 {% endif %}
                             {% endif %}
                             </li>
-                            
+
                             <li>
                                 <i class="fa fa-li fa-map-marker"></i>
                                 {% if person.getLastAddress is not null %}
@@ -75,21 +78,21 @@
                                     <span class="chill-no-data-statement">{{ 'No address'|trans }}</span>
                                 {% endif %}
                             </li>
-                            
+
                         </ul>
                         <ul class="record_actions">
                         <li>
-                            <a href="{{ path('chill_person_view', { 'person_id' : person.id }) }}" class="sc-button blue" />
-                                <i class="fa fa-folder-open-o"></i> {{ 'Open person file'|trans }}
-                            </a>
+                            <a href="{{ path('chill_person_view', { 'person_id' : person.id }) }}" class="btn btn-show"
+                                title="{{ 'Open person file'|trans }}"></a>
                         </li>
                         <li>
-                            <a href="{{ path('chill_person_accompanying_period_list', { 'person_id' : person.id }) }}" class="sc-button green" title="{{ 'See accompanying periods'|trans }}"/>
-                            <i class="fa fa-random"></i></a>
+                            <a href="{{ path('chill_person_accompanying_period_list', { 'person_id' : person.id }) }}"
+                               class="btn btn-primary" title="{{ 'See accompanying periods'|trans }}">
+                                <i class="fa fa-random"></i></a>
                         </li>
                     </ul>
                     </div>
-                    
+
                 </div>
 
                 {#- 'apps' is for AccompanyingPeriodParticipationS #}
@@ -100,40 +103,40 @@
                         {%- set apps = apps|merge([app]) %}
                     {%- endif %}
                 {%- endfor %}
-                
+
                 {% if apps|length > 0 %}
                     {% for app in apps %}
                     <div class="item-row periods">
-                        
+
                         <div class="header">
-                            <a href="{{ path('chill_person_accompanying_course_index', { 'accompanying_period_id': app.accompanyingPeriod.id }) }}" 
-                                class="sc-button green" title="{{ 'See accompanying period'|trans }}">
-                                <i class="fa fa-fw fa-random"></i>
+                            <a href="{{ path('chill_person_accompanying_course_index', { 'accompanying_period_id': app.accompanyingPeriod.id }) }}"
+                                class="btn btn-chill-green" title="{{ 'See accompanying period'|trans }}">
+                                <i class="fa fa-random"></i>
                             </a>
                             <span>{{ 'Since %date%'|trans({'%date%': app.startDate|format_date('medium') }) }}</span>
                             {% if app.accompanyingPeriod.user is not null %}
                                 <span class="user">
-                                    <abbr class="referrer" title="{{ 'Referrer'|trans }}">ref:</abbr> 
+                                    <abbr class="referrer" title="{{ 'Referrer'|trans }}">ref:</abbr>
                                     {{ app.accompanyingPeriod.user|chill_entity_render_box }}
                                 </span>
                             {% endif %}
                         </div>
-                        
+
                         <div class="list-content">
                             {% for issue in app.accompanyingPeriod.socialIssues|slice(0,2) %}
                             <span>{{ issue|chill_entity_render_box }}</span>
                             {% endfor %}
-                            
+
                             {% if app.accompanyingPeriod.socialIssues|length > 2 %}
                             <span class="more">{{ 'and %number% other'|transchoice(app.accompanyingPeriod.socialIssues|length-2) }}</span>
                             {% endif %}
                         </div>
-                            
+
                     </div>
                     {% endfor %}
-                
+
                 {% endif %}
-            
+
             </div>
 
         {% endfor %}
@@ -142,31 +145,31 @@
     <ul class="record_actions">
         {% if is_granted('CHILL_PERSON_CREATE') %}
         <li>
-            <a href="{{ path('chill_person_new') }}" class="sc-button bt-create">
+            <a href="{{ path('chill_person_new') }}" class="btn btn-create">
                 {{ 'Add a person'|trans }}
             </a>
         </li>
         {% endif %}
         {% if search_name != "person_similarity" %}
         <li>
-            <a href="{{ path('chill_main_advanced_search', { "name": search_name, "q": pattern } ) }}" class="sc-button bt-action">
+            <a href="{{ path('chill_main_advanced_search', { "name": search_name, "q": pattern } ) }}" class="btn btn-action">
                 <i class="fa fa-fw fa-search" aria-hidden="true"></i> {{ 'Advanced search'|trans }}
             </a>
         </li>
         {% endif %}
         {% if preview == true and persons|length < total %}
         <li>
-            <a href="{{ path('chill_main_search', { "name": search_name|default('abcd'), "q" : pattern }) }}" class="sc-button">
+            <a href="{{ path('chill_main_search', { "name": search_name|default('abcd'), "q" : pattern }) }}" class="btn btn-misc">
                 {{ 'See all results'|trans }}
             </a>
         </li>
         {% endif %}
     </ul>
-            
+
 {% else %}
     <ul class="record_actions">
         <li>
-            <a href="{{ path('chill_main_advanced_search', { "name": search_name, "q": pattern } ) }}" class="sc-button bt-action">
+            <a href="{{ path('chill_main_advanced_search', { "name": search_name, "q": pattern } ) }}" class="btn btn-action">
                 <i class="fa fa-fw fa-search" aria-hidden="true"></i> {{ 'Advanced search'|trans }}
             </a>
         </li>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig
index 76c6437d5..255add35e 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig
@@ -14,9 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
-{% extends "@ChillPerson/layout.html.twig"  %}
-
-{% import '@ChillMain/Address/macro.html.twig' as address %}
+{% extends "@ChillPerson/Person/layout.html.twig"  %}
 
 {% set activeRouteKey = 'chill_person_view' %}
 
@@ -35,302 +33,228 @@ This view should receive those arguments:
 {% set edit_tmp_args = { 'form_path_args' : { 'person_id': person.id },
       'form_path_key' : 'chill_person_general_edit' } %}
 
-
 {% block personcontent %}
-
 <div class="person-view">
 
-<div class="grid-10 push-1 grid-mobile-12 grid-tablet-12 push-mobile-0 push-tablet-0 parent">
-    {% if person.memo is not empty and chill_person.fields.memo == 'visible' %}
-    <div class="grid-12">
-        <figure class="person-details">
-            <h2 class="chill-red">{{ 'Memo'|trans }}</h2>
-        </figure>
+    <div class="row">
+        {% if person.memo is not empty and chill_person.fields.memo == 'visible' %}
+        <div class="col-12">
+            <figure class="person-details">
+                <h2 class="chill-red">{{ 'Memo'|trans }}</h2>
 
-            {#<p><blockquote>{{ person.memo|nl2br }}</blockquote></p>#}
-            <div class="chill-user-quote">
-                {{ person.memo|chill_markdown_to_html }}
-            </div>
+                <div class="chill-user-quote">
+                    {{ person.memo|chill_markdown_to_html }}
+                </div>
 
-    </div>
-    {% endif %}
-    <div class="grid-6">
-        <figure class="person-details">
-            <h2 class="chill-red">{{ 'General information'|trans }}</h2>
+            </figure>
+        </div>
+        {% endif %}
 
-            <dl>
-                <dt>{{ 'First name'|trans }}&nbsp;:</dt>
-                <dd>{{ person.firstName }}</dd>
+        <div class="col-sm-6 my-3">
+            <figure class="person-details">
+                <h2 class="chill-red">{{ 'General information'|trans }}</h2>
+                <dl>
+                    <dt>{{ 'First name'|trans }}&nbsp;:</dt>
+                    <dd>{{ person.firstName }}</dd>
 
-                <dt>{{ 'Last name'|trans }}&nbsp;:</dt>
-                <dd>{{ person.lastName }}</dd>
-                {% for el in person.altNames %}
-                    {% if el.key in alt_names|keys %}
-                        <dt>{{ alt_names[el.key]|localize_translatable_string }}&nbsp;:</dt>
-                        <dd>{{ el.label }}</dd>
+                    <dt>{{ 'Last name'|trans }}&nbsp;:</dt>
+                    <dd>{{ person.lastName }}</dd>
+                    {% for el in person.altNames %}
+                        {% if el.key in alt_names|keys %}
+                            <dt>{{ alt_names[el.key]|localize_translatable_string }}&nbsp;:</dt>
+                            <dd>{{ el.label }}</dd>
+                        {% endif %}
+                    {% endfor %}
+
+                    <dt>{{ 'Gender'|trans }}&nbsp;:</dt>
+                    <dd>{{ ( person.gender|default('Not given'))|trans }}</dd>
+                </dl>
+            </figure>
+        </div>
+
+        <div class="col-sm-6 my-3">
+            <figure class="person-details">
+                <h2 class="chill-green"><i class="fa fa-birthday-cake"></i>&nbsp;{{ 'Birth information'|trans }}</h2>
+                <dl>
+                    <dt>{{ 'Date of birth'|trans }}&nbsp;:</dt>
+                    <dd>
+                        {%- if person.birthdate is not null -%}
+                        {{ person.birthdate|format_date('long') }}
+                        {%- else -%}
+                        <span class="chill-no-data-statement">{{ 'Unknown date of birth'|trans }}</span>
+                        {%- endif -%}
+                    </dd>
+
+                    {%- if chill_person.fields.place_of_birth == 'visible' -%}
+                    <dt>{{ 'Place of birth'|trans }}&nbsp;:</dt>
+                    {% if person.placeOfBirth is not empty %}
+                        <dd>{{ person.placeOfBirth }}</dd>
+                    {% else %}
+                        <dd><span class="chill-no-data-statement">{{ 'Not given'|trans }}</span></dd>
                     {% endif %}
-                {% endfor %}
-
-                <dt>{{ 'Gender'|trans }}&nbsp;:</dt>
-                <dd>{{ ( person.gender|default('Not given'))|trans }}</dd>
-
-                {% if not person.genderComment.isEmpty %}
-                <dt>{{ 'Gender comment'|trans }}&nbsp;:</dt>
-                <dd>{{ person.genderComment|chill_entity_render_box }}</dd>
-                {% endif %}
-
-            </dl>
-
-        </figure>
-    </div>
-
-    <div class="grid-6">
-        <figure class="person-details">
-            <h2 class="chill-green"><i class="fa fa-birthday-cake"></i>&nbsp;{{ 'Birth information'|trans }}</h2>
-
-            <dl>
-                <dt>{{ 'Date of birth'|trans }}&nbsp;:</dt>
-                <dd>
-                    {%- if person.birthdate is not null -%}
-                    {{ person.birthdate|format_date('long') }}
-                    {%- else -%}
-                    <span class="chill-no-data-statement">{{ 'Unknown date of birth'|trans }}</span>
                     {%- endif -%}
-                </dd>
-
-                {%- if chill_person.fields.place_of_birth == 'visible' -%}
-                <dt>{{ 'Place of birth'|trans }}&nbsp;:</dt>
-                {% if person.placeOfBirth is not empty %}
-                    <dd>{{ person.placeOfBirth }}</dd>
-                {% else %}
-                    <dd><span class="chill-no-data-statement">{{ 'Not given'|trans }}</span></dd>
-                {% endif %}
-                {%- endif -%}
-                {%- if chill_person.fields.country_of_birth == 'visible' -%}
-                <dt>{{ 'Country of birth'|trans }}&nbsp;:</dt>
-                <dd>{% apply spaceless %}
-                    {% if person.countryOfBirth is not null %}
-                        {{ person.countryOfBirth.name|localize_translatable_string }}
-                    {% else %}
-                        <span class="chill-no-data-statement">{{ 'Unknown country of birth'|trans }}</span>
-                    {% endif %}
-                {% endapply %}</dd>
-                {%- endif -%}
-
-                {% if person.deathdate is not null %}
-                <dt>{{ 'Date of death'|trans }}&nbsp;:</dt>
-                <dd>{{ person.deathdate|format_date('long') }}</dd>
-                {% endif %}
-
-            </dl>
-
-        </figure>
-    </div>
-</div>
-
-<div class="grid-10 push-1 grid-mobile-12 grid-tablet-12 push-mobile-0 push-tablet-0 parent">
-    {%- if chill_person.fields.nationality == 'visible' or chill_person.fields.spoken_languages == 'visible'-%}
-    <div class="grid-6">
-        <figure class="person-details">
-            <h2 class="chill-orange">{{ 'Administrative information'|trans }}</h2>
-
-            {%- if chill_person.fields.nationality == 'visible' -%}
-            <dl>
-              <dt>{{ 'Nationality'|trans }}&nbsp;:</dt>
-                <dd>
-                    {% if person.nationality is not null %}
-                        {{ person.nationality.name|localize_translatable_string }}
-                    {% else %}
-                        <span class="chill-no-data-statement">{{ 'Without nationality'|trans }}</span>
-                    {% endif %}
-                </dd>
-            </dl>
-            {%- endif -%}
-            {%- if chill_person.fields.spoken_languages == 'visible' -%}
-            <dl>
-                <dt>{{'Spoken languages'|trans}}&nbsp;:</dt>
-                <dd>
-                    {% if person.spokenLanguages|length == 0 %}
-                        <span class="chill-no-data-statement">{{ 'Unknown spoken languages'|trans }}</span>
-                    {% else %}
-                        {% for lang in person.spokenLanguages %}
-                            {{ lang.name|localize_translatable_string }}{% if not loop.last %},{% endif %}
-                        {% endfor %}
-                    {% endif %}
-                </dd>
-            </dl>
-            {%- endif -%}
-
-
-            {%-if chill_person.fields.number_of_children == 'visible' -%}
-            <dl>
-               <dt>{{'Number of children'|trans}}&nbsp;:</dt>
-                <dd>
-                    {% if person.numberOfChildren is not null %}
-                        {{ person.numberOfChildren }}
-                    {% else %}
-                        <span class="chill-no-data-statement">{{ 'No data given'|trans }}</span>
-                    {% endif %}
-                </dd>
-            </dl>
-            {%- endif -%}
-
-            {%- if chill_person.fields.marital_status == 'visible' -%}
-            <dl>
-                <dt>{{'Marital status'|trans}}&nbsp;:</dt>
-                <dd>
-                    {% if person.maritalStatus is not null %}
-                        {{ person.maritalStatus.name|localize_translatable_string }}
-                    {% else %}
-                        <span class="chill-no-data-statement">{{ 'No data given'|trans }}</span>
-                    {% endif %}
-                </dd>
-            </dl>
-            <dl>
-                <dt>{{'Date of last marital status change'|trans}}&nbsp;:</dt>
-                {% if person.maritalStatusDate is not null %}
-                <dd>
-                    {{ person.maritalStatusDate|format_date('long') }}
-                </dd>
-                {% endif %}
-            </dl>
-            <dl>
-                {% if not person.maritalStatusComment.isEmpty %}
-                <dt>{{'Comment on the marital status'|trans}}&nbsp;:</dt>
-                <dd>
-                    {{ person.maritalStatusComment|chill_entity_render_box }}
-                </dd>
-                {% endif %}
-            </dl>
-            {%- endif -%}
-
-        </figure>
-    </div>
-    {%- endif -%}
-    {%- if chill_person.fields.email == 'visible' or chill_person.fields.phonenumber == 'visible' or chill_person.fields.mobilenumber == 'visible' or chill_person.fields.contact_info == 'visible'  -%}
-    <div class="grid-6">
-        <figure class="person-details">
-            <h2 class="chill-blue"><i class="fa fa-envelope-o"></i>&nbsp;{{ 'Contact information'|trans }}</h2>
-
-            {%- if chill_person.fields.address == 'visible' -%}
-            <dl>
-                <dt>{{ 'Address'|trans }}</dt>
-                <dd>
-                    {%- if person.lastAddress is not empty -%}
-                    {{ address._render(person.lastAddress, {'has_no_address': true}) }}
-
-                    <ul class="record_actions record_actions_small">
-                        <li>
-                            <a href="{{ path('chill_person_address_edit', { 'person_id': person.id, 'address_id' : person.lastAddress.id } ) }}" class="sc-button has-hidden button-small bt-edit">
-                                <span class="show-on-hover">{{ 'Edit'|trans }}</span>
-                            </a>
-                        </li>
-                        <li>
-                            <a href="{{ path('chill_person_address_list', { 'person_id': person.id } ) }}" class="sc-button has-hidden button-small">
-                                <i class="fa fa-list" aria-hidden="true"></i><span class="show-on-hover">{{ "Addresses'history"|trans }}</span>
-                            </a>
-                        </li>
-                    </ul>
-                    {%- else -%}
-                    <span class="chill-no-data-statement">{{ 'No address given'|trans }}</span>
-                    <a href="{{ path('chill_person_address_new', { 'person_id' : person.id } ) }}" class="">
-                        {{ 'Add an address'|trans }}
-                    </a>
+                    {%- if chill_person.fields.country_of_birth == 'visible' -%}
+                    <dt>{{ 'Country of birth'|trans }}&nbsp;:</dt>
+                    <dd>{% apply spaceless %}
+                        {% if person.countryOfBirth is not null %}
+                            {{ person.countryOfBirth.name|localize_translatable_string }}
+                        {% else %}
+                            <span class="chill-no-data-statement">{{ 'Unknown country of birth'|trans }}</span>
+                        {% endif %}
+                    {% endapply %}</dd>
                     {%- endif -%}
-                </dd>
-            </dl>
-            {%- endif -%}
-
-
-            {%- if chill_person.fields.email == 'visible' -%}
-            <dl>
-                <dt>{{ 'Email'|trans }}&nbsp;:</dt>
-                <dd>{% if person.email is not empty %}<a href="mailto:{{ person.email|escape('html_attr') }}">{{ person.email }}</a>{% else %}<span class="chill-no-data-statement">{{ 'No data given'|trans }}</span>{% endif %}</dd>
-                {%- if person.email is not empty and person.acceptEmail -%}
-                <dd>
-                    <span class="badge badge-secondary">
-                        {{- 'Accept emails'|trans -}}
-                    </span>
-                </dd>
-                {%- endif -%}
-            </dl>
-            {%- endif -%}
-            {%- if chill_person.fields.phonenumber == 'visible' -%}
-            <dl>
-                <dt>{{ 'Phonenumber'|trans }}&nbsp;:</dt>
-                <dd>{% if person.phonenumber is not empty %}<a href="tel:{{ person.phonenumber }}"><pre>{{ person.phonenumber|chill_format_phonenumber }}</pre></a>{% else %}<span class="chill-no-data-statement">{{ 'No data given'|trans }}{% endif %}</dd>
-            </dl>
-            {% endif %}
-            {%- if chill_person.fields.mobilenumber == 'visible' -%}
-            <dl>
-                <dt>{{ 'Mobilenumber'|trans }}&nbsp;:</dt>
-                <dd>{% if person.mobilenumber is not empty %}<a href="tel:{{ person.mobilenumber }}"><pre>{{ person.mobilenumber|chill_format_phonenumber }}</pre></a>{% else %}<span class="chill-no-data-statement">{{ 'No data given'|trans }}{% endif %}</dd>
-                {%- if person.mobilenumber is not empty and person.acceptSMS -%}
-                <dd>
-                    <span class="badge badge-secondary">
-                        {{- 'Accept short text message'|trans -}}
-                    </span>
-                </dd>
-                {%- endif -%}
-            </dl>
-            {% endif %}
-            {% for pp in person.otherPhoneNumbers %}
-                <dt>{{ 'Other phonenumber'|trans }}&nbsp;:</dt>
-                <dd>
-                    <a href="tel:{{ pp.phoneNumber }}"><pre>{{ pp.phoneNumber|chill_format_phonenumber }}</pre></a>
-                    {% if pp.description is not empty %}
-                    <blockquote class="chill-user-quote">
-                    {{ pp.description|nl2br }}
-                    {% endif %}
-                    </blockquote>
-                </dd>
-            {% endfor %}
-            {%- if chill_person.fields.contact_info == 'visible' -%}
-            <dl>
-                <dt>{{ 'Notes on contact information'|trans }}&nbsp;:</dt>
-                <dd>
-                    {% if person.contactInfo is not empty %}
-                    <div class="chill-user-quote">
-                        {{ person.contactInfo|chill_markdown_to_html }}
-                    </div>
-                    {% else %}
-                        <span class="chill-no-data-statement">{{ 'No data given'|trans }}</span>
-                    {% endif %}
-                </dd>
-            </dl>
-            {%- endif -%}
-
-        </figure>
+                </dl>
+            </figure>
+        </div>
     </div>
-    {%- endif -%}
-</div>
 
-{% if cFGroup and (cFGroup.getActiveCustomFields|length > 0) %}
-    <div class="grid-10 push-1 grid-mobile-12 grid-tablet-12 push-mobile-0 push-tablet-0 parent">
-        <div class="grid-12 custom-fields">
+    <div class="row">
+        {%- if chill_person.fields.nationality == 'visible' or chill_person.fields.spoken_languages == 'visible'-%}
+        <div class="col-sm-6 my-3">
+            <figure class="person-details">
+                <h2 class="chill-orange">{{ 'Administrative information'|trans }}</h2>
+
+                {%- if chill_person.fields.nationality == 'visible' -%}
+                <dl>
+                  <dt>{{ 'Nationality'|trans }}&nbsp;:</dt>
+                    <dd>
+                        {% if person.nationality is not null %}
+                            {{ person.nationality.name|localize_translatable_string }}
+                        {% else %}
+                            <span class="chill-no-data-statement">{{ 'Without nationality'|trans }}</span>
+                        {% endif %}
+                    </dd>
+                </dl>
+                {%- endif -%}
+                {%- if chill_person.fields.spoken_languages == 'visible' -%}
+                <dl>
+                    <dt>{{'Spoken languages'|trans}}&nbsp;:</dt>
+                    <dd>
+                        {% if person.spokenLanguages|length == 0 %}
+                            <span class="chill-no-data-statement">{{ 'Unknown spoken languages'|trans }}</span>
+                        {% else %}
+                            {% for lang in person.spokenLanguages %}
+                                {{ lang.name|localize_translatable_string }}{% if not loop.last %},{% endif %}
+                            {% endfor %}
+                        {% endif %}
+                    </dd>
+                </dl>
+                {%- endif -%}
+                {%- if chill_person.fields.marital_status == 'visible' -%}
+                <dl>
+                    <dt>{{'Marital status'|trans}}&nbsp;:</dt>
+                    <dd>
+                        {% if person.maritalStatus is not null %}
+                            {{ person.maritalStatus.name|localize_translatable_string }}
+                        {% else %}
+                            <span class="chill-no-data-statement">{{ 'No data given'|trans }}</span>
+                        {% endif %}
+                    </dd>
+                </dl>
+                {%- endif -%}
+            </figure>
+        </div>
+        {%- endif -%}
+
+        {%- if chill_person.fields.email == 'visible'
+            or chill_person.fields.phonenumber == 'visible'
+            or chill_person.fields.mobilenumber == 'visible'
+            or chill_person.fields.contact_info == 'visible' -%}
+        <div class="col-sm-6 my-3">
+            <figure class="person-details">
+                <h2 class="chill-blue"><i class="fa fa-envelope-o"></i>&nbsp;{{ 'Contact information'|trans }}</h2>
+
+                {%- if chill_person.fields.address == 'visible' -%}
+                <dl>
+                    <dt>{{ 'Address'|trans }}</dt>
+                    <dd>
+                        {%- if person.lastAddress is not empty -%}
+                        {{ person.lastAddress|chill_entity_render_box({
+                            'render': 'bloc',
+                            'multiline': true,
+                            'extended_infos': true,
+                            'has_no_address': true
+                        }) }}
+
+                        <ul class="list-inline text-right mt-2">
+                            <li class="list-inline-item">
+                                <a class="btn btn-warning btn-sm" title="{{ 'Edit'|trans }}"
+                                   href="{{ path('chill_person_address_edit', { 'person_id': person.id, 'address_id' : person.lastAddress.id } ) }}">
+                                    <i class="fa fa-pencil fa-fw"></i>
+                                </a>
+                            </li>
+                            <li class="list-inline-item">
+                                <a class="btn btn-secondary btn-sm" title="{{ "Addresses history"|trans }}"
+                                   href="{{ path('chill_person_address_list', { 'person_id': person.id } ) }}">
+                                    <i class="fa fa-list fa-fw"></i>
+                                </a>
+                            </li>
+                        </ul>
+
+                        {%- else -%}
+                        <span class="chill-no-data-statement">{{ 'No address given'|trans }}</span>
+                        <a href="{{ path('chill_person_address_new', { 'person_id' : person.id } ) }}" class="">
+                            {{ 'Add an address'|trans }}
+                        </a>
+                        {%- endif -%}
+                    </dd>
+                </dl>
+                {%- endif -%}
+
+
+                {%- if chill_person.fields.email == 'visible' -%}
+                <dl>
+                    <dt>{{ 'Email'|trans }}&nbsp;:</dt>
+                    <dd>{% if person.email is not empty %}<blockquote class="chill-user-quote">{{ person.email|nl2br }}</blockquote>{% else %}<span class="chill-no-data-statement">{{ 'No data given'|trans }}</span>{% endif %}</dd>
+                </dl>
+                {%- endif -%}
+                {%- if chill_person.fields.phonenumber == 'visible' -%}
+                <dl>
+                    <dt>{{ 'Phonenumber'|trans }}&nbsp;:</dt>
+                    <dd>{% if person.phonenumber is not empty %}<a href="tel:{{ person.phonenumber }}"><pre>{{ person.phonenumber|chill_format_phonenumber }}</pre></a>{% else %}<span class="chill-no-data-statement">{{ 'No data given'|trans }}{% endif %}</dd>
+                </dl>
+                {% endif %}
+                {%- if chill_person.fields.mobilenumber == 'visible' -%}
+                <dl>
+                    <dt>{{ 'Mobilenumber'|trans }}&nbsp;:</dt>
+                    <dd>{% if person.mobilenumber is not empty %}<a href="tel:{{ person.mobilenumber }}"><pre>{{ person.mobilenumber|chill_format_phonenumber }}</pre></a>{% else %}<span class="chill-no-data-statement">{{ 'No data given'|trans }}{% endif %}</dd>
+                </dl>
+                {% endif %}
+                {%- if chill_person.fields.contact_info == 'visible' -%}
+                <dl>
+                    <dt>{{ 'Notes on contact information'|trans }}&nbsp;:</dt>
+                    <dd>{% if person.contactInfo is not empty %}{{ person.contactInfo|nl2br }}{% else %}<span class="chill-no-data-statement">{{ 'No data given'|trans }}</span>{% endif %}</dd>
+                </dl>
+                {%- endif -%}
+
+            </figure>
+        </div>
+        {%- endif -%}
+    </div>
+
+    {% if cFGroup and (cFGroup.getActiveCustomFields|length > 0) %}
+    <div class="row">
+        <div class="col-12 custom-fields">
             <figure class="person-details">
                 {{ chill_custom_fields_group_widget(person.cFData, cFGroup) }}
             </figure>
         </div>
     </div>
 
-    <div class="grid-10 push-1 grid-mobile-12 grid-tablet-12 push-mobile-0 push-tablet-0 parent">
-        <figure class="person-details">
-        </figure>
+    <div class="row">
+        <figure class="person-details"></figure>
     </div>
-{% endif %}
+    {% endif %}
 
-{% if is_granted('CHILL_PERSON_UPDATE', person) %}
-<ul class="grid-12 sticky-form-buttons record_actions ">
-    <li>
-        <a class="sc-button bt-update" href="{{ path('chill_person_general_edit', { 'person_id': person.id }) }}">
-           {{ 'Edit'|trans }}
-        </a>
-    </li>
-
-</ul>
-{% endif %}
-
-</div> <!-- end of div.person-view -->
+    {% if is_granted('CHILL_PERSON_UPDATE', person) %}
+    <ul class="sticky-form-buttons record_actions">
+        <li>
+            <a class="btn btn-update" href="{{ path('chill_person_general_edit', { 'person_id': person.id }) }}">
+                {{ 'Edit'|trans }}
+            </a>
+        </li>
+    </ul>
+    {% endif %}
 
+</div>
 {% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/_sidepane.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/_sidepane.html.twig
index 098737aaf..f7fef7f93 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/_sidepane.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/_sidepane.html.twig
@@ -1,7 +1,5 @@
 {%- macro details(person, options) -%}
 
-{% import '@ChillMain/Address/macro.html.twig' as address %}
-
 <ul>
     <li><b>{{ 'gender'|trans }}</b>:
         {{ person.gender|trans }}</li>
@@ -24,7 +22,9 @@
     <li><b>{{ 'memo'|trans }}</b>:
         {{ person.memo }}</li>
     <li><b>{{ 'address'|trans }}</b>:
-        {%- if person.lastAddress is not empty -%}{{ address._render(person.lastAddress, {'with_valid_from': false}) }}{% endif %}</li>
+        {%- if person.lastAddress is not empty -%}
+            {{ person.lastAddress|chill_entity_render_box({'with_valid_from': false}) }}
+        {% endif %}</li>
     <li><b>{{ 'spokenLanguages'|trans }}</b>:
         {% for lang in person.spokenLanguages %}{{ lang.name|localize_translatable_string }}{% if not loop.last %},{% endif %}{% endfor %}</li>
     <li><b>{{ 'contactInfo'|trans }}</b>:
@@ -43,4 +43,4 @@
     <li><b>{{ person.counters.nb_addresses }}</b> {{ (person.counters.nb_addresses > 1)? 'adresses' : 'adresse' }}</li>
 
 </ul>
-{% endmacro %}
\ No newline at end of file
+{% endmacro %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/confirm.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/confirm.html.twig
index 7f17a70ec..304e78eb3 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/confirm.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/confirm.html.twig
@@ -21,17 +21,17 @@
 
 
 </style>
-<div class="container content"><div class="duplicate-content">
+<div class="container-fluid content"><div class="duplicate-content">
 
     <h1>{{ 'Merge duplicate persons folders'|trans }}</h1>
 
-    <div class="grid-6 grid-tablet-12 gid-mobile-12">
+    <div class="col-md-6">
         <p><b>{{ 'Old person'|trans }}</b>:
             {{ 'Old person explain'|trans }}
         </p>
         <div class="col">
 
-            <h1><span><a class="sc-button bt-show" target="_blank" title="{{ 'Open in another window'|trans }}" href="{{ path('chill_person_view', { person_id : person2.id }) }}"></a></span>
+            <h1><span><a class="btn btn-show" target="_blank" title="{{ 'Open in another window'|trans }}" href="{{ path('chill_person_view', { person_id : person2.id }) }}"></a></span>
                 {{ person2 }}
             </h1>
 
@@ -43,13 +43,13 @@
         </div>
     </div>
 
-    <div class="grid-6 grid-tablet-12 gid-mobile-12">
+    <div class="col-md-6">
         <p><b>{{ 'New person'|trans }}</b>:
             {{ 'New person explain'|trans }}
         </p>
         <div class="col border">
 
-            <h1><span><a class="sc-button bt-show" target="_blank" title="{{ 'Open in another window'|trans }}" href="{{ path('chill_person_view', { person_id : person.id }) }}"></a></span>
+            <h1><span><a class="btn btn-show" target="_blank" title="{{ 'Open in another window'|trans }}" href="{{ path('chill_person_view', { person_id : person.id }) }}"></a></span>
                 {{ person }}
             </h1>
 
@@ -63,34 +63,33 @@
 
     {{ form_start(form) }}
 
-    <div class="grid-4 grid-tablet-12 gid-mobile-12 centered">
+    <div class="col-md-4 centered">
 
-        <div class="container" style="padding-top: 1em;">
-            <div class="grid-1 clear" style="padding-top: 10px;">
+        <div class="container-fluid" style="padding-top: 1em;">
+            <div class="col-1 clear" style="padding-top: 10px;">
                 {{ form_widget(form.confirm) }}
             </div>
-            <div class="grid-11">
+            <div class="col-11">
                 {{ form_label(form.confirm) }}
             </div>
         </div>
     </div>
 
-    <ul class="grid-12 record_actions">
+    <ul class="col-12 record_actions">
         <li class="cancel">
-            <a href="{{ app.request.headers.get('referer') }}" class="sc-button grey center margin-5">
-                <i class="fa fa-arrow-left"></i>
+            <a href="{{ app.request.headers.get('referer') }}" class="btn btn-chill-gray center margin-5">
                 {{ 'Return'|trans }}
             </a>
         </li>
         <li class="cancel">
             <a  href="{{ path('chill_person_duplicate_confirm', { person1_id : person2.id, person2_id : person.id }) }}"
-                class="sc-button bt-action">
+                class="btn btn-action">
                 <i class="fa fa-exchange"></i>
                 {{ 'Invert'|trans }}
             </a>
         </li>
         <li>
-            <button class="sc-button bt-submit" type="submit"><i class="fa fa-cog fa-fw"></i>{{ 'Merge'|trans }}</button>
+            <button class="btn btn-submit" type="submit"><i class="fa fa-cog fa-fw"></i>{{ 'Merge'|trans }}</button>
         </li>
     </ul>
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/find_manually.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/find_manually.html.twig
index f8f80bd56..0c257c0ea 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/find_manually.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/find_manually.html.twig
@@ -1,4 +1,4 @@
-{% extends "@ChillPerson/layout.html.twig"  %}
+{% extends "@ChillPerson/Person/layout.html.twig"  %}
 
 {% set activeRouteKey = 'chill_person_duplicate' %}
 
@@ -7,24 +7,25 @@
 
 
 {% block personcontent %}
+<div class="person-duplicate">
+            
+            <h1>{{ 'Désigner un dossier doublon'|trans }}</h1>
+            
+            {{ form_start(form) }}
+            {{ form_rest(form) }}
 
-    <h1>Désigner un dossier doublon</h1>
-    
-    {{ form_start(form) }}
-    {{ form_rest(form) }}
+            <ul class="record_actions sticky-form-buttons">
+                <li class="cancel">
+                    <a href="{{ path('chill_person_duplicate_view',  {'person_id' : person.id}) }}" class="btn btn-cancel">
+                        {{ 'Return'|trans }}
+                    </a>
+                </li>
+                <li>
+                    <button class="btn btn-save" type="submit">{{ 'Next'|trans }}</button>
+                </li>
+            </ul>
 
-    <ul class="grid-12 record_actions ">
-        <li class="cancel">
-            <a href="{{ path('chill_person_duplicate_view',  {'person_id' : person.id}) }}" class="sc-button">
-                <i class="fa fa-arrow-left"></i>
-                {{ 'Return'|trans }}
-            </a>
-        </li>
-        <li>
-            <button class="sc-button bt-save" type="submit">{{ 'Next'|trans }}</button>
-        </li>
-    </ul>
-
-    {{ form_end(form) }}
+            {{ form_end(form) }}
 
+</div>
 {% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/view.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/view.html.twig
index ffda32db6..5cef17c13 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/view.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/view.html.twig
@@ -1,156 +1,161 @@
-{% extends "@ChillPerson/layout.html.twig"  %}
+{% extends "@ChillPerson/Person/layout.html.twig"  %}
 
 {% set activeRouteKey = 'chill_person_duplicate' %}
 
 {% block title %}{{ 'Person duplicate'|trans|capitalize ~ ' ' ~ person.firstName|capitalize ~
     ' ' ~ person.lastName }}{% endblock %}
 
-
 {% block personcontent %}
-<h1>{{ title|default('Person duplicate')|trans }}</h1>
+<div class="person-duplicate">
+                        
+            <h1>{{ title|default('Person duplicate')|trans }}</h1>
 
-{% if duplicatePersons|length > 0 %}
-    <p>{{ title|default('Person duplicate explained')|trans }}</p>
+            {% if duplicatePersons|length > 0 %}
+                <p>{{ title|default('Person duplicate explained')|trans }}</p>
 
-    <table>
-    <thead>
-        <tr>
-            <th class="chill-green">{% trans %}Name{% endtrans %}</th>
-            <th class="chill-green">{% trans %}Date of birth{% endtrans %}</th>
-            <th class="chill-green">{% trans %}Nationality{% endtrans %}</th>
-            <th>&nbsp;</th>
-        </tr>
-    </thead>
+                <table class="table table-bordered border-dark">
+                <thead>
+                    <tr>
+                        <th class="chill-green">{% trans %}Name{% endtrans %}</th>
+                        <th class="chill-green">{% trans %}Date of birth{% endtrans %}</th>
+                        <th class="chill-green">{% trans %}Nationality{% endtrans %}</th>
+                        <th>&nbsp;</th>
+                    </tr>
+                </thead>
 
-    {% for duplicatePerson in duplicatePersons %}
-        <tr>
-            <td>
-                {% set is_open = duplicatePerson.isOpen() %}
-                <a href="{{ path('chill_person_view', { person_id : duplicatePerson.getId }) }}" {% if chill_person.fields.accompanying_period == 'visible' %}{% if is_open %} alt="{{ 'An accompanying period is open'|trans|e('html_attr') }}"{% else %} alt="{{ 'Any accompanying periods are open'|trans|e('html_attr') }}" {% endif %}{% endif %}>
-                    {{ duplicatePerson|chill_entity_render_box }}
-                    {% apply spaceless %}
-                        {% if chill_person.fields.accompanying_period == 'visible' %}
-                            {% if is_open == false %}
-                                <i class="fa fa-lock" ></i>
+                {% for duplicatePerson in duplicatePersons %}
+                    <tr>
+                        <td>
+                            {% set is_open = duplicatePerson.isOpen() %}
+                            <a href="{{ path('chill_person_view', { person_id : duplicatePerson.getId }) }}" {% if chill_person.fields.accompanying_period == 'visible' %}{% if is_open %} alt="{{ 'An accompanying period is open'|trans|e('html_attr') }}"{% else %} alt="{{ 'Any accompanying periods are open'|trans|e('html_attr') }}" {% endif %}{% endif %}>
+                                {{ duplicatePerson|chill_entity_render_box }}
+                                {% apply spaceless %}
+                                    {% if chill_person.fields.accompanying_period == 'visible' %}
+                                        {% if is_open == false %}
+                                            <i class="fa fa-lock" ></i>
+                                        {% else %}
+                                            <i class="fa fa-unlock" ></i>
+                                        {% endif %}
+                                    {% endif %}
+                                {% endapply %}
+                            </a>
+                        </td>
+                        <td>
+                            {% if duplicatePerson.birthdate is not null %}
+                                {{ duplicatePerson.birthdate|format_date('long') }}
                             {% else %}
-                                <i class="fa fa-unlock" ></i>
+                                {{ 'Unknown date of birth'|trans }}
                             {% endif %}
-                        {% endif %}
-                    {% endapply %}
-                </a>
-            </td>
-            <td>
-                {% if duplicatePerson.birthdate is not null %}
-                    {{ duplicatePerson.birthdate|format_date('long') }}
-                {% else %}
-                    {{ 'Unknown date of birth'|trans }}
-                {% endif %}
-            </td>
-            <td>
-                {% if duplicatePerson.nationality is not null %}
-                    {{ duplicatePerson.nationality.name|localize_translatable_string }}
-                {% else %}
-                    {{ 'Without nationality'|trans }}
-                {% endif %}
-            </td>
-            <td>
-                <ul class="record_actions">
-                    <li>
-                        <a class="sc-button bt-show" target="_blank" href="{{ path('chill_person_view', { person_id : duplicatePerson.id }) }}"></a>
-                    </li>
-                    <li>
-                        <a class="sc-button bt-action" href="{{ path('chill_person_duplicate_confirm', { person1_id : person.id, person2_id : duplicatePerson.id }) }}">
-                        <i class="fa fa-cog fa-fw"></i>{{ 'Merge'|trans }}</a>
-                    </li>
-                    <li>
-                        <a class="sc-button" title="{{ 'Switch to truefalse'|trans }}"
-                           href="{{ path('chill_person_duplicate_not_duplicate', {person1_id : person.id, person2_id : duplicatePerson.id}) }}">
-                        <i class="fa fa-toggle-on fa-fw"></i>{{ 'duplicate'|trans }}</a>
-                    </li>
-                </ul>
-            </td>
-        </tr>
-    {% endfor %}
-    </table>
-{% endif %}
+                        </td>
+                        <td>
+                            {% if duplicatePerson.nationality is not null %}
+                                {{ duplicatePerson.nationality.name|localize_translatable_string }}
+                            {% else %}
+                                {{ 'Without nationality'|trans }}
+                            {% endif %}
+                        </td>
+                        <td>
+                            <ul class="record_actions">
+                                <li>
+                                    <a class="btn btn-show" target="_blank" href="{{ path('chill_person_view', { person_id : duplicatePerson.id }) }}"></a>
+                                </li>
+                                <li>
+                                    <a class="btn btn-action" href="{{ path('chill_person_duplicate_confirm', { person1_id : person.id, person2_id : duplicatePerson.id }) }}">
+                                    <i class="fa fa-cog fa-fw"></i>{{ 'Merge'|trans }}</a>
+                                </li>
+                                <li>
+                                    <a class="btn btn-misc" title="{{ 'Switch to truefalse'|trans }}"
+                                        href="{{ path('chill_person_duplicate_not_duplicate', {person1_id : person.id, person2_id : duplicatePerson.id}) }}">
+                                        <i class="fa fa-toggle-on fa-fw"></i>
+                                        {{ 'duplicate'|trans }}
+                                    </a>
+                                </li>
+                            </ul>
+                        </td>
+                    </tr>
+                {% endfor %}
+                </table>
+            {% endif %}
 
-{% if notDuplicatePersons|length > 0 %}
-    <h2>{{ 'Person flaged as duplicate' | trans }}</h2>
-    <p>{{ 'Person flaged as duplicate explained' | trans }}</p>
+            {% if notDuplicatePersons|length > 0 %}
+                <h2>{{ 'Person flaged as duplicate' | trans }}</h2>
+                <p>{{ 'Person flaged as duplicate explained' | trans }}</p>
 
-    <table>
-        <thead>
-        <tr>
-            <th class="chill-orange">{% trans %}Name{% endtrans %}</th>
-            <th class="chill-orange">{% trans %}Date of birth{% endtrans %}</th>
-            <th class="chill-orange">{% trans %}Nationality{% endtrans %}</th>
-            <th>&nbsp;</th>
-        </tr>
-        </thead>
+                <table class="table table-bordered border-dark">
+                    <thead>
+                    <tr>
+                        <th class="chill-orange">{% trans %}Name{% endtrans %}</th>
+                        <th class="chill-orange">{% trans %}Date of birth{% endtrans %}</th>
+                        <th class="chill-orange">{% trans %}Nationality{% endtrans %}</th>
+                        <th>&nbsp;</th>
+                    </tr>
+                    </thead>
 
-        {% for notDuplicatePerson in notDuplicatePersons %}
-            <tr>
-                <td>
-                    {% set is_open = notDuplicatePerson.isOpen() %}
-                    <a href="{{ path('chill_person_view', { person_id : notDuplicatePerson.getId }) }}" {% if chill_person.fields.accompanying_period == 'visible' %}{% if is_open %} alt="{{ 'An accompanying period is open'|trans|e('html_attr') }}"{% else %} alt="{{ 'Any accompanying periods are open'|trans|e('html_attr') }}" {% endif %}{% endif %}>
-                        {{ notDuplicatePerson|chill_entity_render_box }}
-                        {% apply spaceless %}
-                            {% if chill_person.fields.accompanying_period == 'visible' %}
-                                {% if is_open == false %}
-                                    <i class="fa fa-lock" ></i>
+                    {% for notDuplicatePerson in notDuplicatePersons %}
+                        <tr>
+                            <td>
+                                {% set is_open = notDuplicatePerson.isOpen() %}
+                                <a href="{{ path('chill_person_view', { person_id : notDuplicatePerson.getId }) }}" {% if chill_person.fields.accompanying_period == 'visible' %}{% if is_open %} alt="{{ 'An accompanying period is open'|trans|e('html_attr') }}"{% else %} alt="{{ 'Any accompanying periods are open'|trans|e('html_attr') }}" {% endif %}{% endif %}>
+                                    {{ notDuplicatePerson|chill_entity_render_box }}
+                                    {% apply spaceless %}
+                                        {% if chill_person.fields.accompanying_period == 'visible' %}
+                                            {% if is_open == false %}
+                                                <i class="fa fa-lock" ></i>
+                                            {% else %}
+                                                <i class="fa fa-unlock" ></i>
+                                            {% endif %}
+                                        {% endif %}
+                                    {% endapply %}
+                                </a>
+                            </td>
+                            <td>
+                                {% if notDuplicatePerson.birthdate is not null %}
+                                    {{ notDuplicatePerson.birthdate|format_date('long') }}
                                 {% else %}
-                                    <i class="fa fa-unlock" ></i>
+                                    {{ 'Unknown date of birth'|trans }}
                                 {% endif %}
-                            {% endif %}
-                        {% endapply %}
+                            </td>
+                            <td>
+                                {% if notDuplicatePerson.nationality is not null %}
+                                    {{ notDuplicatePerson.nationality.name|localize_translatable_string }}
+                                {% else %}
+                                    {{ 'Without nationality'|trans }}
+                                {% endif %}
+                            </td>
+                            <td>
+                                <ul class="record_actions">
+                                    <li>
+                                        <a class="btn btn-show" target="_blank" href="{{ path('chill_person_view', { person_id : notDuplicatePerson.id }) }}"></a>
+                                    </li>
+                                    <li>
+                                        <a class="btn btn-misc" title="{{ 'Switch to duplicate'|trans }}"
+                                           href="{{ path('chill_person_remove_duplicate_not_duplicate', {person1_id : person.id, person2_id : notDuplicatePerson.id}) }}">
+                                           <i class="fa fa-toggle-off fa-fw"></i>
+                                           {{ 'not-duplicate'|trans }}
+                                       </a>
+                                    </li>
+                                </ul>
+                            </td>
+                        </tr>
+                    {% endfor %}
+                </table>
+            {% endif %}
+                
+            {% if notDuplicatePersons|length == 0 and duplicatePersons|length == 0 %}
+                <span class="chill-no-data-statement">{{ 'No duplicate candidates'|trans }}</span>
+            {% endif %}
+                
+            <ul class="record_actions sticky-form-buttons">
+                <li class="cancel">
+                    <a href="{{ path('chill_person_view', {person_id: person.id }) }}" class="btn btn-cancel">
+                        {{ 'Return'|trans }}</a>
+                </li>
+                <li>
+                    <a href="{{ path('chill_person_find_manually_duplicate', {person_id: person.id}) }}" class="btn btn-action">
+                        {{ 'Associate manually a duplicate person' | trans }}
                     </a>
-                </td>
-                <td>
-                    {% if notDuplicatePerson.birthdate is not null %}
-                        {{ notDuplicatePerson.birthdate|format_date('long') }}
-                    {% else %}
-                        {{ 'Unknown date of birth'|trans }}
-                    {% endif %}
-                </td>
-                <td>
-                    {% if notDuplicatePerson.nationality is not null %}
-                        {{ notDuplicatePerson.nationality.name|localize_translatable_string }}
-                    {% else %}
-                        {{ 'Without nationality'|trans }}
-                    {% endif %}
-                </td>
-                <td>
-                    <ul class="record_actions">
-                        <li>
-                            <a class="sc-button bt-show" target="_blank" href="{{ path('chill_person_view', { person_id : notDuplicatePerson.id }) }}"></a>
-                        </li>
-                        <li>
-                            <a class="sc-button" title="{{ 'Switch to duplicate'|trans }}"
-                               href="{{ path('chill_person_remove_duplicate_not_duplicate', {person1_id : person.id, person2_id : notDuplicatePerson.id}) }}">
-                            <i class="fa fa-toggle-off fa-fw"></i>{{ 'not-duplicate'|trans }}</a>
-                        </li>
-                    </ul>
-                </td>
-            </tr>
-        {% endfor %}
-    </table>
-{% endif %}
-    
-{% if notDuplicatePersons|length == 0 and duplicatePersons|length == 0 %}
-    <span class="chill-no-data-statement">{{ 'No duplicate candidates'|trans }}</span>
-{% endif %}
-    
-<ul class="record_actions">
-    <li class="cancel">
-        <a href="{{ path('chill_person_view', {person_id: person.id }) }}" class="sc-button">
-            <i class="fa fa-arrow-left"></i>
-            {{ 'Return'|trans }}</a>
-    </li>
-    <li>
-        <a href="{{ path('chill_person_find_manually_duplicate', {person_id: person.id}) }}" class="sc-button bt-action">
-            {{ 'Associate manually a duplicate person' | trans }}
-        </a>
-    </li>
-</ul>
+                </li>
+            </ul>
 
+</div>            
 {% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Timeline/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Timeline/index.html.twig
index ece7b50ee..a154972c0 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Timeline/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Timeline/index.html.twig
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
-{% extends "@ChillPerson/layout.html.twig"  %}
+{% extends "@ChillPerson/Person/layout.html.twig"  %}
 
 {% set activeRouteKey = 'chill_person_timeline' %}
 
@@ -27,9 +27,13 @@ This view should receive those arguments:
 
 
 {% block personcontent %}
-    {{ timeline|raw }}
+<div class="timeline">
+            
+            {{ timeline|raw }}
+            
+            {% if nb_items > paginator.getItemsPerPage %}
+            {{ chill_pagination(paginator) }}
+            {% endif %}
     
-    {% if nb_items > paginator.getItemsPerPage %}
-    {{ chill_pagination(paginator) }}
-    {% endif %}
-{% endblock personcontent %}
+</div>    
+{% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Widget/homepage_add_a_person.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Widget/homepage_add_a_person.html.twig
index 3849974c4..92f5b9313 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Widget/homepage_add_a_person.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Widget/homepage_add_a_person.html.twig
@@ -1,9 +1,11 @@
 {% if is_granted('CHILL_PERSON_CREATE') %}
-<div class="grid-8 centered" style="text-align:center; margin-top: 1.5em;">
-    <a href="{{ path('chill_person_new') }}">
-        <div class="sc-button blue" style="float: inherit;">
-            {{ 'Add a person'|trans }}
-        </div>
-    </a>
+<div class="col-8 mt-5 homepage_widget">
+    <center>
+        <a href="{{ path('chill_person_new') }}">
+            <div class="btn btn-lg btn-primary">
+                {{ 'Add a person'|trans }}
+            </div>
+        </a>
+    </center>
 </div>
 {% endif %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Widget/homepage_person_list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Widget/homepage_person_list.html.twig
index 2be7d7885..9603cad17 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Widget/homepage_person_list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Widget/homepage_person_list.html.twig
@@ -3,7 +3,7 @@
     under the customFields variable, with the custom field slug as key.
 #}
 {% import 'ChillPersonBundle:Person:macro.html.twig' as person %}
-<div class="grid-8 centered">
+<div class="col-8 centered">
     <h2>{{ 'Accompanyied people'|trans }}</h2>
     <table>
         <tbody>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/layout.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/layout.html.twig
deleted file mode 100644
index 3f5828bb6..000000000
--- a/src/Bundle/ChillPersonBundle/Resources/views/layout.html.twig
+++ /dev/null
@@ -1,134 +0,0 @@
-{#
- * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS, 
- <info@champs-libres.coop> / <http://www.champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#}
-
-{% extends "@ChillMain/layoutWithVerticalMenu.html.twig" %}
-
-{% block top_banner %}
-<div class="subheader banner banner-person">
-    <div class="grid-12 parent" id="header-person-name" >
-        <div class="grid-10 push-1 grid-mobile-12 grid-tablet-12 push-mobile-0 push-tablet-0 parent">
-            
-            <div class="grid-7">
-                <h1>
-                    {% set gender = 
-                        (person.gender == "woman") ? 'female' : 
-                            (person.gender == "both") ? 'neuter' : 'male' 
-                    %}
-                    <i class="fa fa-fw fa-{{ gender }}" title="{{ gender|capitalize|trans }}"></i>
-                    
-                    {{ person|chill_entity_render_string }}
-                    
-                    <span class="id-number" title="{{ 'Person'|trans ~ ' ' ~ person.id }}">
-                        {{  person.id|upper }}
-                    </span> 
-                </h1>
-            </div>
-            
-            <div class="grid-5">
-                <ul class="list-content fa-ul">
-                    <li>
-                        <i class="fa fa-li fa-map-marker"></i>
-                        {%- if person.currentHouseholdAddress is not empty -%}
-                            {{ person.currentHouseholdAddress|chill_entity_render_box({'multiline': false, 'with_valid_from': false}) }}
-                        {%- elseif person.lastAddress is not empty -%}
-                            {{ person.lastAddress|chill_entity_render_box({'multiline': false, 'with_valid_from': false}) }}
-                        {%- else -%}
-                            <span class="chill-no-data-statement">{{ 'No address given'|trans }}</span>
-                        {%- endif -%}
-                    </li>
-                    <li>
-                        {% if person.mobilenumber %}
-                            <i class="fa fa-li fa-mobile"></i>
-                            <a href="{{ 'tel:' ~ person.mobilenumber }}" class="phone" title="{{ 'Mobilenumber'|trans }}">
-                                {{ person.mobilenumber|chill_format_phonenumber }}</a>
-                        {% else %}
-                            <i class="fa fa-li fa-phone"></i>
-                            {% if person.phonenumber %}
-                                <a href="{{ 'tel:' ~ person.phonenumber }}" class="phone" title="{{ 'Phonenumber'|trans }}">
-                                {{ person.phonenumber|chill_format_phonenumber }}</a>
-                            {% else %}
-                                <span class="chill-no-data-statement">{{ 'No data given'|trans }}</span>
-                            {% endif %}
-                        {% endif %}
-                        
-                        <span class="ml-3">
-                            <i class="fa fa-fw fa-envelope-o"></i>
-                            <a href="{{ 'mailto:' ~ person.email }}" class="email" title="{{ 'Email'|trans }}">
-                                {{ person.email|chill_print_or_message("thirdparty.No_email") }}
-                            </a>
-                        </span>
-                    </li>
-                </ul>
-            </div>
-                
-        </div>
-    </div>
-
-    <div class="grid-12 parent" id="header-person-details" >
-        <div class="grid-10 push-1 grid-mobile-12 grid-tablet-12 push-mobile-0 push-tablet-0 parent">
-            
-            <div class="grid-5">
-                <span class="open_sansbold">{{ 'Birthdate'|trans|upper  }}&nbsp;:</span>
-                {% if person.birthdate == null %}
-                    {{ 'Unknown date of birth'|trans }}
-                {% else %}
-                    {{ person.birthdate|format_date('short') }}
-                {% endif %}
-                <span class="age">{{ person.age ~ ((person.age > 1) ? ' ans' : ' an') }}</span>
-            </div>
-            
-            {%- if chill_person.fields.nationality == 'visible' -%}
-            <div class="grid-4">
-                <span class="open_sansbold">{{ 'Nationality'|trans|upper}}&nbsp;:</span>
-                {% if person.nationality is not null %}
-                    {{ person.nationality.name|localize_translatable_string }}
-                {% else %}
-                    {% trans %}Without nationality{% endtrans %}
-                {% endif %}
-            </div>
-            {%- endif -%}
-            
-            {%- if chill_person.fields.spoken_languages == 'visible' -%}
-            <div class="grid-3">
-                <span class="open_sansbold">{{ 'Center'|trans|upper}}&nbsp;:</span> {{  person.center.name|upper }}
-            </div>
-            {%- endif -%}
-            
-        </div>
-    </div>
-</div>
-<span id="banner-person"></span>
-{% endblock %}
-
-{% block layout_wvm_content %}
-    <div class="container content"> 
-        {% block personcontent %}<!-- block personcontent empty -->{%endblock%}
-    </div>
-{% endblock %}
-
-{% block vertical_menu_content %}
-    {{ chill_menu('person', {
-        'layout': '@ChillPerson/menu.html.twig',
-        'args' : {'person_id': person.id, 'person': person },
-        'activeRouteKey': activeRouteKey
-    }) }}
-    
-    <div class="block-post-menu">
-        {{ chill_delegated_block('person_post_vertical_menu', { 'person': person } ) }}
-    </div>
-{% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/menu.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/menu.html.twig
index 1502b55a8..23dda065e 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/menu.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/menu.html.twig
@@ -1,5 +1,5 @@
 {#
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
+ * Copyright (C) 2014-2021, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
  *
  * This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU Affero General Public License as
@@ -14,10 +14,12 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
-<ul class="tab-nav">
+
+<div class="list-group vertical-menu {{ 'menu-' ~ menus.name }}">
     {% for menu in menus %}
-        <li class="{{ menu.extra('class') }}">
-            <a href="{{ menu.uri }}" >{{ menu.label|upper }}</a>
-        </li>
+        <a class="list-group-item list-group-item-action"
+            href="{{ menu.uri }}">
+            {{ menu.label|upper }}
+        </a>
     {% endfor %}
-</ul>
+</div>
diff --git a/src/Bundle/ChillPersonBundle/Service/Import/ChillImporter.php b/src/Bundle/ChillPersonBundle/Service/Import/ChillImporter.php
new file mode 100644
index 000000000..4360a7cfa
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Service/Import/ChillImporter.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Service\Import;
+
+interface ChillImporter
+{
+    public function import(iterable $dataset): bool;
+}
diff --git a/src/Bundle/ChillPersonBundle/Service/Import/SocialWorkMetadata.php b/src/Bundle/ChillPersonBundle/Service/Import/SocialWorkMetadata.php
new file mode 100644
index 000000000..4683344dd
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Service/Import/SocialWorkMetadata.php
@@ -0,0 +1,298 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Service\Import;
+
+use Chill\PersonBundle\Entity\SocialWork\Evaluation;
+use Chill\PersonBundle\Entity\SocialWork\Goal;
+use Chill\PersonBundle\Entity\SocialWork\Result;
+use Chill\PersonBundle\Entity\SocialWork\SocialAction;
+use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
+use Chill\PersonBundle\Repository\SocialWork\EvaluationRepository;
+use Chill\PersonBundle\Repository\SocialWork\GoalRepository;
+use Chill\PersonBundle\Repository\SocialWork\ResultRepository;
+use Chill\PersonBundle\Repository\SocialWork\SocialActionRepository;
+use Chill\PersonBundle\Repository\SocialWork\SocialIssueRepository;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\Query\Expr\Comparison;
+use Doctrine\Persistence\ObjectRepository;
+use Exception;
+
+final class SocialWorkMetadata implements SocialWorkMetadataInterface
+{
+    private SocialIssueRepository $socialIssueRepository;
+
+    private SocialActionRepository $socialActionRepository;
+
+    private GoalRepository $goalRepository;
+
+    private ResultRepository $resultRepository;
+
+    private EvaluationRepository $evaluationRepository;
+
+    private EntityManagerInterface $entityManager;
+
+    public function __construct(
+        SocialIssueRepository $socialIssueRepository,
+        SocialActionRepository $socialActionRepository,
+        GoalRepository $goalRepository,
+        ResultRepository $resultRepository,
+        EvaluationRepository $evaluationRepository,
+        EntityManagerInterface $entityManager
+    ) {
+        $this->socialIssueRepository = $socialIssueRepository;
+        $this->socialActionRepository = $socialActionRepository;
+        $this->goalRepository = $goalRepository;
+        $this->resultRepository = $resultRepository;
+        $this->evaluationRepository = $evaluationRepository;
+        $this->entityManager = $entityManager;
+    }
+
+    public function import(iterable $dataset): bool
+    {
+        foreach ($dataset as $row) {
+            $this->import1(
+                array_map(
+                    static fn (string $column): ?string => '' === $column ? null : $column,
+                    array_map('trim', $row)
+                )
+            );
+        }
+
+        return true;
+    }
+
+    private function import1(array $row): void
+    {
+        // Structure:
+        // Index 0: SocialIssue.parent
+        // Index 1: SocialIssue
+        // Index 2: SocialAction.parent
+        // Index 3: SocialAction
+        // Index 4: Goal
+        // Index 5: Result
+        // Index 6: Evaluation
+
+        $socialIssue = $this->handleSocialIssue($row[0], $row[1]);
+
+        $socialAction = $this->handleSocialAction($row[2], $row[3], $socialIssue);
+
+        $goal = $this->handleGoal($row[4], $socialAction);
+
+        $result = $this->handleResult($row[5], $socialAction, $goal);
+
+        $eval = $this->handleEvaluation($row[6], $socialAction);
+
+        $this->entityManager->flush();
+    }
+
+    private function handleSocialIssue(?string $socialIssueTitle = null, ?string $socialIssueChildrenTitle = null): SocialIssue
+    {
+        if (null !== $socialIssueChildrenTitle) {
+            /** @var SocialIssue $socialIssueChildren */
+            $socialIssueChildren = $this->getOrCreateEntity($this->socialIssueRepository, 'title', ['fr' => $socialIssueChildrenTitle]);
+            $socialIssueChildren->setTitle(['fr' => $socialIssueChildrenTitle]);
+
+            $this->entityManager->persist($socialIssueChildren);
+        }
+
+        /** @var SocialIssue $socialIssue */
+        $socialIssue = $this->getOrCreateEntity($this->socialIssueRepository, 'title', ['fr' => $socialIssueTitle]);
+        $socialIssue->setTitle(['fr' => $socialIssueTitle]);
+
+        if (null !== $socialIssueChildrenTitle) {
+            $socialIssue->addChild($socialIssueChildren);
+        }
+
+        $this->entityManager->persist($socialIssue);
+
+        return null === $socialIssueChildrenTitle ? $socialIssue : $socialIssueChildren;
+    }
+
+    private function handleSocialAction(?string $socialActionTitle, ?string $socialActionChildrenTitle, SocialIssue $socialIssue): SocialAction
+    {
+        if (null !== $socialActionChildrenTitle) {
+            /** @var SocialAction $socialActionChildren */
+            $socialActionChildren = $this->getOrCreateEntity($this->socialActionRepository, 'title', ['fr' => $socialActionChildrenTitle]);
+            $socialActionChildren->setTitle(['fr' => $socialActionChildrenTitle]);
+
+            $this->entityManager->persist($socialActionChildren);
+        }
+
+        /** @var SocialIssue $socialIssue */
+        $socialAction = $this->getOrCreateEntity($this->socialActionRepository, 'title', ['fr' => $socialActionTitle]);
+        $socialAction->setTitle(['fr' => $socialActionTitle]);
+
+        if (null !== $socialActionChildrenTitle) {
+            $socialActionChildren->setIssue($socialIssue);
+            $this->entityManager->persist($socialActionChildren);
+
+            $socialAction->addChild($socialActionChildren);
+        } else {
+            $socialAction->setIssue($socialIssue);
+        }
+
+        $this->entityManager->persist($socialAction);
+
+        return null === $socialActionChildrenTitle ? $socialAction : $socialActionChildren;
+    }
+
+    private function handleGoal(?string $goalTitle = null, ?SocialAction $socialAction = null): ?Goal
+    {
+        if (null === $goalTitle) {
+            return null;
+        }
+
+        /** @var Goal $goal */
+        $goal = $this->getOrCreateEntity($this->goalRepository, 'title', ['fr' => $goalTitle]);
+        $goal->setTitle(['fr' => $goalTitle]);
+
+        if (null !== $socialAction) {
+            $socialAction->addGoal($goal);
+            $goal->addSocialAction($socialAction);
+
+            $this->entityManager->persist($socialAction);
+        }
+
+        $this->entityManager->persist($goal);
+
+        return $goal;
+    }
+
+    private function handleResult(?string $resultTitle = null, ?SocialAction $socialAction = null, ?Goal $goal = null): ?Result
+    {
+        if (null === $resultTitle) {
+            return null;
+        }
+
+        /** @var Result $result */
+        $result = $this->getOrCreateEntity($this->resultRepository, 'title', ['fr' => $resultTitle]);
+        $result->setTitle(['fr' => $resultTitle]);
+
+        if (null !== $goal) {
+            $result->addGoal($goal);
+            $goal->addResult($result);
+
+            $this->entityManager->persist($goal);
+        } else {
+            $result->addSocialAction($socialAction);
+        }
+
+        $result->addSocialAction($socialAction);
+        $socialAction->addResult($result);
+
+        $this->entityManager->persist($result);
+        $this->entityManager->persist($socialAction);
+
+        return $result;
+    }
+
+    private function handleEvaluation(?string $evaluationTitle, SocialAction $socialAction): ?Evaluation
+    {
+        if (null === $evaluationTitle) {
+            return null;
+        }
+
+        /** @var Evaluation $eval */
+        $eval = $this->getOrCreateEntity($this->evaluationRepository, 'title', ['fr' => $evaluationTitle]);
+        $eval->setTitle(['fr' => $evaluationTitle]);
+        $eval->setSocialAction($socialAction);
+
+        $this->entityManager->persist($eval);
+
+        return $eval;
+    }
+
+    private function findByJson(ObjectRepository $repository, string $field, array $jsonCriterias): array
+    {
+        $qb = $this
+            ->entityManager
+            ->createQueryBuilder()
+            ->select('s')
+            ->from($repository->getClassName(), 's');
+
+        $expr = $qb->expr();
+
+        $temporaryJsonCriterias = $jsonParameters = [];
+
+        foreach ($jsonCriterias as $key => $value) {
+            $temporaryJsonCriterias[] = [$field, $key, $value, sprintf(':placeholder_%s_%s', $field, $key)];
+        }
+
+        $jsonParameters = array_reduce(
+            $temporaryJsonCriterias,
+            static function (array $carry, array $row): array
+            {
+                [,, $value, $placeholder] = $row;
+
+                return array_merge(
+                    $carry,
+                    [
+                        $placeholder => sprintf('"%s"', $value),
+                    ]
+                );
+            },
+            []
+        );
+
+        $jsonPredicates = array_map(
+            static function (array $row) use ($expr): Comparison
+            {
+                [$field, $key,, $placeholder] = $row;
+
+                $left = sprintf(
+                    "GET_JSON_FIELD_BY_KEY(s.%s, '%s')",
+                    $field,
+                    $key
+                );
+
+                return $expr
+                    ->eq(
+                        $left,
+                        $placeholder
+                    );
+            },
+            $temporaryJsonCriterias
+        );
+
+        $query = $qb
+            ->select('s')
+            ->where(...$jsonPredicates)
+            ->setParameters($jsonParameters)
+            ->getQuery();
+
+        return $query->getResult();
+    }
+
+    private function getOrCreateEntity(ObjectRepository $repository, string $field, array $jsonCriterias = [])
+    {
+        $results = $this
+            ->findByJson(
+                $repository,
+                $field,
+                $jsonCriterias
+            );
+
+        switch (true) {
+            case count($results) === 0:
+                $entity = $repository->getClassName();
+                $entity = new $entity();
+                break;
+            case count($results) === 1;
+                $entity = current($results);
+                break;
+            case count($results) > 1;
+                throw new Exception(
+                    sprintf(
+                        'More than one entity(%s) found.',
+                        $repository->getClassName()
+                    )
+                );
+        }
+
+        return $entity;
+    }
+
+
+}
diff --git a/src/Bundle/ChillPersonBundle/Service/Import/SocialWorkMetadataInterface.php b/src/Bundle/ChillPersonBundle/Service/Import/SocialWorkMetadataInterface.php
new file mode 100644
index 000000000..015ef7485
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Service/Import/SocialWorkMetadataInterface.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Service\Import;
+
+interface SocialWorkMetadataInterface extends ChillImporter
+{
+}
diff --git a/src/Bundle/ChillPersonBundle/Templating/Entity/PersonRender.php b/src/Bundle/ChillPersonBundle/Templating/Entity/PersonRender.php
index 717ee4fc6..b95252fde 100644
--- a/src/Bundle/ChillPersonBundle/Templating/Entity/PersonRender.php
+++ b/src/Bundle/ChillPersonBundle/Templating/Entity/PersonRender.php
@@ -2,7 +2,7 @@
 /*
  * Chill is a software for social workers
  *
- * Copyright (C) 2014-2019, Champs Libres Cooperative SCRLFS, 
+ * Copyright (C) 2014-2019, Champs Libres Cooperative SCRLFS,
  * <http://www.champs-libres.coop>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -25,7 +25,6 @@ use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Config\ConfigPersonAltNamesHelper;
 use Symfony\Component\Templating\EngineInterface;
 
-
 /**
  * Render a Person
  *
@@ -35,7 +34,7 @@ class PersonRender extends AbstractChillEntityRender
     private ConfigPersonAltNamesHelper $configAltNamesHelper;
 
     private EngineInterface $engine;
-    
+
     public function __construct(
         ConfigPersonAltNamesHelper $configAltNamesHelper,
         EngineInterface $engine
@@ -43,26 +42,38 @@ class PersonRender extends AbstractChillEntityRender
         $this->configAltNamesHelper = $configAltNamesHelper;
         $this->engine = $engine;
     }
-    
+
     /**
-     * 
+     *
      * @param Person $person
      * @param array $options
      * @return string
      */
     public function renderBox($person, array $options): string
     {
-        return $this->engine->render('@ChillPerson/Entity/person.html.twig',
-            [
+        $params = [
+            'addAltNames' => $this->configAltNamesHelper->hasAltNames(),
+            'addLink' => $options['addLink'] ?? false,
+            'addEntity' => $options['addEntity'] ?? false,
+            'addId' => $options['addId'] ?? false,
+            'addInfo' => $options['addInfo'] ?? false,
+            'addAge' => $options['addAge'] ?? false,
+            'hLevel' => $options['hLevel'] ?? 3,
+            'customButtons' => $options['customButtons'] ?? [],
+        ];
+
+        return
+            $this->getDefaultOpeningBox('person') .
+            $this->engine->render('@ChillPerson/Entity/person.html.twig', [
                 'person' => $person,
-                'addAltNames' => $this->configAltNamesHelper->hasAltNames(),
-                'addLink' => $options['addLink'] ?? false
-            ]
-        );
+                'render' => $options['render'] ?? 'raw',
+                'options' => $params
+            ]) .
+            $this->getDefaultClosingBox();
     }
 
     /**
-     * 
+     *
      * @param Person $person
      * @param array $options
      * @return string
@@ -73,10 +84,10 @@ class PersonRender extends AbstractChillEntityRender
             .$this->addAltNames($person, false);
     }
 
-    protected function addAltNames(Person $person, bool $addSpan)
+    protected function addAltNames(Person $person, bool $addSpan): string
     {
         $str = '';
-        
+
         if ($this->configAltNamesHelper->hasAltNames()) {
             $altNames = $this->configAltNamesHelper->getChoices();
             $isFirst = true;
@@ -91,21 +102,21 @@ class PersonRender extends AbstractChillEntityRender
                         $str.= " ";
                     }
                     if ($addSpan) {
-                        $str .= '<span class="chill-entity__person__alt-name chill-entity__person__altname--'.$altName->getKey().'">';
+                        $str .= '<span class="altname altname-'.$altName->getKey().'">';
                     }
                     $str .= $altName->getLabel();
-                    
+
                     if ($addSpan) {
                         $str .= "</span>";
                     }
                 }
             }
-            
+
             if (!$isFirst) {
                 $str .= ")";
             }
         }
-        
+
         return $str;
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingPeriodControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingPeriodControllerTest.php
index 425b00b6c..e841f2615 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingPeriodControllerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingPeriodControllerTest.php
@@ -152,7 +152,7 @@ class AccompanyingPeriodControllerTest extends WebTestCase
      *      with : dateClosing: 2015-02-01
      *      with : the last closing motive in list
      * Then the response should redirect to period view
-     * And the next page should have a `.error` element present in page
+     * And the next page should have a `.alert-danger` element present in page
      * 
      * @todo
      */
@@ -174,7 +174,7 @@ class AccompanyingPeriodControllerTest extends WebTestCase
               '/fr/person/'.$this->person->getId().'/accompanying-period'),
               'the server redirects to /accompanying-period page');
         $this->assertGreaterThan(0, $this->client->followRedirect()
-                ->filter('.success')->count(),
+                ->filter('.alert-success')->count(),
               "a 'success' element is shown");
     }
     
@@ -186,7 +186,7 @@ class AccompanyingPeriodControllerTest extends WebTestCase
      *      with : dateClosing: 2014-01-01
      *      with : the last closing motive in list
      * Then the response should redirect to period view
-     * And the next page should have a `.error` element present in page
+     * And the next page should have a `.alert-danger` element present in page
      * 
      * @todo
      */
@@ -207,8 +207,8 @@ class AccompanyingPeriodControllerTest extends WebTestCase
         $this->assertFalse($this->client->getResponse()->isRedirect(),
               'the server stays on the /close page');
         $this->assertGreaterThan(0, $crawlerResponse
-              ->filter('.error')->count(),
-              "an '.error' element is shown");
+              ->filter('.alert-danger')->count(),
+              "an '.alert-danger' element is shown");
     }
     
     /**
@@ -240,7 +240,7 @@ class AccompanyingPeriodControllerTest extends WebTestCase
               '/fr/person/'.$this->person->getId().'/accompanying-period'),
               'the server redirects to /accompanying-period page');
         $this->assertGreaterThan(0, $this->client->followRedirect()
-              ->filter('.success')->count(),
+              ->filter('.alert-success')->count(),
               "a 'success' element is shown");
     }
     
@@ -275,7 +275,7 @@ class AccompanyingPeriodControllerTest extends WebTestCase
         
         $this->assertFalse($this->client->getResponse()->isRedirect(),
               'the server stay on form page');
-        $this->assertGreaterThan(0, $crawler->filter('.error')->count(),
+        $this->assertGreaterThan(0, $crawler->filter('.alert-danger')->count(),
               "an 'error' element is shown");
     }
     
@@ -310,7 +310,7 @@ class AccompanyingPeriodControllerTest extends WebTestCase
         
         $this->assertFalse($this->client->getResponse()->isRedirect(),
               'the server stay on form page');
-        $this->assertGreaterThan(0, $crawler->filter('.error')->count(),
+        $this->assertGreaterThan(0, $crawler->filter('.alert-danger')->count(),
               "an 'error' element is shown");
     }
     
@@ -351,7 +351,7 @@ class AccompanyingPeriodControllerTest extends WebTestCase
         
         $this->assertFalse($this->client->getResponse()->isRedirect(),
               'the server stay on form page');
-        $this->assertGreaterThan(0, $crawlerResponse->filter('.error')->count(),
+        $this->assertGreaterThan(0, $crawlerResponse->filter('.alert-danger')->count(),
               "an 'error' element is shown");
     }
     
@@ -382,7 +382,7 @@ class AccompanyingPeriodControllerTest extends WebTestCase
         
         $this->assertFalse($this->client->getResponse()->isRedirect(),
               'the server stay on form page');
-        $this->assertGreaterThan(0, $crawler->filter('.error')->count(),
+        $this->assertGreaterThan(0, $crawler->filter('.alert-danger')->count(),
               "an 'error' element is shown");
     }
     
@@ -424,7 +424,7 @@ class AccompanyingPeriodControllerTest extends WebTestCase
         
         $this->assertFalse($this->client->getResponse()->isRedirect(),
               'the server stay on form page');
-        $this->assertGreaterThan(0, $crawlerResponse->filter('.error')->count(),
+        $this->assertGreaterThan(0, $crawlerResponse->filter('.alert-danger')->count(),
               "an 'error' element is shown");
     }
     
@@ -465,7 +465,7 @@ class AccompanyingPeriodControllerTest extends WebTestCase
         
         $this->assertFalse($this->client->getResponse()->isRedirect(),
               'the server stay on form page');
-        $this->assertGreaterThan(0, $crawlerResponse->filter('.error')->count(),
+        $this->assertGreaterThan(0, $crawlerResponse->filter('.alert-danger')->count(),
               "an 'error' element is shown");
     }
     
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerCreateTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerCreateTest.php
index 57444dfaa..f7dd055c6 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerCreateTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerCreateTest.php
@@ -93,8 +93,6 @@ class PersonControllerCreateTest extends WebTestCase
               'The page contains a "gender" input');
         $this->assertTrue($form->has(self::BIRTHDATE_INPUT), 
               'The page has a "date of birth" input');
-        $this->assertTrue($form->has(self::CREATEDATE_INPUT),
-              'The page contains a "creation date" input');
         
         $genderType = $form->get(self::GENDER_INPUT);
         $this->assertEquals('radio', $genderType->getType(), 
@@ -107,10 +105,6 @@ class PersonControllerCreateTest extends WebTestCase
               'gender has "femme" option');
         $this->assertFalse($genderType->hasValue(), 'The gender input is not checked');
         
-        $today = new \DateTime();
-        $this->assertEquals($today->format('d-m-Y'), $form->get(self::CREATEDATE_INPUT)
-              ->getValue(), 'The creation date input has the current date by default');
-        
         return $form;
     }
     
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateTest.php
index ffdd65f35..8a8c04538 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateTest.php
@@ -102,7 +102,6 @@ class PersonControllerUpdateTest extends WebTestCase
     public function testHiddenFielsArePresent()
     {
         $crawler = $this->client->request('GET', $this->editUrl);
-
         $configurables = array('placeOfBirth', 'phonenumber', 'email',
             'countryOfBirth', 'nationality', 'spokenLanguages', 'maritalStatus');
         $form = $crawler->selectButton('Enregistrer')->form(); //;
@@ -190,7 +189,7 @@ class PersonControllerUpdateTest extends WebTestCase
             'the value '.$field.' is updated in db');
 
         $crawler = $this->client->followRedirect();
-        $this->assertGreaterThan(0, $crawler->filter('.success')->count(),
+        $this->assertGreaterThan(0, $crawler->filter('.alert-success')->count(),
             'a element .success is shown');
 
         if($field == 'birthdate' or $field == 'memo' or $field == 'countryOfBirth' or $field == 'nationality'
@@ -245,7 +244,7 @@ class PersonControllerUpdateTest extends WebTestCase
 
         $this->assertFalse($this->client->getResponse()->isRedirect(),
             'the page is not redirected to /general');
-        $this->assertGreaterThan(0, $crawler->filter('.error')->count(),
+        $this->assertGreaterThan(0, $crawler->filter('.alert-danger')->count(),
             'a element .error is shown');
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Entity/PersonTest.php b/src/Bundle/ChillPersonBundle/Tests/Entity/PersonTest.php
index 7e9337d14..dbef739d1 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Entity/PersonTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Entity/PersonTest.php
@@ -45,11 +45,12 @@ class PersonTest extends \PHPUnit\Framework\TestCase
     public function testGetCurrentAccompanyingPeriod()
     {
         $d = new \DateTime('yesterday'); 
-        $p = new Person($d);
+        $p = new Person();
+        $p->addAccompanyingPeriod(new AccompanyingPeriod($d));
         
         $period = $p->getCurrentAccompanyingPeriod();
         
-        $this->assertInstanceOf('Chill\PersonBundle\Entity\AccompanyingPeriod', $period);
+        $this->assertInstanceOf(AccompanyingPeriod::class, $period);
         $this->assertTrue($period->isOpen());
         $this->assertEquals($d, $period->getOpeningDate());
         
@@ -67,7 +68,8 @@ class PersonTest extends \PHPUnit\Framework\TestCase
     public function testAccompanyingPeriodOrderWithUnorderedAccompanyingPeriod()
     {       
         $d = new \DateTime("2013/2/1");
-        $p = new Person($d);
+        $p = new Person();
+        $p->addAccompanyingPeriod(new AccompanyingPeriod($d));
         
         $e = new \DateTime("2013/3/1");
         $period = $p->getCurrentAccompanyingPeriod()->setClosingDate($e);
@@ -93,7 +95,8 @@ class PersonTest extends \PHPUnit\Framework\TestCase
      */
     public function testAccompanyingPeriodOrderSameDateOpening() {
         $d = new \DateTime("2013/2/1");
-        $p = new Person($d);
+        $p = new Person();
+        $p->addAccompanyingPeriod(new AccompanyingPeriod($d));
         
         $g = new \DateTime("2013/4/1"); 
         $period = $p->getCurrentAccompanyingPeriod()->setClosingDate($g);
@@ -120,7 +123,8 @@ class PersonTest extends \PHPUnit\Framework\TestCase
      */
     public function testDateCoveringWithCoveringAccompanyingPeriod() {
         $d = new \DateTime("2013/2/1");
-        $p = new Person($d);
+        $p = new Person();
+        $p->addAccompanyingPeriod(new AccompanyingPeriod($d));
         
         $e = new \DateTime("2013/3/1");
         $period = $p->getCurrentAccompanyingPeriod()->setClosingDate($e);
@@ -145,7 +149,8 @@ class PersonTest extends \PHPUnit\Framework\TestCase
      */
     public function testNotOpenAFileReOpenedLater() {
         $d = new \DateTime("2013/2/1");
-        $p = new Person($d);
+        $p = new Person();
+        $p->addAccompanyingPeriod(new AccompanyingPeriod($d));
         
         $e = new \DateTime("2013/3/1");
         $period = $p->getCurrentAccompanyingPeriod()->setClosingDate($e);
diff --git a/src/Bundle/ChillPersonBundle/Tests/Timeline/TimelineAccompanyingPeriodTest.php b/src/Bundle/ChillPersonBundle/Tests/Timeline/TimelineAccompanyingPeriodTest.php
index 4fb3c7f06..9b2a32c85 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Timeline/TimelineAccompanyingPeriodTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Timeline/TimelineAccompanyingPeriodTest.php
@@ -20,9 +20,11 @@
 
 namespace Chill\PersonBundle\Tests\Timeline;
 
-use Symfony\Bundle\SecurityBundle\Tests\Functional\WebTestCase;
+use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Doctrine\ORM\EntityManagerInterface;
+use Chill\MainBundle\Test\PrepareClientTrait;
 
 /**
  * This class tests entries are shown for closing and opening 
@@ -31,22 +33,20 @@ use Chill\PersonBundle\Entity\AccompanyingPeriod;
  * @author Julien Fastré <julien.fastre@champs-libres.coop>
  * @author Champs Libres <info@champs-libres.coop>
  */
-class TimelineAccompanyingPeriodTest extends \Chill\PersonBundle\Tests\Controller\AccompanyingPeriodControllerTest
+class TimelineAccompanyingPeriodTest extends WebTestCase
 {
-    public function testEntriesAreShown() 
+    use PrepareClientTrait;
+
+    /**
+     * @dataProvider provideDataPersonWithAccompanyingPeriod
+     */
+    public function testEntriesAreShown($personId) 
     {
-        $this->generatePeriods(array(
-            [
-                'openingDate' => '2014-01-01',
-                'closingDate' => '2014-12-31',
-                'closingMotive' => $this->getRandomClosingMotive()
-            ]
-        ));
+        $client = $this->getClientAuthenticated();
+
+        $crawler = $client->request('GET', "/en/person/{$personId}/timeline");
         
-        $crawler = $this->client->request('GET', '/en/person/'
-              .$this->person->getId().'/timeline');
-        
-        $this->assertTrue($this->client->getResponse()->isSuccessful(),
+        $this->assertTrue($client->getResponse()->isSuccessful(),
               "the timeline page loads sucessfully");
         $this->assertGreaterThan(0, $crawler->filter('.timeline div')->count(),
               "the timeline page contains multiple div inside a .timeline element");
@@ -57,5 +57,34 @@ class TimelineAccompanyingPeriodTest extends \Chill\PersonBundle\Tests\Controlle
               $crawler->Filter('.timeline')->text(),
               "the text 'Une période d'accompagnement a été fermée' is present");
     }
+
+    public function provideDataPersonWithAccompanyingPeriod()
+    {
+        self::bootKernel();
+
+        $qb = self::$container->get(EntityManagerInterface::class)
+                              ->createQueryBuilder()
+                          ;
+        $personIds = $qb
+            ->from(Person::class, 'p')
+            ->join('p.accompanyingPeriodParticipations', 'part')
+            ->join('part.accompanyingPeriod', 'period')
+            ->join('p.center', 'center')
+            ->select('p.id')
+            ->where($qb->expr()->isNotNull('period.closingDate'))
+            ->andWhere($qb->expr()->eq('center.name', ':center'))
+            ->setParameter('center', 'Center A')
+            ->setMaxResults(1000)
+            ->getQuery()
+            ->getResult()
+        ;
+
+        \shuffle($personIds);
+
+        yield [ \array_pop($personIds)['id'] ];
+        yield [ \array_pop($personIds)['id'] ];
+        yield [ \array_pop($personIds)['id'] ];
+
+    }
    
 }
diff --git a/src/Bundle/ChillPersonBundle/chill.webpack.config.js b/src/Bundle/ChillPersonBundle/chill.webpack.config.js
index a41b07286..ebfdef01d 100644
--- a/src/Bundle/ChillPersonBundle/chill.webpack.config.js
+++ b/src/Bundle/ChillPersonBundle/chill.webpack.config.js
@@ -1,19 +1,19 @@
 // this file loads all assets from the Chill person bundle
 module.exports = function(encore, entries)
 {
-    entries.push(__dirname + '/Resources/public/index.js');
+    entries.push(__dirname + '/Resources/public/chill/index.js');
 
     // Aliases are used when webpack is trying to resolve modules path
     encore.addAliases({
         ChillPersonAssets: __dirname + '/Resources/public'
     });
 
-    encore.addEntry('household_address', __dirname + '/Resources/public/vuejs/HouseholdAddress/index.js');
-    encore.addEntry('household_members_editor', __dirname + '/Resources/public/vuejs/HouseholdMembersEditor/index.js');
+    encore.addEntry('vue_household_address', __dirname + '/Resources/public/vuejs/HouseholdAddress/index.js');
+    encore.addEntry('vue_household_members_editor', __dirname + '/Resources/public/vuejs/HouseholdMembersEditor/index.js');
     encore.addEntry('vue_accourse', __dirname + '/Resources/public/vuejs/AccompanyingCourse/index.js');
-    encore.addEntry('household_edit_metadata', __dirname + '/Resources/public/modules/household_edit_metadata/index.js');
-    encore.addEntry('accompanying_course_work_create', __dirname + '/Resources/public/vuejs/AccompanyingCourseWorkCreate/index.js');
-    encore.addEntry('accompanying_course_work_edit', __dirname + '/Resources/public/vuejs/AccompanyingCourseWorkEdit/index.js');
-    encore.addEntry('accompanying_course_work_list', __dirname + '/Resources/public/modules/accompanying_course_work_list/index.js');
-    encore.addEntry('person', __dirname + '/Resources/public/js/person.js');
+    encore.addEntry('vue_accourse_work_create', __dirname + '/Resources/public/vuejs/AccompanyingCourseWorkCreate/index.js');
+    encore.addEntry('vue_accourse_work_edit', __dirname + '/Resources/public/vuejs/AccompanyingCourseWorkEdit/index.js');
+
+    encore.addEntry('page_household_edit_metadata', __dirname + '/Resources/public/page/household_edit_metadata/index.js');
+    encore.addEntry('page_person', __dirname + '/Resources/public/page/person/index.js');
 };
diff --git a/src/Bundle/ChillPersonBundle/config/services.yaml b/src/Bundle/ChillPersonBundle/config/services.yaml
index a23ba39b3..aedea4396 100644
--- a/src/Bundle/ChillPersonBundle/config/services.yaml
+++ b/src/Bundle/ChillPersonBundle/config/services.yaml
@@ -6,12 +6,24 @@ services:
         autowire: true
         autoconfigure: true
 
+    Chill\PersonBundle\Service\:
+        resource: '../Service/'
+        autowire: true
+        autoconfigure: true
+
     Chill\PersonBundle\Serializer\Normalizer\:
         resource: '../Serializer/Normalizer/'
         autowire: true
         tags:
             - { name: 'serializer.normalizer', priority: 64 }
 
+    Chill\PersonBundle\Command\:
+        resource: '../Command/'
+        autowire: true
+        autoconfigure: true
+        tags:
+            - { name: console.command }
+
     chill.person.form.type.select2maritalstatus:
         class: Chill\PersonBundle\Form\Type\Select2MaritalStatusType
         arguments:
@@ -49,7 +61,7 @@ services:
         tags:
             - { name: security.voter }
             - { name: chill.role }
-            
+
     chill.person.birthdate_validation:
         class: Chill\PersonBundle\Validator\Constraints\BirthdateValidator
         arguments:
diff --git a/src/Bundle/ChillPersonBundle/config/services/command.yaml b/src/Bundle/ChillPersonBundle/config/services/command.yaml
deleted file mode 100644
index 685a348dd..000000000
--- a/src/Bundle/ChillPersonBundle/config/services/command.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-services:
-    Chill\PersonBundle\Command\ChillPersonMoveCommand:
-        arguments:
-            $em: '@Doctrine\ORM\EntityManagerInterface'
-            $mover: '@Chill\PersonBundle\Actions\Remove\PersonMove'
-            $chillLogger: '@chill.main.logger'
-        tags:
-            - { name: console.command }
-
-    Chill\PersonBundle\Command\ImportPeopleFromCSVCommand:
-        arguments:
-            $logger: '@logger'
-            $helper: '@Chill\MainBundle\Templating\TranslatableStringHelper'
-            $em: '@Doctrine\ORM\EntityManagerInterface'
-            $customFieldProvider: '@Chill\CustomFieldsBundle\Service\CustomFieldProvider'
-            $eventDispatcher: '@Symfony\Component\EventDispatcher\EventDispatcherInterface'
-            $formFactory: '@form.factory'
-        tags:
-            - { name: console.command }
diff --git a/src/Bundle/ChillPersonBundle/config/services/notification.yaml b/src/Bundle/ChillPersonBundle/config/services/notification.yaml
new file mode 100644
index 000000000..58187defb
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/config/services/notification.yaml
@@ -0,0 +1,3 @@
+services:
+    Chill\PersonBundle\Notification\AccompanyingPeriodNotificationRenderer:
+        autowire: true
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210623142046.php b/src/Bundle/ChillPersonBundle/migrations/Version20210623142046.php
new file mode 100644
index 000000000..8baffb867
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210623142046.php
@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Person;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20210623142046 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_social_action ALTER defaultnotificationdelay DROP NOT NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_social_action ALTER defaultNotificationDelay SET NOT NULL');
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210624131722.php b/src/Bundle/ChillPersonBundle/migrations/Version20210624131722.php
new file mode 100644
index 000000000..ebeb33e50
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210624131722.php
@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Person;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20210624131722 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_social_work_evaluation ALTER delay DROP NOT NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_social_work_evaluation ALTER delay SET NOT NULL');
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210624131723.php b/src/Bundle/ChillPersonBundle/migrations/Version20210624131723.php
new file mode 100644
index 000000000..d36d23733
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210624131723.php
@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Person;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20210624131723 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_social_work_evaluation ALTER notificationdelay DROP NOT NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_social_work_evaluation ALTER notificationdelay SET NOT NULL');
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
index 851932290..57b051d68 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
@@ -119,6 +119,7 @@ address_country_code: Code pays
 
 'Alreay existing person': 'Dossiers déjà encodés'
 'Add the person': 'Ajouter la personne'
+Show person: Voir le dossier de la personne
 'Confirm the creation': 'Confirmer la création'
 'You will create this person': 'Vous allez créer le dossier suivant'
 Return: Retour
@@ -135,7 +136,7 @@ Reset: 'Remise à zéro'
 'Person search results': 'Recherche de personnes'
 Person search results by phonenumber: Recherche de personnes par numéro de téléphone
 'Search within persons': 'Recherche parmi les personnes'
-Open person file: Ouvrir
+Open person file: Ouvrir le dossier de la personne
 and %number% other: '{0} et aucun autre| {1} et une autre |]1, Inf] et %number% autres'
 '%total% persons matching the search pattern:': '{0} Aucune personne ne correspond aux termes de recherche : | {1} Une personne a été trouvée par la recherche : | ]1,Inf] %total% personnes correspondent aux termes de recherche :'
 'Last opening since %last_opening%': 'Dernière ouverture le %last_opening%.'
@@ -192,6 +193,7 @@ Last events on accompanying course: Dernières actions de suivi
 Edit & activate accompanying course: Modifier et valider
 See accompanying periods: Voir les périodes d'accompagnement
 See accompanying period: Voir cette période d'accompagnement
+See this period: Voir cette période
 Referrer: Référent
 Some peoples does not belong to any household currently. Add them to an household soon: Certaines personnes n'appartiennent à aucun ménage actuellement. Renseignez leur appartenance à un ménage dès que possible.
 Add to household now: Ajouter à un ménage
@@ -204,8 +206,8 @@ No address given: Pas d'adresse renseignée
 The address has been successfully updated: L'adresse a été mise à jour avec succès
 Update address for %name%: Mettre à jour une adresse pour %name%
 Modify address for %name%: Modifier une adresse pour %name%
-Addresses'history for %name%: Historique des adresses de %name%
-Addresses'history: Historique des adresses
+Addresses history for %name%: Historique des adresses de %name%
+Addresses history: Historique des adresses
 New address for %name% : Nouvelle adresse pour %name%
 The new address was created successfully: La nouvelle adresse a été créée
 Add an address: Ajouter une adresse
@@ -349,6 +351,9 @@ Move household: Nouveau déménagement
 Addresses history for household: Historique des adresses
 Household accompanying period: Parcours d'accompagnement du ménage
 Household summary: Résumé du ménage
+Edit household address: Modifier l'adresse du ménage
+Show household: Voir le ménage
+Back to household: Revenir au ménage
 
 # accompanying course work
 Accompanying Course Actions: Actions d'accompagnements
@@ -366,3 +371,8 @@ accompanying_course_work:
     results: Résultats - orientations
     goal: Objectif - motif - dispositif
     Any work: Aucune action d'accompagnement
+
+#
+Person addresses: Adresses de résidence
+Household addresses: Adresses de domicile
+Insert an address: Insérer une adresse
diff --git a/src/Bundle/ChillReportBundle/Resources/views/Report/edit.html.twig b/src/Bundle/ChillReportBundle/Resources/views/Report/edit.html.twig
index 9ae03e174..8282ec74a 100644
--- a/src/Bundle/ChillReportBundle/Resources/views/Report/edit.html.twig
+++ b/src/Bundle/ChillReportBundle/Resources/views/Report/edit.html.twig
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
-{% extends "@ChillPerson/layout.html.twig"  %}
+{% extends "@ChillPerson/Person/layout.html.twig"  %}
 
 {% set activeRouteKey = 'report_select_type' %}
 
@@ -31,10 +31,10 @@
     {{ form_widget(edit_form) }}
         <ul class="sticky-form-buttons record_actions">
             <li class="cancel">
-                <a href="{{ path('report_list', { 'person_id': person.id } ) }}" class="sc-button bt-cancel">{{ 'Back to the list'|trans }}</a>
+                <a href="{{ path('report_list', { 'person_id': person.id } ) }}" class="btn btn-cancel">{{ 'Back to the list'|trans }}</a>
             <li>
             <li>
-            <button class="sc-button bt-save" type="submit">{{ 'Save report'|trans }}</button>
+            <button class="btn btn-save" type="submit">{{ 'Save report'|trans }}</button>
             </li>
         </ul>
     {{ form_end(edit_form) }}
diff --git a/src/Bundle/ChillReportBundle/Resources/views/Report/list.html.twig b/src/Bundle/ChillReportBundle/Resources/views/Report/list.html.twig
index 485771f51..6f0e07948 100644
--- a/src/Bundle/ChillReportBundle/Resources/views/Report/list.html.twig
+++ b/src/Bundle/ChillReportBundle/Resources/views/Report/list.html.twig
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
-{% extends "@ChillPerson/layout.html.twig"  %}
+{% extends "@ChillPerson/Person/layout.html.twig"  %}
 
 {% set activeRouteKey = 'report_select_type' %}
 
@@ -48,12 +48,12 @@
                     <ul class="record_actions">
                         {% if is_granted('CHILL_REPORT_SEE', report) %}
                         <li>
-                            <a href="{{ path('report_view', { 'person_id': report.person.id, 'report_id': report.id }) }}" class="sc-button bt-view"></a>
+                            <a href="{{ path('report_view', { 'person_id': report.person.id, 'report_id': report.id }) }}" class="btn btn-view"></a>
                         </li>
                         {% endif %}
                         {% if is_granted('CHILL_REPORT_UPDATE', report) %}
                             <li>
-                        <a href="{{ path('report_edit', { 'person_id': report.person.id, 'report_id': report.id }) }}" class="sc-button bt-update"></a>
+                        <a href="{{ path('report_edit', { 'person_id': report.person.id, 'report_id': report.id }) }}" class="btn btn-update"></a>
                             </li>
                         {% endif %}
                     </ul>
@@ -71,7 +71,7 @@
         
     <ul class="record_actions">
         <li>
-            <a href="{{ path('report_select_type', { 'person_id' : person.id } ) }}" class="sc-button bt-new">
+            <a href="{{ path('report_select_type', { 'person_id' : person.id } ) }}" class="btn btn-new">
                 {{ 'Create a new report'|trans }}
             </a>
         </li>
diff --git a/src/Bundle/ChillReportBundle/Resources/views/Report/new.html.twig b/src/Bundle/ChillReportBundle/Resources/views/Report/new.html.twig
index 1fc18a735..5edc39414 100644
--- a/src/Bundle/ChillReportBundle/Resources/views/Report/new.html.twig
+++ b/src/Bundle/ChillReportBundle/Resources/views/Report/new.html.twig
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
-{% extends "@ChillPerson/layout.html.twig"  %}
+{% extends "@ChillPerson/Person/layout.html.twig"  %}
 
 {% set activeRouteKey = 'report_select_type' %}
 
@@ -29,10 +29,10 @@
     {{ form_row(form.cFData) }}
         <ul class="sticky-form-buttons record_actions">
             <li class="cancel">
-                <a href="{{ path('report_list', { 'person_id': person.id } ) }}" class="sc-button bt-cancel">{{ 'Back to the list'|trans }}</a>
+                <a href="{{ path('report_list', { 'person_id': person.id } ) }}" class="btn btn-cancel">{{ 'Back to the list'|trans }}</a>
             <li>
             <li>
-            <button class="sc-button bt-create" type="submit"> {{ 'Add report'|trans }}</button>
+            <button class="btn btn-create" type="submit"> {{ 'Add report'|trans }}</button>
             </li>
         </ul>
     {{ form_end(form) }}
diff --git a/src/Bundle/ChillReportBundle/Resources/views/Report/select_report_type.html.twig b/src/Bundle/ChillReportBundle/Resources/views/Report/select_report_type.html.twig
index 67983a7f8..34fefc443 100644
--- a/src/Bundle/ChillReportBundle/Resources/views/Report/select_report_type.html.twig
+++ b/src/Bundle/ChillReportBundle/Resources/views/Report/select_report_type.html.twig
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
-{% extends "@ChillPerson/layout.html.twig"  %}
+{% extends "@ChillPerson/Person/layout.html.twig"  %}
 
 {% set activeRouteKey = 'report_select_type' %}
 
@@ -27,9 +27,9 @@
     
     <ul class="record_actions">
         <li class="cancel">
-            <a href="{{ path('report_list', { 'person_id': person.id } ) }}" class="sc-button bt-cancel">{{ 'Back to the list'|trans }}</a>
+            <a href="{{ path('report_list', { 'person_id': person.id } ) }}" class="btn btn-cancel">{{ 'Back to the list'|trans }}</a>
         <li>
-        <button class="sc-button green" type="submit">
+        <button class="btn btn-chill-green" type="submit">
             <i class="fa fa-plus"></i>
             {{ 'Create a new report'|trans }}
         </button>
diff --git a/src/Bundle/ChillReportBundle/Resources/views/Report/select_report_type_for_export.html.twig b/src/Bundle/ChillReportBundle/Resources/views/Report/select_report_type_for_export.html.twig
index 56232cfbe..d000f54c8 100644
--- a/src/Bundle/ChillReportBundle/Resources/views/Report/select_report_type_for_export.html.twig
+++ b/src/Bundle/ChillReportBundle/Resources/views/Report/select_report_type_for_export.html.twig
@@ -24,7 +24,7 @@
 
 {{ form_start(form) }}
     {{ form_widget(form.cFGroup) }}
-    <button class="sc-button green" type="submit">
+    <button class="btn btn-chill-green" type="submit">
         <i class="fa fa-upload"></i>
         {{ 'Export this kind of reports'|trans }}
     </button>
diff --git a/src/Bundle/ChillReportBundle/Resources/views/Report/view.html.twig b/src/Bundle/ChillReportBundle/Resources/views/Report/view.html.twig
index f1c6ffdae..f2490964d 100644
--- a/src/Bundle/ChillReportBundle/Resources/views/Report/view.html.twig
+++ b/src/Bundle/ChillReportBundle/Resources/views/Report/view.html.twig
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
-{% extends "@ChillPerson/layout.html.twig"  %}
+{% extends "@ChillPerson/Person/layout.html.twig"  %}
 
 {% set activeRouteKey = 'report_select_type' %}
 
@@ -46,11 +46,11 @@
     
     <ul class="record_actions">
         <li class="cancel">
-            <a href="{{ path('report_list', { 'person_id': person.id } ) }}" class="sc-button bt-cancel">{{ 'Back to the list'|trans }}</a>
+            <a href="{{ path('report_list', { 'person_id': person.id } ) }}" class="btn btn-cancel">{{ 'Back to the list'|trans }}</a>
         <li>
         {% if is_granted('CHILL_REPORT_UPDATE', entity) %}
         <li>
-        <a class="sc-button bt-edit" href="{{ path('report_edit', { 'person_id': entity.person.id, 'report_id': entity.id }) }}">{{ 'Update the report' | trans }}</a>
+        <a class="btn btn-edit" href="{{ path('report_edit', { 'person_id': entity.person.id, 'report_id': entity.id }) }}">{{ 'Update the report' | trans }}</a>
         </li>
         {% endif %}
     </ul>
diff --git a/src/Bundle/ChillReportBundle/Resources/views/Timeline/report.html.twig b/src/Bundle/ChillReportBundle/Resources/views/Timeline/report.html.twig
index 7929fed9e..4840598a3 100644
--- a/src/Bundle/ChillReportBundle/Resources/views/Timeline/report.html.twig
+++ b/src/Bundle/ChillReportBundle/Resources/views/Timeline/report.html.twig
@@ -25,13 +25,13 @@
      
      <ul class="record_actions">
         <li>
-            <a href="{{ path('report_view', { 'person_id': report.person.id, 'report_id': report.id} ) }}" class="sc-button bt-view">
+            <a href="{{ path('report_view', { 'person_id': report.person.id, 'report_id': report.id} ) }}" class="btn btn-view">
                 {{ 'View the report'|trans }}
             </a>
         </li>
         {% if is_granted('CHILL_REPORT_UPDATE', report) %}
         <li>
-            <a href="{{ path('report_edit', { 'person_id': report.person.id, 'report_id': report.id} ) }}" class="sc-button bt-edit">
+            <a href="{{ path('report_edit', { 'person_id': report.person.id, 'report_id': report.id} ) }}" class="btn btn-edit">
                 {{ 'Update the report'|trans }}
             </a>
         </li>
diff --git a/src/Bundle/ChillTaskBundle/Resources/public/sass/_task.scss b/src/Bundle/ChillTaskBundle/Resources/public/chill/chilltask.scss
similarity index 63%
rename from src/Bundle/ChillTaskBundle/Resources/public/sass/_task.scss
rename to src/Bundle/ChillTaskBundle/Resources/public/chill/chilltask.scss
index d5a2aa8a7..5aed9bc34 100644
--- a/src/Bundle/ChillTaskBundle/Resources/public/sass/_task.scss
+++ b/src/Bundle/ChillTaskBundle/Resources/public/chill/chilltask.scss
@@ -1,7 +1,5 @@
-@import '~ChillMainSass/custom/config/colors';
-
-@import "_task-statuses.scss";
-@import "_task-list.scss";
+// Access to Bootstrap variables and mixins
+@import '~ChillMainAssets/module/bootstrap/shared';
 
 div#single_task_warningInterval {
     display: flex;
@@ -24,55 +22,55 @@ div#single_task_warningInterval {
     }
 }
 
-.bt-task-label {
+.btn-task-label {
     display: inline-flex;
     margin-bottom: 0.2em;
     font-size: 0.8em;
     text-transform: capitalize;
 }
 
-.bt-task {
+.btn-task {
     display: inline-block;
     height: 0;
     width: 8px;
 }
 
-.bt-task-exchange {
+.btn-task-exchange {
     background: $chill-green;
     color: #fff;
 }
-.bt-task-exchange:hover {
+.btn-task-exchange:hover {
     background: $chill-green-dark;
     color: #fff;
 }
 
-.bt-task-exchange::before {
-    @extend .bt-task;
+.btn-task-exchange::before {
+    @extend .btn-task;
     width: 10px;
-    content: url(../svg/exchange-alt.svg);
+    content: url('./svg/exchange-alt.svg');
 }
 
-.bt-task-start::before {
-    @extend .bt-task;
-    content: url(../svg/play.svg);
+.btn-task-start::before {
+    @extend .btn-task;
+    content: url('./svg/play.svg');
 }
 
-.bt-task-cancel::before {
-    @extend .bt-task;
-    content: url(../svg/archive.svg);
+.btn-task-cancel::before {
+    @extend .btn-task;
+    content: url('./svg/archive.svg');
 }
 
-.bt-task-close::before {
-    @extend .bt-task;
-    content: url(../svg/check.svg);
+.btn-task-close::before {
+    @extend .btn-task;
+    content: url('./svg/check.svg');
 }
 
-.bt-dropdown {
+.btn-dropdown {
     position: relative;
     display: inline-block;
 }
 
-.bt-dropdown-content {
+.btn-dropdown-content {
     display: none;
     position: absolute;
     background-color: #f9f9f9;
@@ -83,7 +81,7 @@ div#single_task_warningInterval {
     }
 }
 
-.bt-dropdown:hover .bt-dropdown-content {
+.btn-dropdown:hover .btn-dropdown-content {
     display: inline-block;
     width: min-content;
 }
diff --git a/src/Bundle/ChillTaskBundle/Resources/public/chill/index.js b/src/Bundle/ChillTaskBundle/Resources/public/chill/index.js
new file mode 100644
index 000000000..1261ab752
--- /dev/null
+++ b/src/Bundle/ChillTaskBundle/Resources/public/chill/index.js
@@ -0,0 +1,5 @@
+require('./scss/_task-statuses.scss');
+require('./scss/_task-list.scss');
+
+require('./chilltask.scss');
+
diff --git a/src/Bundle/ChillTaskBundle/Resources/public/sass/_task-list.scss b/src/Bundle/ChillTaskBundle/Resources/public/chill/scss/_task-list.scss
similarity index 100%
rename from src/Bundle/ChillTaskBundle/Resources/public/sass/_task-list.scss
rename to src/Bundle/ChillTaskBundle/Resources/public/chill/scss/_task-list.scss
diff --git a/src/Bundle/ChillTaskBundle/Resources/public/sass/_task-statuses.scss b/src/Bundle/ChillTaskBundle/Resources/public/chill/scss/_task-statuses.scss
similarity index 100%
rename from src/Bundle/ChillTaskBundle/Resources/public/sass/_task-statuses.scss
rename to src/Bundle/ChillTaskBundle/Resources/public/chill/scss/_task-statuses.scss
diff --git a/src/Bundle/ChillTaskBundle/Resources/public/svg/archive.svg b/src/Bundle/ChillTaskBundle/Resources/public/chill/svg/archive.svg
similarity index 100%
rename from src/Bundle/ChillTaskBundle/Resources/public/svg/archive.svg
rename to src/Bundle/ChillTaskBundle/Resources/public/chill/svg/archive.svg
diff --git a/src/Bundle/ChillTaskBundle/Resources/public/svg/check.svg b/src/Bundle/ChillTaskBundle/Resources/public/chill/svg/check.svg
similarity index 100%
rename from src/Bundle/ChillTaskBundle/Resources/public/svg/check.svg
rename to src/Bundle/ChillTaskBundle/Resources/public/chill/svg/check.svg
diff --git a/src/Bundle/ChillTaskBundle/Resources/public/svg/exchange-alt.svg b/src/Bundle/ChillTaskBundle/Resources/public/chill/svg/exchange-alt.svg
similarity index 100%
rename from src/Bundle/ChillTaskBundle/Resources/public/svg/exchange-alt.svg
rename to src/Bundle/ChillTaskBundle/Resources/public/chill/svg/exchange-alt.svg
diff --git a/src/Bundle/ChillTaskBundle/Resources/public/svg/play.svg b/src/Bundle/ChillTaskBundle/Resources/public/chill/svg/play.svg
similarity index 100%
rename from src/Bundle/ChillTaskBundle/Resources/public/svg/play.svg
rename to src/Bundle/ChillTaskBundle/Resources/public/chill/svg/play.svg
diff --git a/src/Bundle/ChillTaskBundle/Resources/public/index.js b/src/Bundle/ChillTaskBundle/Resources/public/index.js
deleted file mode 100644
index ad7fb96c7..000000000
--- a/src/Bundle/ChillTaskBundle/Resources/public/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-// this file loads all assets from the Chill task bundle
-require('./sass/_task.scss');
-
diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/_list.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/_list.html.twig
index a90f34553..026e354c5 100644
--- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/_list.html.twig
+++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/_list.html.twig
@@ -1,178 +1,182 @@
 {% macro date_status(title, tasks, count, paginator, status, isSingleStatus, person, user) %}
-        {% if tasks|length > 0 %}
-            <h3>{{ title|trans }}</h3>
+    {% if tasks|length > 0 %}
+        <h3>{{ title|trans }}</h3>
 
-            <table class="records_list chill-task-list">
-                <tbody>
-                    {% for task in tasks %}
-                        <tr>
-                            <td class="chill-task-list__row">
-                                
-                                <div>
-                                    <span class="chill-task-list__row__title">{{ task.title }}</span>
-                                </div>
-                                
-                                {% if person is null %}
-                                    <div>
-                                        <span class="chill-task-list__row__person-for">{{ 'For person'|trans }}&nbsp;:</span> <span class="chill-task-list__row__person"><a href="{{ path('chill_person_view', {person_id : task.person.Id}) }}">{{ task.person}}</a></span>
-                                    </div>
+        <table class="table table-bordered border-dark chill-task-list">
+            <tbody>
+                {% for task in tasks %}
+                <tr>
+                    <td>
+                        <div>
+                            <span class="chill-task-list__row__title">{{ task.title }}</span>
+                        </div>
+                        
+                        {% if person is null %}
+                            <div>
+                                <span class="chill-task-list__row__person-for">{{ 'For person'|trans }}&nbsp;:</span> <span class="chill-task-list__row__person"><a href="{{ path('chill_person_view', {person_id : task.person.Id}) }}">{{ task.person}}</a></span>
+                            </div>
+                        {% endif %}
+                        
+                        <div>
+                            <span class="chill-task-list__row__type">{{ task_workflow_metadata(task, 'definition.name')|trans }}</span>
+                        </div>
+                            
+                        <div>
+                            {% for place in workflow_marked_places(task) %}
+                                <span class="task-status box type-{{ task.type }} place-{{ place }}">{{ place|trans }}</span>
+                            {% endfor %}
+                            {% if task.assignee is not null %}
+                                <div class="chill-task-list__row__assignee"><span class="chill_task-list__row__assignee_by">{{ 'By'|trans }}&nbsp;:</span> {{ task.assignee.username }}</div>
+                            {% endif %}
+                        </div>
+                        
+                        {% if task.startDate is not null or task.warningDate is not null or task.endDate is not null %}
+                        <div class="chill-task-list__row__dates">
+                            <ul class="record_actions_column">
+                                {% if task.startDate is not null %}
+                                    <li title="{{ 'Start'|trans|escape('html_attr') }}">
+                                        <i class="fa fa-play" ></i> {{ task.startDate|format_date('medium') }}
+                                    </li>
                                 {% endif %}
-                                
-                                <div>
-                                    <span class="chill-task-list__row__type">{{ task_workflow_metadata(task, 'definition.name')|trans }}</span>
-                                </div>
-                                
-
-                                    
-                                <div>
-                                
-                                    {% for place in workflow_marked_places(task) %}
-                                        <span class="task-status box type-{{ task.type }} place-{{ place }}">{{ place|trans }}</span>
-                                    {% endfor %}
-                                    {% if task.assignee is not null %}
-                                        <div class="chill-task-list__row__assignee"><span class="chill_task-list__row__assignee_by">{{ 'By'|trans }}&nbsp;:</span> {{ task.assignee.username }}</div>
-                                    {% endif %}
-                                </div>
-                                
-                                
-                                {% if task.startDate is not null or task.warningDate is not null or task.endDate is not null %}
-                                <div class="chill-task-list__row__dates">
-                                    <ul class="record_actions_column">
-                                        {% if task.startDate is not null %}
-                                            <li title="{{ 'Start'|trans|escape('html_attr') }}">
-                                                <i class="fa fa-play" ></i> {{ task.startDate|format_date('medium') }}
-                                            </li>
-                                        {% endif %}
-                                        {% if task.warningDate is not null %}
-                                            <li title="{{ 'Warning'|trans|escape('html_attr') }}">
-                                                <i class="fa fa-exclamation-triangle"></i> {{ task.warningDate|format_date('medium') }}
-                                            </li>
-                                        {% endif %}
-                                        {% if task.endDate is not null %}
-                                            <li title="{{ 'End'|trans|escape('html_attr') }}">
-                                                <i class="fa fa-hourglass-end"></i> {{ task.endDate|format_date('medium') }}
-                                            </li>
-                                         {% endif %}
+                                {% if task.warningDate is not null %}
+                                    <li title="{{ 'Warning'|trans|escape('html_attr') }}">
+                                        <i class="fa fa-exclamation-triangle"></i> {{ task.warningDate|format_date('medium') }}
+                                    </li>
+                                {% endif %}
+                                {% if task.endDate is not null %}
+                                    <li title="{{ 'End'|trans|escape('html_attr') }}">
+                                        <i class="fa fa-hourglass-end"></i> {{ task.endDate|format_date('medium') }}
+                                    </li>
+                                 {% endif %}
+                            </ul>
+                        </div>
+                        {% endif %}
+                        
+                    </td>
+                    <td>
+                        <ul class="record_actions">
+                            {% if workflow_transitions(task)|length > 0 %}
+                            <li>
+                                <div class="btn-group">
+                                    <a class="btn btn-task-exchange dropdown-toggle" href="#" role="button" 
+                                        id="taskExchange" data-bs-toggle="dropdown" aria-expanded="false">
+                                        {{'Change task status'|trans}}
+                                    </a>
+                                    <ul class="dropdown-menu" aria-labelledby="taskExchange">
+                                        {% for transition in workflow_transitions(task) %}
+                                        <li>
+                                            <a class="dropdown-item"
+                                                href="{{ path('chill_task_task_transition', { 'taskId': task.id, 'transition': transition.name, 'kind': 'single-task', 'list_params': app.request.query.all }) }}" class="{{ task_workflow_metadata(task, 'transition.class', transition)|e('html_attr') }}">
+                                                {{ task_workflow_metadata(task, 'transition.verb', transition)|trans }}
+                                            </a>
+                                        </li>
+                                        {% endfor %}
                                     </ul>
                                 </div>
-                                {% endif %}
-                                
-                            </td>
-                            <td>
-                                <ul class="record_actions">
-                                    {% if workflow_transitions(task)|length > 0 %}
-                                    <li>
-                                        <div class="bt-dropdown">
-                                            <a href="" class="sc-button bt-task-exchange">&nbsp;</a>
-                                            <div class="bt-dropdown-content">
-                                                {% for transition in workflow_transitions(task) %}
-                                                    <a href="{{ path('chill_task_task_transition', { 'taskId': task.id, 'transition': transition.name, 'kind': 'single-task', 'list_params': app.request.query.all }) }}" class="{{ task_workflow_metadata(task, 'transition.class', transition)|e('html_attr') }}">{{ task_workflow_metadata(task, 'transition.verb', transition)|trans }}</a>
-                                                {% endfor %}
-                                            </div>
-                                        </div>
-                                    </li>
-                                    {% endif %}
-                                    <li>
-                                        <a href="{{ path('chill_task_single_task_show', { 'id': task.id, 'list_params': app.request.query.all }) }}" class="sc-button bt-show "></a>
-                                    </li>
-                                    {% if is_granted('CHILL_TASK_TASK_UPDATE', task) %}
-                                    <li>
-                                        <a href="{{ path('chill_task_single_task_edit', { 'id': task.id, 'list_params': app.request.query.all }) }}" class="sc-button bt-update "></a>
-                                    </li>
-                                    {% endif %}
-                                    {% if is_granted('CHILL_TASK_TASK_DELETE', task) %}
-                                    <li>
-                                        <a href="{{ path('chill_task_single_task_delete', { 'id': task.id, 'list_params': app.request.query.all } ) }}" class="sc-button bt-delete "></a>
-                                    </li>
-                                    {% endif %}
-                                </ul>
-                            </td>
-                        </tr>
-                    {% endfor %}
-                </tbody>
-            </table>
+                            </li>
+                            {% endif %}
+                            
+                            <li>
+                                <a href="{{ path('chill_task_single_task_show', { 'id': task.id, 'list_params': app.request.query.all }) }}" class="btn btn-show "></a>
+                            </li>
+                            
+                            {% if is_granted('CHILL_TASK_TASK_UPDATE', task) %}
+                            <li>
+                                <a href="{{ path('chill_task_single_task_edit', { 'id': task.id, 'list_params': app.request.query.all }) }}" class="btn btn-update "></a>
+                            </li>
+                            {% endif %}
+                            
+                            {% if is_granted('CHILL_TASK_TASK_DELETE', task) %}
+                            <li>
+                                <a href="{{ path('chill_task_single_task_delete', { 'id': task.id, 'list_params': app.request.query.all } ) }}" class="btn btn-delete "></a>
+                            </li>
+                            {% endif %}
+                        </ul>
+                    </td>
+                </tr>
+                {% endfor %}
+            </tbody>
+        </table>
 
-            {% if isSingleStatus %}
-                {% if tasks|length < paginator.getTotalItems %}
-                {{ chill_pagination(paginator) }}
-                {% endif %}
-
-                <!-- lien retour -->
-                <ul class="record_actions">
-                    <li>
-                        {% if person is not null %}
-                        <a href="{{ path('chill_task_singletask_list', {'person_id': person.id}) }}" class="sc-button bt-cancel">
-                            {{ 'Back to the list' | trans }}
-                        </a>
-                        {% endif %}
-                        {% if user is not null %}
-                        <a href="{{ path('chill_task_singletask_list') }}" class="sc-button bt-cancel">
-                            {{ 'Back to the list' | trans }}
-                        </a>
-                        {% endif %}
-                    </li>
-                    <li>
-                        {% if person is not null %}
-                        <a href="{{ path('chill_task_single_task_new', {'person_id': person.id}) }}" class="sc-button bt-create">
-                            {{ 'Add a new task' | trans }}
-                        </a>
-                        {% endif %}
-                        {% if user is not null %}
-                        <a href="{{ path('chill_task_single_task_new') }}" class="sc-button bt-create">
-                            {{ 'Add a new task' | trans }}
-                        </a>
-                        {% endif %}
-                    </li>
-                </ul>
-            {% else %}
-                <ul class="record_actions">
-                    <li>
-                        <a href="{{ path('chill_task_singletask_list', app.request.query.all|merge({ 'status': [ status ] })) }}" class="sc-button">
-                            {{ 'See more' | trans }}
-                        </a>
-                    </li>
-
-                </ul>
+        {% if isSingleStatus %}
+            {% if tasks|length < paginator.getTotalItems %}
+            {{ chill_pagination(paginator) }}
             {% endif %}
 
+            <!-- lien retour -->
+            <ul class="record_actions">
+                <li>
+                    {% if person is not null %}
+                    <a href="{{ path('chill_task_singletask_list', {'person_id': person.id}) }}" class="btn btn-cancel">
+                        {{ 'Back to the list' | trans }}
+                    </a>
+                    {% endif %}
+                    {% if user is not null %}
+                    <a href="{{ path('chill_task_singletask_list') }}" class="btn btn-cancel">
+                        {{ 'Back to the list' | trans }}
+                    </a>
+                    {% endif %}
+                </li>
+                <li>
+                    {% if person is not null %}
+                    <a href="{{ path('chill_task_single_task_new', {'person_id': person.id}) }}" class="btn btn-create">
+                        {{ 'Add a new task' | trans }}
+                    </a>
+                    {% endif %}
+                    {% if user is not null %}
+                    <a href="{{ path('chill_task_single_task_new') }}" class="btn btn-create">
+                        {{ 'Add a new task' | trans }}
+                    </a>
+                    {% endif %}
+                </li>
+            </ul>
+        {% else %}
+            <ul class="record_actions">
+                <li>
+                    <a href="{{ path('chill_task_singletask_list', app.request.query.all|merge({ 'status': [ status ] })) }}" class="btn btn-misc">
+                        {{ 'See more' | trans }}
+                    </a>
+                </li>
+
+            </ul>
         {% endif %}
+
+    {% endif %}
 {% endmacro %}
 
 {% import _self as helper %}
 
-
     <h1>{{ app.request.query.get('title', null)|escape('html')|default('Task list'|trans) }}</h1>
 
     {% if false == app.request.query.boolean('hide_form', false) %}
-    <h2>{{ 'Filter the tasks'|trans }}</h2>
-    {{ form_start(form) }}
-    {{ form_row(form.user_id) }}
-    
-    {% if form.status is defined %}
-    {{ form_row(form.status) }}
+        <h2>{{ 'Filter the tasks'|trans }}</h2>
+        {{ form_start(form) }}
+        {{ form_row(form.user_id) }}
+        
+        {% if form.status is defined %}
+            {{ form_row(form.status) }}
+        {% endif %}
+        
+        {% if form.types is defined %}
+            {{ form_row(form.types) }}
+        {% endif %}
+        
+        {% if form.person_id is defined %}
+            {{ form_row(form.person_id) }}
+        {% endif %}
+        
+        {% if form.center_id is defined %}
+            {{ form_row(form.center_id) }}
+        {% endif %}
+        
+        <ul class="record_actions">
+            <li>
+                <button type="submit" class="btn btn-submit">{{ 'Filter'|trans }}</button>
+            </li>
+        </ul>
+        
+        {{ form_end(form)}}
     {% endif %}
-    
-    {% if form.types is defined %}
-    {{ form_row(form.types) }}
-    {% endif %}
-    
-    {% if form.person_id is defined %}
-    {{ form_row(form.person_id) }}
-    {% endif %}
-    
-    {% if form.center_id is defined %}
-    {{ form_row(form.center_id) }}
-    {% endif %}
-    
-    <ul class="record_actions">
-        <li>
-            <button type="submit" class="sc-button">{{ 'Filter'|trans }}</button>
-        </li>
-    </ul>
-    {{ form_end(form)}}
-    {% endif %}
-    
-    
 
     {% if tasks_count == 0 %}
         <p class="chill-no-data-statement">{{ "There is no tasks."|trans }}</p>
@@ -180,61 +184,61 @@
             <ul class="record_actions">
                 <li>
                     {% if person is not null %}
-                    <a href="{{ path('chill_task_single_task_new', {'person_id': person.id}) }}" class="sc-button bt-create">
-                        {{ 'Add a new task' | trans }}
-                    </a>
+                        <a href="{{ path('chill_task_single_task_new', {'person_id': person.id}) }}" class="btn btn-create">
+                            {{ 'Add a new task' | trans }}
+                        </a>
                     {% endif %}
                 </li>
             </ul>
         {% endif %}
     {% else %}
         
-        {% if false == app.request.query.boolean('hide_form', false) %}
+    {% if false == app.request.query.boolean('hide_form', false) %}
         <h2>{{ 'Tasks'|trans }}</h2>
-        {% endif %}
-        
-        {% if person is not null and is_granted('CHILL_TASK_TASK_CREATE', person)  %}
-            <ul class="record_actions">
-                <li>
-                    {% if person is not null %}
-                    <a href="{{ path('chill_task_single_task_new', {'person_id': person.id}) }}" class="sc-button bt-create">
-                        {{ 'Add a new task' | trans }}
-                    </a>
-                    {% endif %}
-                </li>
-            </ul>
-        {% endif %}
-        
-        {% if single_task_ended_tasks is defined %}
-            {{ helper.date_status('Tasks with expired deadline', single_task_ended_tasks, single_task_ended_count, single_task_ended_paginator, 'ended', isSingleStatus, person) }}
-        {% endif %}
-
-        {% if single_task_warning_tasks is defined %}
-            {{ helper.date_status('Tasks with warning deadline reached', single_task_warning_tasks, single_task_warning_count, single_task_warning_paginator, 'warning',  isSingleStatus, person) }}
-        {% endif %}
-
-        {% if single_task_current_tasks is defined %}
-            {{ helper.date_status('Current tasks', single_task_current_tasks, single_task_current_count, single_task_current_paginator, 'current',  isSingleStatus, person) }}
-        {% endif %}
-
-        {% if single_task_not_started_tasks is defined %}
-            {{ helper.date_status('Tasks not started', single_task_not_started_tasks, single_task_not_started_count, single_task_not_started_paginator, 'not_started', isSingleStatus, person) }}
-        {% endif %}
-
-        {% if single_task_closed_tasks is defined %}
-            {{ helper.date_status('Closed tasks', single_task_closed_tasks, single_task_closed_count, single_task_closed_paginator, 'closed',  isSingleStatus, person) }}
-        {% endif %}
-
-        {% if isSingleStatus == false %}
-            <ul class="record_actions">
-                <li>
-                    {% if person is not null and is_granted('CHILL_TASK_TASK_CREATE', person) %}
-                    <a href="{{ path('chill_task_single_task_new', {'person_id': person.id}) }}" class="sc-button bt-create">
-                        {{ 'Add a new task' | trans }}
-                    </a>
-                    {% endif %}
-                </li>
-            </ul>
-        {% endif %}
-
     {% endif %}
+    
+    {% if person is not null and is_granted('CHILL_TASK_TASK_CREATE', person)  %}
+        <ul class="record_actions">
+            <li>
+                {% if person is not null %}
+                    <a href="{{ path('chill_task_single_task_new', {'person_id': person.id}) }}" class="btn btn-create">
+                        {{ 'Add a new task' | trans }}
+                    </a>
+                {% endif %}
+            </li>
+        </ul>
+    {% endif %}
+    
+    {% if single_task_ended_tasks is defined %}
+        {{ helper.date_status('Tasks with expired deadline', single_task_ended_tasks, single_task_ended_count, single_task_ended_paginator, 'ended', isSingleStatus, person) }}
+    {% endif %}
+
+    {% if single_task_warning_tasks is defined %}
+        {{ helper.date_status('Tasks with warning deadline reached', single_task_warning_tasks, single_task_warning_count, single_task_warning_paginator, 'warning',  isSingleStatus, person) }}
+    {% endif %}
+
+    {% if single_task_current_tasks is defined %}
+        {{ helper.date_status('Current tasks', single_task_current_tasks, single_task_current_count, single_task_current_paginator, 'current',  isSingleStatus, person) }}
+    {% endif %}
+
+    {% if single_task_not_started_tasks is defined %}
+        {{ helper.date_status('Tasks not started', single_task_not_started_tasks, single_task_not_started_count, single_task_not_started_paginator, 'not_started', isSingleStatus, person) }}
+    {% endif %}
+
+    {% if single_task_closed_tasks is defined %}
+        {{ helper.date_status('Closed tasks', single_task_closed_tasks, single_task_closed_count, single_task_closed_paginator, 'closed',  isSingleStatus, person) }}
+    {% endif %}
+
+    {% if isSingleStatus == false %}
+        <ul class="record_actions">
+            <li>
+                {% if person is not null and is_granted('CHILL_TASK_TASK_CREATE', person) %}
+                    <a href="{{ path('chill_task_single_task_new', {'person_id': person.id}) }}" class="btn btn-create">
+                        {{ 'Add a new task' | trans }}
+                    </a>
+                {% endif %}
+            </li>
+        </ul>
+    {% endif %}
+
+{% endif %}
diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/confirm_delete.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/confirm_delete.html.twig
index 4ea637a60..3b194e244 100644
--- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/confirm_delete.html.twig
+++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/confirm_delete.html.twig
@@ -1,4 +1,4 @@
-{% extends "@ChillPerson/layout.html.twig"  %}
+{% extends "@ChillPerson/Person/layout.html.twig"  %}
 
 {% set activeRouteKey = 'chill_task_task_list' %}
 {% set person = task.person %}
diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/edit.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/edit.html.twig
index c43aaf0a8..67604f015 100644
--- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/edit.html.twig
+++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/edit.html.twig
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
-{% extends "@ChillPerson/layout.html.twig"  %}
+{% extends "@ChillPerson/Person/layout.html.twig"  %}
 
 {% set activeRouteKey = 'chill_task_single_task_edit' %}
 {% set person = task.person %}
@@ -22,33 +22,38 @@
 {% block title %}{{ 'Edit task'|trans }}{% endblock %}
 
 {% block personcontent %}
-<h1 class="chill-red">{{ 'Edit task'|trans }}</h1>
+<div class="task-edit">
+                    
+            <h1>{{ 'Edit task'|trans }}</h1>
 
-    {{ form_start(form) }}
+            {{ form_start(form) }}
 
-    {{ form_row(form.title) }}
-    {{ form_row(form.description) }}
-    {{ form_row(form.assignee) }}
-    {{ form_row(form.circle) }}
-    {{ form_row(form.startDate) }}
-    {{ form_row(form.endDate) }}
-    {{ form_row(form.warningInterval) }}
+            {{ form_row(form.title) }}
+            {{ form_row(form.description) }}
+            {{ form_row(form.assignee) }}
+            {{ form_row(form.circle) }}
+            {{ form_row(form.startDate) }}
+            {{ form_row(form.endDate) }}
+            {{ form_row(form.warningInterval) }}
 
-    <ul class="record_actions sticky-form-buttons">
-        <li class="cancel">
-            <a class="sc-button bt-cancel" href="{% if app.request.query.has('returnPath') %}
-                {{ app.request.query.get('returnPath')|escape('html_attr') }}">
-                {% else %}
-                {{ path('chill_task_single_task_show', { 'id': task.id, 'list_params': app.request.query.get('list_params', { } )} ) }}" class="sc-button">
-                {% endif %}
-                {{ app.request.query.get('returnLabel')|default('Cancel'|trans) }}
-            </a>
-        </li>
-        <li>
-            {{ form_widget(form.submit, { 'label': 'Save task', 'attr': {'class' : 'sc-button bt-update'}})}}
-        </li>
-    </ul>
+            <ul class="record_actions sticky-form-buttons">
+                <li class="cancel">
+                    <a class="btn btn-cancel" href="{% apply spaceless %}
+                            {% if app.request.query.has('returnPath') %}
+                                {{ app.request.query.get('returnPath')|escape('html_attr') }}">
+                            {% else %}
+                                {{ path('chill_task_single_task_show', { 'id': task.id, 'list_params': app.request.query.get('list_params', { } )} ) }}
+                            {% endif %}
+                        {% endapply %}">
+                        {{ app.request.query.get('returnLabel')|default('Cancel'|trans) }}
+                    </a>
+                </li>
+                <li>
+                    {{ form_widget(form.submit, { 'label': 'Save task', 'attr': {'class' : 'btn btn-update'}})}}
+                </li>
+            </ul>
 
-    {{ form_end(form) }}
+            {{ form_end(form) }}
 
+</div>
 {% endblock %}
diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/index.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/index.html.twig
index da557853f..149a5401c 100644
--- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/index.html.twig
+++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/index.html.twig
@@ -27,15 +27,16 @@
 {% macro row(task) %}
 {% endmacro %}
 
-
 {% block filtertasks %}
 {% if person is not null %}
     {% block personcontent %}
-        {% include 'ChillTaskBundle:SingleTask:_list.html.twig' %}
+        <div class="tasks">
+            {% include 'ChillTaskBundle:SingleTask:_list.html.twig' %}
+        </div>
     {% endblock %}
 {% else %}
     {% block content %}
-        <div class="grid-8 push-1 grid-mobile-9 grid-tablet-9 push-mobile-0 push-tablet-0">
+        <div class="col-md-10 col-xxl tasks">
             {% include 'ChillTaskBundle:SingleTask:_list.html.twig' %}
         </div>
     {% endblock %}
diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/new.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/new.html.twig
index e4c7e14a0..8f6ba2a4b 100644
--- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/new.html.twig
+++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/new.html.twig
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
-{% extends "@ChillPerson/layout.html.twig"  %}
+{% extends "@ChillPerson/Person/layout.html.twig"  %}
 
 {% set activeRouteKey = 'chill_task_single_task_new' %}
 {% set person = task.person %}
@@ -22,26 +22,29 @@
 {% block title %}{{ 'New task'|trans }}{% endblock %}
 
 {% block personcontent %}
-<h1 class="chill-red">{{ 'New task'|trans }}</h1>
+<div class="task-new">
+            
+            <h1>{{ 'New task'|trans }}</h1>
 
-    {{ form_start(form) }}
-    
-    {{ form_errors(form) }}
+            {{ form_start(form) }}
+            
+            {{ form_errors(form) }}
 
-    {{ form_row(form.title) }}
-    {{ form_row(form.description) }}
-    {{ form_row(form.assignee) }}
-    {{ form_row(form.circle) }}
-    {{ form_row(form.startDate) }}
-    {{ form_row(form.endDate) }}
-    {{ form_row(form.warningInterval) }}
+            {{ form_row(form.title) }}
+            {{ form_row(form.description) }}
+            {{ form_row(form.assignee) }}
+            {{ form_row(form.circle) }}
+            {{ form_row(form.startDate) }}
+            {{ form_row(form.endDate) }}
+            {{ form_row(form.warningInterval) }}
 
-    <div class="grid-12 centered sticky-form-buttons">
-        <!-- {{ form_row(form.submit, { 'label': 'Add a new task'|trans, 'attr': {'class': 'fa fa-save sc-button green margin-10'}  })  }} -->
+            <ul class="record_actions sticky-form-buttons">
+                <li>
+                    {{ form_widget(form.submit, { 'label': 'Add a new task'|trans, 'attr': {'class': 'btn btn-save'}  })  }}
+                </li>
+            </ul>
 
-        <button class="sc-button green margin-10" type="submit"><i class="fa fa-save"></i> {{ 'Add a new task'|trans }}</button>
-    </div>
-
-    {{ form_end(form) }}
+            {{ form_end(form) }}
 
+</div>
 {% endblock %}
diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/show.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/show.html.twig
index 7dc48f058..8cfa1ea33 100644
--- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/show.html.twig
+++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/show.html.twig
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
-{% extends "@ChillPerson/layout.html.twig"  %}
+{% extends "@ChillPerson/Person/layout.html.twig"  %}
 
 {% set activeRouteKey = 'chill_task_single_task_show' %}
 {% set person = task.person %}
@@ -23,103 +23,117 @@
 
 
 {% block personcontent %}
-<h1 class="chill-red">{{ 'Task'|trans }}</h1>
-
-<h2>{{ task.title }} {% for place in workflow_marked_places(task) %}
+<div class="task-show">
+            
+            <h1>{{ 'Task'|trans }}</h1>
+            
+            <h2>{{ task.title }} {% for place in workflow_marked_places(task) %}
                 <span class="task-status box type-{{ task.type }} place-{{ place }}">{{ place|trans }}</span>
-            {% endfor %}</h2>
-
-    <dl class="chill_view_data">
-
-        <dt class="inline">{{ 'Description'|trans }}</dt>
-        <dd>
-            {% if task.description is empty %}
-            <span class="chill-no-data-statement">{{"No description"|trans}}</span>
-            {% else %}
-            <blockquote class="chill-user-quote">
-            {{ task.description|chill_markdown_to_html }}
-            </blockquote>
+                {% endfor %}</h2>
+                
+            <dl class="chill_view_data">
+                
+                <dt class="inline">{{ 'Description'|trans }}</dt>
+                <dd>
+                    {% if task.description is empty %}
+                    <span class="chill-no-data-statement">{{"No description"|trans}}</span>
+                    {% else %}
+                    <blockquote class="chill-user-quote">
+                        {{ task.description|chill_markdown_to_html }}
+                    </blockquote>
+                    {% endif %}
+                </dd>
+                
+                <dt class="inline">{{ 'Assignee'|trans }}</dt>
+                <dd>
+                    {% if task.assignee is null %}
+                    <span class="chill-no-data-statement">{{"No one assignee"|trans}}</span>
+                    {% else %}
+                    {{ task.assignee }}
+                    {% endif %}
+                </dd>
+                
+                <dt class="inline">{{ 'Scope'|trans }}</dt>
+                <dd><span class="scope">{{ task.scope.name|localize_translatable_string }}</span></dd>
+                
+                <h3>{{"Dates"|trans}}</h3>
+                {% if task.startDate is null and task.endDate is null and task.warningDate is null %}
+                <dt>
+                    <dd><span class="chill-no-data-statement">{{"No dates specified"|trans}}</span></dd>
+                </dt>
+                {% else %}
+                {% if task.startDate is not null %}
+                <dt class="inline">{{ 'Start'|trans }}</dt>
+                <dd>{{ task.startDate|format_date('long') }}</dd>
+                {% endif %}
+                
+                {% if task.endDate is not null %}
+                <dt class="inline">{{ 'End'|trans }}</dt>
+                <dd>{{ task.endDate|format_date('long') }}</dd>
+                {% endif %}
+                
+                {% if task.warningDate is not null %}
+                <dt class="inline">{{ 'Warning'|trans }}</dt>
+                <dd>{{ task.warningDate|format_date('long') }}</dd>
+                {% endif %}
+                
+                {% endif %}
+            </dl>
+            
+            {% if timeline is not null %}
+                <h3>{{"Timeline"|trans}}</h3>
+                {{ timeline|raw }}
             {% endif %}
-        </dd>
-
-        <dt class="inline">{{ 'Assignee'|trans }}</dt>
-        <dd>
-            {% if task.assignee is null %}
-            <span class="chill-no-data-statement">{{"No one assignee"|trans}}</span>
-            {% else %}
-            {{ task.assignee }}
-            {% endif %}
-        </dd>
-
-        <dt class="inline">{{ 'Scope'|trans }}</dt>
-        <dd><span class="scope">{{ task.scope.name|localize_translatable_string }}</span></dd>
-
-        <h3>{{"Dates"|trans}}</h3>
-        {% if task.startDate is null and task.endDate is null and task.warningDate is null %}
-            <dt>
-                <dd><span class="chill-no-data-statement">{{"No dates specified"|trans}}</span></dd>
-            </dt>
-        {% else %}
-            {% if task.startDate is not null %}
-            <dt class="inline">{{ 'Start'|trans }}</dt>
-            <dd>{{ task.startDate|format_date('long') }}</dd>
-            {% endif %}
-
-            {% if task.endDate is not null %}
-            <dt class="inline">{{ 'End'|trans }}</dt>
-            <dd>{{ task.endDate|format_date('long') }}</dd>
-            {% endif %}
-
-            {% if task.warningDate is not null %}
-            <dt class="inline">{{ 'Warning'|trans }}</dt>
-            <dd>{{ task.warningDate|format_date('long') }}</dd>
-            {% endif %}
-
-        {% endif %}
-    </dl>
-
-    {% if timeline is not null %}
-        <h3>{{"Timeline"|trans}}</h3>
-        {{ timeline|raw }}
-    {% endif %}
-
-    <ul class="record_actions">
-        <li class="cancel">
-            <a class="sc-button bt-cancel" href="{%- if app.request.query.has('returnPath') -%}
-                {{ app.request.query.get('returnPath')|escape('html_attr') }}
-                {%- else -%}
-                    {{ path('chill_task_singletask_list', app.request.query.get('list_params', {}) ) }}
-                {%- endif -%}">
-                {{ app.request.query.get('returnLabel')|default('Back to the list'|trans) }}
-            </a>
-        </li>
-        {% if workflow_transitions(task)|length > 0 %}
-        <li>
-            <div class="bt-dropdown">
-                <a href="" class="sc-button bt-task-exchange">&nbsp;{{'Change task status'|trans}}</a>
-                <div class="bt-dropdown-content">
-                    {% for transition in workflow_transitions(task) %}
-                        <a href="{{ path('chill_task_task_transition', { 'taskId': task.id, 'transition': transition.name, 'kind': 'single-task', 'return_path':  app.request.uri }) }}" class="{{ task_workflow_metadata(task, 'transition.class', transition)|e('html_attr') }}">{{ task_workflow_metadata(task, 'transition.verb', transition)|trans }}</a>
-                    {% endfor %}
-                </div>
-            </div>
-        </li>
-        {% endif %}
-        {% if is_granted('CHILL_TASK_TASK_UPDATE', task) %}
-        <li>
-        <a class="sc-button bt-update" href="{{ path('chill_task_single_task_edit', { 'id': task.id }) }}">
-            {{ 'Edit the task'|trans }}
-        </a>
-        </li>
-        {% endif %}
-        {% if is_granted('CHILL_TASK_TASK_CREATE', task) %}
-        <li>
-            <a href="{{ path('chill_task_single_task_delete', { 'id': task.id } ) }}" class="sc-button bt-delete">
-                {{ 'Delete'|trans }}
-            </a>
-        </li>
-        {% endif %}
-
-    </ul>
+            
+            <ul class="record_actions sticky-form-buttons">
+                <li class="cancel">
+                    <a class="btn btn-cancel" href="{%- if app.request.query.has('returnPath') -%}
+                        {{ app.request.query.get('returnPath')|escape('html_attr') }}
+                        {%- else -%}
+                        {{ path('chill_task_singletask_list', app.request.query.get('list_params', {}) ) }}
+                        {%- endif -%}">
+                        {{ app.request.query.get('returnLabel')|default('Back to the list'|trans) }}
+                    </a>
+                </li>
+                
+                {% if workflow_transitions(task)|length > 0 %}
+                <li>
+                    <div class="btn-group">
+                        <a class="btn btn-task-exchange dropdown-toggle" href="#" role="button" 
+                            id="taskExchange" data-bs-toggle="dropdown" aria-expanded="false">
+                            {{'Change task status'|trans}}
+                        </a>
+                        <ul class="dropdown-menu" aria-labelledby="taskExchange">
+                            {% for transition in workflow_transitions(task) %}
+                            <li>
+                                <a class="dropdown-item"
+                                    href="{{ path('chill_task_task_transition', { 'taskId': task.id, 'transition': transition.name, 'kind': 'single-task', 'return_path':  app.request.uri }) }}" class="{{ task_workflow_metadata(task, 'transition.class', transition)|e('html_attr') }}">
+                                    {{ task_workflow_metadata(task, 'transition.verb', transition)|trans }}
+                                </a>
+                            </li>
+                            {% endfor %}
+                        </ul>
+                    </div>
+                </li>
+                {% endif %}
+                
+                {% if is_granted('CHILL_TASK_TASK_UPDATE', task) %}
+                <li>
+                    <a class="btn btn-update" href="{{ path('chill_task_single_task_edit', { 'id': task.id }) }}">
+                        {{ 'Edit the task'|trans }}
+                    </a>
+                </li>
+                {% endif %}
+                
+                {% if is_granted('CHILL_TASK_TASK_CREATE', task) %}
+                <li>
+                    <a href="{{ path('chill_task_single_task_delete', { 'id': task.id } ) }}" class="btn btn-delete">
+                        {{ 'Delete'|trans }}
+                    </a>
+                </li>
+                {% endif %}
+            </ul>
+            
+</div>
 
 {% endblock %}
diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/transition.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/transition.html.twig
index fc27ee8c4..617816e4c 100644
--- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/transition.html.twig
+++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/transition.html.twig
@@ -1,4 +1,4 @@
-{% extends "@ChillPerson/layout.html.twig"  %}
+{% extends "@ChillPerson/Person/layout.html.twig"  %}
 
 {% set activeRouteKey = 'chill_task_task_list' %}
 {% set person = task.person %}
@@ -20,12 +20,12 @@
 
 <ul class="record_actions">
     <li class="cancel">
-        <a href="{{ path('chill_task_singletask_list', app.request.query.get('list_params', { }) ) }}" class="sc-button bt-cancel">
+        <a href="{{ path('chill_task_singletask_list', app.request.query.get('list_params', { }) ) }}" class="btn btn-cancel">
             {{ 'Back to the list'|trans }}
         </a>
     </li>
     <li>
-        {{ form_widget(form.submit, { 'attr' : { 'class' : "sc-button bt-task-exchange green" }, 'label': task_workflow_metadata(task, 'transition.apply_transition_submit_label', transition)|default('apply')|trans } ) }}
+        {{ form_widget(form.submit, { 'attr' : { 'class' : "btn btn-task-exchange green" }, 'label': task_workflow_metadata(task, 'transition.apply_transition_submit_label', transition)|default('apply')|trans } ) }}
     </li>
 </ul>
         
diff --git a/src/Bundle/ChillTaskBundle/Resources/views/Timeline/single_task_transition.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/Timeline/single_task_transition.html.twig
index fe65a1f1f..7b717b990 100644
--- a/src/Bundle/ChillTaskBundle/Resources/views/Timeline/single_task_transition.html.twig
+++ b/src/Bundle/ChillTaskBundle/Resources/views/Timeline/single_task_transition.html.twig
@@ -34,12 +34,12 @@
     </div>
     <ul class="record_actions">
       <li>
-        <a href="{{ chill_path_add_return_path('chill_task_single_task_show', { 'id' : task.id }, false, 'Back to the timeline'|trans ) }}" class="sc-button bt-show">
+        <a href="{{ chill_path_add_return_path('chill_task_single_task_show', { 'id' : task.id }, false, 'Back to the timeline'|trans ) }}" class="btn btn-show">
           {{ "View the task"|trans }}
         </a>
       </li>
       <li>
-        <a href="{{ chill_path_add_return_path('chill_task_single_task_edit', { 'id' : task.id }, false, 'Back to the timeline'|trans) }}" class="sc-button bt-update">
+        <a href="{{ chill_path_add_return_path('chill_task_single_task_edit', { 'id' : task.id }, false, 'Back to the timeline'|trans) }}" class="btn btn-update">
           {{ "Edit task"|trans }}
         </a>
       </li>
diff --git a/src/Bundle/ChillTaskBundle/Workflow/Definition/DefaultTaskDefinition.php b/src/Bundle/ChillTaskBundle/Workflow/Definition/DefaultTaskDefinition.php
index 64b753875..64f5c7acc 100644
--- a/src/Bundle/ChillTaskBundle/Workflow/Definition/DefaultTaskDefinition.php
+++ b/src/Bundle/ChillTaskBundle/Workflow/Definition/DefaultTaskDefinition.php
@@ -31,21 +31,21 @@ class DefaultTaskDefinition implements \Chill\TaskBundle\Workflow\TaskWorkflowDe
     const TRANSITION_METADATA = [
         'close' => [
             'verb' => 'close',
-            'class' => 'sc-button bt-task-label bt-task-close',
+            'class' => 'btn btn-task-label btn-task-close',
             'sentence' => '%user% has closed the task',
             'sentence_confirmation' => 'Are you sure you want to close this task ?',
             'apply_transition_submit_label' => 'Close_verb'
         ],
         'cancel' => [
             'verb' => 'cancel',
-            'class' => 'sc-button bt-task-label bt-task-cancel',
+            'class' => 'btn btn-task-label btn-task-cancel',
             'sentence' => '%user% has canceled the task',
             'sentence_confirmation' => 'Are you sure you want to cancel this task ?',
             'apply_transition_submit_label' => 'Set this task to cancel state'
         ],
         'start' => [
             'verb' => 'start',
-            'class' => 'sc-button bt-task-label bt-task-start',
+            'class' => 'btn btn-task-label btn-task-start',
             'sentence' => '%user% has started the task',
             'sentence_confirmation' => 'Are you sure you want to start this task ?',
             'apply_transition_submit_label' => 'Start_verb'
diff --git a/src/Bundle/ChillTaskBundle/chill.webpack.config.js b/src/Bundle/ChillTaskBundle/chill.webpack.config.js
index 077d2c500..83c08a6ce 100644
--- a/src/Bundle/ChillTaskBundle/chill.webpack.config.js
+++ b/src/Bundle/ChillTaskBundle/chill.webpack.config.js
@@ -1,3 +1,4 @@
-module.exports = function(encore, entries) {
-    entries.push(__dirname + '/Resources/public/index.js');
-};
\ No newline at end of file
+module.exports = function(encore, entries)
+{
+    entries.push(__dirname + '/Resources/public/chill/index.js');
+};
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/chill/chillthirdparty.scss b/src/Bundle/ChillThirdPartyBundle/Resources/public/chill/chillthirdparty.scss
new file mode 100644
index 000000000..4ce6956c3
--- /dev/null
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/chill/chillthirdparty.scss
@@ -0,0 +1,64 @@
+
+/// render_box
+section.chill-entity {
+    .entity-thirdparty {
+        span.name {}
+    }
+}
+
+/* AVANT
+        border: 1px solid black;
+        background-color: rgba(255, 255, 255, 0.65);
+        padding: 1em;
+        margin: 1em 0;
+        max-width: 500px;
+
+        div.name {
+            font-variant: small-caps;
+        }
+
+        div.category {
+            margin: 0.5em 0;
+            font-size: 85%;
+
+            span.category {
+                font-style: italic;
+            }
+            span::before {
+                margin-left: 0.5em;
+                margin-right: 0.5em;
+                font-family: 'ForkAwesome';
+                content: '\f02e';
+                font-style: normal;
+            }
+        }
+
+        div.comment {
+            font-size: 85%;
+            font-style: italic;
+        }
+
+        div.chill_address {
+            div.chill_address_address::before {
+                margin-left: 0.5em;
+                margin-right: 0.5em;
+                font-family: 'ForkAwesome';
+                content: '\f015';
+            }
+        }
+
+        div.contact {
+            font-variant: small-caps;
+            span::before {
+                margin-left: 0.5em;
+                margin-right: 0.5em;
+                font-family: 'ForkAwesome';
+            }
+            span.email::before {
+                content: '\f1fa';
+            }
+            span.telephone::before {
+                content: '\f095';
+            }
+        }
+ */
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/chill/index.js b/src/Bundle/ChillThirdPartyBundle/Resources/public/chill/index.js
new file mode 100644
index 000000000..d85b125aa
--- /dev/null
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/chill/index.js
@@ -0,0 +1,2 @@
+require('./chillthirdparty.scss');
+
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/index.js b/src/Bundle/ChillThirdPartyBundle/Resources/public/index.js
deleted file mode 100644
index 9f205177f..000000000
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-// sass/css
-require('./sass/thirdparty.scss');
-
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/sass/thirdparty.scss b/src/Bundle/ChillThirdPartyBundle/Resources/public/sass/thirdparty.scss
deleted file mode 100644
index 952b011ec..000000000
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/sass/thirdparty.scss
+++ /dev/null
@@ -1,51 +0,0 @@
-
-div.chill_contact {
-  border: 1px solid black;
-  background-color: rgba(255, 255, 255, 0.65);
-  padding: 1em;
-  margin: 1em 0;
-  max-width: 500px;
-  div.chill_contact_name {
-    font-variant: small-caps;
-  }
-  div.chill_contact_category {
-    margin: 0.5em 0;
-    font-size: 85%;
-    span.category {
-      font-style: italic;
-    }
-    span::before {
-      margin-left: 0.5em;
-      margin-right: 0.5em;
-      font-family: 'ForkAwesome';
-      content: '\f02e';
-      font-style: normal;
-    }
-  }
-  div.chill_contact_comment {
-      font-size: 85%;
-      font-style: italic;
-  }
-  div.chill_address {
-    div.chill_address_address::before {
-      margin-left: 0.5em;
-      margin-right: 0.5em;
-      font-family: 'ForkAwesome';
-      content: '\f015';
-    }
-  }
-  div.chill_contact_contact {
-    font-variant: small-caps;
-    span::before {
-      margin-left: 0.5em;
-      margin-right: 0.5em;
-      font-family: 'ForkAwesome';
-    }
-    span.email::before {
-      content: '\f1fa';
-    }
-    span.telephone::before {
-      content: '\f095';
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/Entity/thirdparty.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/Entity/thirdparty.html.twig
new file mode 100644
index 000000000..ed7bb73bd
--- /dev/null
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/Entity/thirdparty.html.twig
@@ -0,0 +1,108 @@
+{#
+    Template to render a thirdparty
+    OPTIONS
+    * render        string ['raw'|'label'|'bloc']
+    * with_valid_from bool
+    * addLink       bool
+    * addEntity     bool
+    * addId         bool
+    * addInfo       bool
+    * hLevel        integer
+    * customButtons [
+        'before'    Twig\Markup, (injected with macro)
+        'replace'   Twig\Markup,
+        'after'     Twig\Markup
+    ]
+#}
+
+{% macro raw(thirdparty, options) %}
+    <span class="name">{{ thirdparty.name }}</span>
+{% endmacro raw %}
+
+{% macro label(thirdparty, options) %}
+    <div class="entity-label">
+
+        <div class="denomination {{ 'h' ~ options['hLevel'] }}">
+            {%- if options['addLink'] and is_granted('CHILL_3PARTY_3PARTY_SHOW', thirdparty) -%}
+                <a href="{{ chill_path_add_return_path('chill_3party_3party_show', { 'thirdparty_id': thirdparty.id }) }}">
+                    {{ _self.raw(thirdparty, options) }}
+                </a>
+            {%- else -%}
+                {{ _self.raw(thirdparty, options) }}
+            {%- endif -%}
+            {%- if options['addEntity'] -%}
+                <span class="badge rounded-pill bg-secondary">{{ 'Third party'|trans }}</span>
+            {%- endif -%}
+            {%- if options['addId'] -%}
+                <span class="id-number" title="{{ 'Third party'|trans ~ ' n° ' ~ thirdparty.id }}">
+                    {{  thirdparty.id|upper }}
+                </span>
+            {%- endif -%}
+        </div>
+        {%- if options['addInfo'] -%}
+            <p class="moreinfo">{#
+                <span class="company">{{ thirdparty.nameCompany }}</span>
+                <span class="acronym">{{ thirdparty.acronym }}</span>
+                #} plus d'infos
+            </p>
+        {%- endif -%}
+
+    {#- tricks to remove easily whitespace after template -#}
+    {%- if true -%}</div>{%- endif -%}
+{% endmacro label %}
+
+{%- if render == 'raw' -%}
+    {{ _self.raw(thirdparty, options) }}
+{%- endif -%}
+
+{%- if render == 'label' -%}
+    {{ _self.label(thirdparty, options) }}
+{%- endif -%}
+
+{%- if render == 'bloc' -%}
+    <div class="item-row entity-bloc">
+        <div class="item-col">
+            {{ _self.label(thirdparty, options) }}
+        </div>
+        <div class="item-col">
+            <ul class="list-content fa-ul">
+                {{ thirdparty.getAddress|chill_entity_render_box({
+                    'render': 'list',
+                    'with_picto': true,
+                    'multiline': false,
+                    'with_valid_from': false
+                }) }}
+                <li><i class="fa fa-li fa-phone"></i>
+                    {% if thirdparty.telephone %}
+                        <a href="{{ 'tel:' ~ thirdparty.telephone }}">{{ thirdparty.telephone|chill_format_phonenumber }}</a>
+                    {% else %}
+                        <span class="chill-no-data-statement">{{ 'thirdparty.No_phonenumber'|trans }}</span>
+                    {% endif %}
+                </li>
+                <li><i class="fa fa-li fa-envelope-o"></i>
+                    <a href="{{ 'mailto:' ~ thirdparty.email }}">
+                        {{ thirdparty.email|chill_print_or_message("thirdparty.No_email") }}
+                    </a>
+                </li>
+            </ul>
+            <ul class="record_actions">
+                {% if options['customButtons']['before'] is defined %}
+                    {{ options['customButtons']['before'] }}
+                {% endif %}
+
+                {%- if options['customButtons']['replace'] is not defined and is_granted('CHILL_3PARTY_3PARTY_SHOW', thirdparty) -%}
+                    <li>
+                        <a class="btn btn-show" target="_blank" title="{{ 'Show thirdparty'|trans }}"
+                            href="{{ path('chill_3party_3party_show', { thirdparty_id: thirdparty.id }) }}"></a>
+                    </li>
+                {%- else -%}
+                    {{ options['customButtons']['replace'] }}
+                {%- endif -%}
+
+                {% if options['customButtons']['after'] is defined %}
+                    {{ options['customButtons']['after'] }}
+                {% endif %}
+            </ul>
+        </div>
+    </div>
+{%- endif -%}
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/_render.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/_render.html.twig
deleted file mode 100644
index 626b556ee..000000000
--- a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/_render.html.twig
+++ /dev/null
@@ -1,52 +0,0 @@
-{# template to render a person #}
-{%- if options['only_denomination'] == true -%}
-<div class="chill_denomination">
-    {{ contact.name }}
-</div>
-
-{%- else -%}
-<div class="chill_contact">
-
-    <div class="chill_contact_name">
-        {{ contact.name }}
-    </div>
-    <div class="chill_contact_category">
-        {% for type in contact.type %}
-            <span class="category">
-                {{ ('chill_3party.key_label.'~type)|trans }}
-            </span>
-        {% endfor %}
-    </div>
-    {% if contact.comment is not empty %}
-        <div class="chill_contact_comment">
-            {{ contact.comment }}
-        </div>
-    {% endif %}
-    {% if contact.address %}
-    <div class="chill_address">
-        <div class="chill_address_address">
-
-            {% if contact.address.streetAddress1 %}<p class="street street1">{{ contact.address.streetAddress1 }}</p>{% endif %}
-            {% if contact.address.streetAddress2 is not empty %}<p class="street street2">{{ contact.address.streetAddress2 }}</p>{% endif %}
-            {% if contact.address.postCode is not empty %}
-                <p class="postalCode"><span class="code">{{ contact.address.postCode.code }}</span> <span class="name">{{ contact.address.postCode.name }}</span></p>
-                <p class="country">{{ contact.address.postCode.country.name|localize_translatable_string }}</p>
-            {% endif %}
-        </div>
-        {%- if options['with_valid_from'] == true -%}
-            <span class="address_since">{{ 'Since %date%'|trans( { '%date%' : contact.address.validFrom|format_date('long') } ) }}</span>
-        {%- endif -%}
-    </div>
-    {% endif %}
-    {% if contact.email or contact.telephone is not empty %}
-        <div class="chill_contact_contact">
-            <span class="email">
-                <a href="mailto:{{ contact.email }}">{{ contact.email }}</a>
-            </span>
-            <span class="telephone">
-                <a href="tel:{{ contact.telephone }}">{{ contact.telephone|chill_format_phonenumber }}</a>
-            </span>
-        </div>
-    {% endif %}
-</div>
-{%- endif -%}
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/index.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/index.html.twig
index 89b62f567..c741dd6c9 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/index.html.twig
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/index.html.twig
@@ -3,7 +3,7 @@
 {% block title 'List of third parties'|trans %}
 
 {% block content %}
-<div class="grid-10 centered">
+<div class="col-10 centered">
     <h1>{{ 'List of third parties'|trans }}</h1>
     
     {% if third_parties|length == 0 %}
@@ -34,12 +34,12 @@
                         <ul class="record_actions">
                             {% if is_granted('CHILL_3PARTY_3PARTY_UPDATE', tp) %}
                                 <li>
-                                    <a href="{{ chill_path_add_return_path('chill_3party_3party_update', { 'thirdparty_id': tp.id }) }}" class="sc-button bt-update"></a>
+                                    <a href="{{ chill_path_add_return_path('chill_3party_3party_update', { 'thirdparty_id': tp.id }) }}" class="btn btn-update"></a>
                                 </li>
                             {% endif %}
                             {% if is_granted('CHILL_3PARTY_3PARTY_SHOW', tp) %}
                                 <li>
-                                    <a href="{{ chill_path_add_return_path('chill_3party_3party_show', { 'thirdparty_id': tp.id }) }}" class="sc-button bt-show"></a>
+                                    <a href="{{ chill_path_add_return_path('chill_3party_3party_show', { 'thirdparty_id': tp.id }) }}" class="btn btn-show"></a>
                                 </li>
                             {% endif %}
                         </ul>
@@ -58,7 +58,7 @@
     {% if is_granted('CHILL_3PARTY_3PARTY_CREATE') %}
     <ul class="record_actions">
         <li>
-            <a href="{{ chill_path_add_return_path('chill_3party_3party_new') }}" class="sc-button bt-create">
+            <a href="{{ chill_path_add_return_path('chill_3party_3party_new') }}" class="btn btn-create">
                 {{ "New third party"|trans }}
             </a>
     {% endif %}
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/new.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/new.html.twig
index 12fe160a0..958d82b3a 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/new.html.twig
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/new.html.twig
@@ -3,7 +3,7 @@
 {% block title 'Create third party'|trans %}
 
 {% block content %}
-<div class="grid-10 centered">
+<div class="col-10 centered">
     <h1>{{ 'Create third party'|trans }}</h1>
 
     {{ form_start(form) }}
@@ -20,12 +20,12 @@
 
     <ul class="record_actions">
         <li class="cancel">
-            <a href="{{ chill_return_path_or('chill_3party_3party_index') }}" class="sc-button bt-cancel">
+            <a href="{{ chill_return_path_or('chill_3party_3party_index') }}" class="btn btn-cancel">
                 {{ 'Back to the list'|trans }}
             </a>
         </li>
         <li>
-            {{ form_widget(form.submit, {'label': 'Create', 'attr': {'class': 'sc-button bt-new' }}) }}
+            {{ form_widget(form.submit, {'label': 'Create', 'attr': {'class': 'btn btn-new' }}) }}
         </li>
     </ul>
         
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/show.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/show.html.twig
index 2191d0c69..a691605eb 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/show.html.twig
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/show.html.twig
@@ -1,13 +1,11 @@
 {% extends "@ChillMain/layout.html.twig" %}
 
-{% import '@ChillMain/Address/macro.html.twig' as address %}
-
 {% set title_ = 'Show third party %name%'|trans({'%name%' : thirdParty.name }) %}
 
 {% block title title_ %}
 
 {% block content %}
-<div class="grid-10 centered">
+<div class="col-10 centered">
     <h1>
         {{ title_ }} 
         <span class="chill__box {{ thirdParty.active ? 'green' : 'red' }}">{{ (thirdParty.active ? 'Active, shown to users' : 'Inactive, not shown to users')|trans }}</span>
@@ -38,7 +36,7 @@
             {% if thirdParty.address == null %}
                 <span class="chill-no-data-statement">{{ 'No address given'|trans }}</span>
             {%  else %}
-                {{ address._render(thirdParty.address, {'with_valid_from': false }) }}
+                {{ thirdParty.address|chill_entity_render_box({'with_valid_from': false }) }}
             {% endif %}
         </dd>
         
@@ -49,14 +47,14 @@
         
     <ul class="record_actions">
         <li class="cancel">
-            <a class="sc-button bt-cancel" href="{{ chill_return_path_or('chill_3party_3party_index') }}">
+            <a class="btn btn-cancel" href="{{ chill_return_path_or('chill_3party_3party_index') }}">
                 {{ 'Cancel'|trans }}
             </a>
         </li>
         
         {% if is_granted('CHILL_3PARTY_3PARTY_UPDATE', thirdParty) %}
             <li>
-                <a class="sc-button bt-update" href="{{ chill_path_forward_return_path('chill_3party_3party_update', { 'thirdparty_id': thirdParty.id }) }}">
+                <a class="btn btn-update" href="{{ chill_path_forward_return_path('chill_3party_3party_update', { 'thirdparty_id': thirdParty.id }) }}">
                     {{ 'Update'|trans }}
                 </a>
             </li>
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/update.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/update.html.twig
index 7e3244e32..af5f11450 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/update.html.twig
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/update.html.twig
@@ -3,7 +3,7 @@
 {% block title 'Update third party %name%'|trans({ '%name%': thirdParty.name }) %}
 
 {% block content %}
-<div class="grid-10 centered">
+<div class="col-10 centered">
     <h1>
         {{ 'Update third party %name%'|trans({ '%name%': thirdParty.name }) }}
          <span class="chill__box {{ thirdParty.active ? 'green' : 'red' }}">{{ (thirdParty.active ? 'Active, shown to users' : 'Inactive, not shown to users')|trans }}</span>
@@ -24,11 +24,11 @@
 
     <ul class="record_actions">
         <li class="cancel">
-            <a class="sc-button bt-cancel" href="{{ chill_path_forward_return_path('chill_3party_3party_index') }}">
+            <a class="btn btn-cancel" href="{{ chill_path_forward_return_path('chill_3party_3party_index') }}">
                 {{ 'Back to the list'|trans }}
             </a>
         <li>
-            {{ form_row(form.submit, {'label': 'Update', 'attr': {'class': 'sc-button bt-update' }}) }}
+            {{ form_row(form.submit, {'label': 'Update', 'attr': {'class': 'btn btn-update' }}) }}
         </li>
     </ul>
         
diff --git a/src/Bundle/ChillThirdPartyBundle/Templating/Entity/ThirdPartyRender.php b/src/Bundle/ChillThirdPartyBundle/Templating/Entity/ThirdPartyRender.php
index be2f82cb5..07f6e1668 100644
--- a/src/Bundle/ChillThirdPartyBundle/Templating/Entity/ThirdPartyRender.php
+++ b/src/Bundle/ChillThirdPartyBundle/Templating/Entity/ThirdPartyRender.php
@@ -2,7 +2,7 @@
 /*
  * Chill is a software for social workers
  *
- * Copyright (C) 2014-2020 , Champs Libres Cooperative SCRLFS, 
+ * Copyright (C) 2014-2020 , Champs Libres Cooperative SCRLFS,
  * <http://www.champs-libres.coop>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -22,50 +22,52 @@ namespace Chill\ThirdPartyBundle\Templating\Entity;
 
 use Chill\MainBundle\Templating\Entity\AbstractChillEntityRender;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
-use Symfony\Bridge\Twig\TwigEngine;
+use Symfony\Component\Templating\EngineInterface;
 
 /**
- * 
+ *
  *
  */
 class ThirdPartyRender extends AbstractChillEntityRender
 {
+
+    protected EngineInterface $engine;
+
+    public function __construct(EngineInterface $engine)
+    {
+        $this->engine = $engine;
+    }
+
     /**
      *
-     * @var TwigEngine
-     */
-    protected $templating;
-    
-    public function __construct(TwigEngine $templating)
-    {
-        $this->templating = $templating;
-    }
-    
-    /**
-     * 
      * @param ThirdParty $entity
      * @param array $options
      * @return string
      */
     public function renderBox($entity, array $options): string
     {
-        $params = \array_merge(
-            [ 'with_valid_from' => true ],
-            $options
-            );
-        
+        $params = [
+            'with_valid_from' => $options['with_valid_from'] ?? true,
+            'addLink' => $options['addLink'] ?? false,
+            'addEntity' => $options['addEntity'] ?? false,
+            'addId' => $options['addId'] ?? false,
+            'addInfo' => $options['addInfo'] ?? false,
+            'hLevel' => $options['hLevel'] ?? 3,
+            'customButtons' => $options['customButtons'] ?? [],
+        ];
+
         return
-            $this->getDefaultOpeningBox('_3party').
-            $this->templating->render('@ChillThirdParty/ThirdParty/_render.html.twig', [ 
-                'contact' => $entity, 
+            $this->getDefaultOpeningBox('thirdparty') .
+            $this->engine->render('@ChillThirdParty/Entity/thirdparty.html.twig', [
+                'thirdparty' => $entity,
+                'render' => $options['render'] ?? 'raw',
                 'options' => $params
-                ]).
+            ]) .
             $this->getDefaultClosingBox();
-            
     }
 
     /**
-     * 
+     *
      * @param ThirdParty $entity
      * @param array $options
      * @return string
diff --git a/src/Bundle/ChillThirdPartyBundle/chill.webpack.config.js b/src/Bundle/ChillThirdPartyBundle/chill.webpack.config.js
index 98569ccae..83c08a6ce 100644
--- a/src/Bundle/ChillThirdPartyBundle/chill.webpack.config.js
+++ b/src/Bundle/ChillThirdPartyBundle/chill.webpack.config.js
@@ -1,3 +1,4 @@
-module.exports = function(encore, entries) {
-    entries.push(__dirname + '/Resources/public/index.js');
+module.exports = function(encore, entries)
+{
+    entries.push(__dirname + '/Resources/public/chill/index.js');
 };
diff --git a/src/Bundle/ChillThirdPartyBundle/config/services/templating.yaml b/src/Bundle/ChillThirdPartyBundle/config/services/templating.yaml
index 690f6008d..6b12d3aa0 100644
--- a/src/Bundle/ChillThirdPartyBundle/config/services/templating.yaml
+++ b/src/Bundle/ChillThirdPartyBundle/config/services/templating.yaml
@@ -1,6 +1,6 @@
 services:
     Chill\ThirdPartyBundle\Templating\Entity\ThirdPartyRender:
         arguments:
-            $templating: '@templating.engine.twig'
+            $engine: '@Symfony\Component\Templating\EngineInterface'
         tags:
-            - 'chill.render_entity'
\ No newline at end of file
+            - 'chill.render_entity'
diff --git a/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml b/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml
index 5ca560f88..d7cc22eb5 100644
--- a/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml
@@ -20,7 +20,7 @@ Third party updated: Le tiers a été mis à jour
 Third party created: Le tiers a été créé
 Active, shown to users: Actif, visible par les utilisateurs
 Inactive, not shown to users: Inactif, invisible par les utilisateurs
-
+Show thirdparty: Voir le tiers
 
 The party is visible in those centers: Le tiers est visible dans ces centres
 No third parties: Aucun tiers
@@ -28,4 +28,4 @@ No third parties: Aucun tiers
 # ROLES
 CHILL_3PARTY_3PARTY_CREATE: Ajouter un Tiers
 CHILL_3PARTY_3PARTY_SHOW:  Voir un Tiers
-CHILL_3PARTY_3PARTY_UPDATE: Modifier un Tiers
\ No newline at end of file
+CHILL_3PARTY_3PARTY_UPDATE: Modifier un Tiers