diff --git a/CONTRIBUTION.md b/CONTRIBUTION.md
index 6857eb8b6..d11b116c0 100644
--- a/CONTRIBUTION.md
+++ b/CONTRIBUTION.md
@@ -10,7 +10,7 @@ https://github.com/atom/atom/blob/master/CONTRIBUTING.md#git-commit-messages
 - 💚 `:green_heart:` when fixing the CI build
 - ✅ `:white_check_mark:` when adding tests
 - ⬆️ `:arrow_up:` when upgrading dependencies
-
+- :sparkles: `:sparkles: ` when formatting files
 
 Et ceux spécifiques au projet :
 - :gear: `:gear:` pour une contribution au moteur qui traite les YAML
diff --git a/source/components/conversation/FormDecorator.js b/source/components/conversation/FormDecorator.js
index b9a623079..0eaa1b367 100644
--- a/source/components/conversation/FormDecorator.js
+++ b/source/components/conversation/FormDecorator.js
@@ -1,10 +1,10 @@
 import React, { Component } from 'react'
 import classNames from 'classnames'
 import { connect } from 'react-redux'
-import {Field, change} from 'redux-form'
-import {stepAction} from '../../actions'
+import { Field, change } from 'redux-form'
+import { stepAction } from '../../actions'
 import StepAnswer from './StepAnswer'
-import {capitalise0} from '../../utils'
+import { capitalise0 } from '../../utils'
 
 /*
 This higher order component wraps "Form" components (e.g. Question.js), that represent user inputs,
@@ -15,13 +15,15 @@ to understand those precious higher order components.
 */
 
 export var FormDecorator = formType => RenderField =>
-	@connect( //... this helper directly to the redux state to avoid passing more props
+	@connect(
+		//... this helper directly to the redux state to avoid passing more props
 		state => ({
 			themeColours: state.themeColours
 		}),
 		dispatch => ({
 			stepAction: (name, step) => dispatch(stepAction(name, step)),
-			setFormValue: (field, value) => dispatch(change('conversation', field, value))
+			setFormValue: (field, value) =>
+				dispatch(change('conversation', field, value))
 		})
 	)
 	class extends Component {
@@ -31,29 +33,29 @@ export var FormDecorator = formType => RenderField =>
 		}
 		render() {
 			let {
-				stepAction,
-				themeColours,
-				setFormValue,
-				/* Une étape déjà répondue est marquée 'folded'. Dans ce dernier cas, un résumé
+					stepAction,
+					themeColours,
+					setFormValue,
+					/* Une étape déjà répondue est marquée 'folded'. Dans ce dernier cas, un résumé
 				de la réponse est affiché */
-				unfolded
-			} = this.props,
+					unfolded
+				} = this.props,
 				{
-				possibleChoice, // should be found in the question set theoritically, but it is used for a single choice question -> the question itself is dynamic and cannot be input as code,
-				// formerly in conversation-steps
-				valueType,
-				attributes,
-				choices,
-				optionsURL,
-				human,
-				helpText,
-				suggestions,
-				subquestion,
-				inversions
-			} = this.props.step
+					possibleChoice, // should be found in the question set theoritically, but it is used for a single choice question -> the question itself is dynamic and cannot be input as code,
+					// formerly in conversation-steps
+					valueType,
+					attributes,
+					choices,
+					optionsURL,
+					human,
+					helpText,
+					suggestions,
+					subquestion,
+					inversions
+				} = this.props.step
 			this.step = this.props.step
 
-			let {fieldName} = this.state
+			let { fieldName } = this.state
 
 			/* Nos propriétés personnalisées à envoyer au RenderField.
 			Elles sont regroupées dans un objet précis pour pouvoir être enlevées des
@@ -61,10 +63,10 @@ export var FormDecorator = formType => RenderField =>
 			des balises html, <input> dans notre cas.
 			*/
 			let stepProps = {
-				attributes, /* Input component's html attributes */
-				choices,  /* Question component's radio choices */
-				optionsURL, /* Select component's data source */
-				possibleChoice, /* RhetoricalQuestion component's only choice :'-( */
+				attributes /* Input component's html attributes */,
+				choices /* Question component's radio choices */,
+				optionsURL /* Select component's data source */,
+				possibleChoice /* RhetoricalQuestion component's only choice :'-( */,
 				//TODO hack, enables redux-form/CHANGE to update the form state before the traverse functions are run
 				submit: () => setTimeout(() => stepAction('fold', fieldName), 1),
 				setFormValue: value => setFormValue(fieldName, value),
@@ -77,18 +79,25 @@ export var FormDecorator = formType => RenderField =>
 			/* There won't be any answer zone here, widen the question zone */
 			let wideQuestion = formType == 'rhetorical-question' && !possibleChoice
 
-			let {pre = (v => v), test, error} = valueType ? valueType.validator : {},
-				validate = test && ( v =>
-					( v && test(pre(v)) ) ? undefined : error
-				)
+			let { pre = v => v, test, error } = valueType ? valueType.validator : {},
+				validate = test && (v => (v && test(pre(v)) ? undefined : error))
 			return (
-			<div
-				className={classNames({step: unfolded}, formType)}
-				>
-				{this.state.helpVisible && this.renderHelpBox(helpText)}
-				<div style={{visibility: this.state.helpVisible ? 'hidden' : 'visible'}}>
-					{this.renderHeader(unfolded, valueType, human, helpText, wideQuestion, subquestion)}
-					{unfolded &&
+				<div className={classNames({ step: unfolded }, formType)}>
+					{this.state.helpVisible && this.renderHelpBox(helpText)}
+					<div
+						style={{
+							visibility: this.state.helpVisible ? 'hidden' : 'visible'
+						}}
+					>
+						{this.renderHeader(
+							unfolded,
+							valueType,
+							human,
+							helpText,
+							wideQuestion,
+							subquestion
+						)}
+						{unfolded && (
 							<fieldset>
 								<Field
 									component={RenderField}
@@ -96,86 +105,99 @@ export var FormDecorator = formType => RenderField =>
 									stepProps={stepProps}
 									themeColours={themeColours}
 									validate={validate}
-									changeFieldName={name => this.setState({fieldName: name})}
-									/>
+									changeFieldName={name => this.setState({ fieldName: name })}
+								/>
 							</fieldset>
-					}
+						)}
+					</div>
 				</div>
-			</div>
 			)
 		}
 
 		/*
 			< Le titre de ma question > ----------- < (? bulle d'aide) OU résultat >
 		*/
-		renderHeader(unfolded, valueType, human, helpText, wideQuestion, subquestion) {
+		renderHeader(
+			unfolded,
+			valueType,
+			human,
+			helpText,
+			wideQuestion,
+			subquestion
+		) {
 			return (
 				<span className="form-header">
-				{ unfolded ? this.renderQuestion(unfolded, helpText, wideQuestion, subquestion) : this.renderTitleAndAnswer(valueType, human)}
+					{unfolded
+						? this.renderQuestion(unfolded, helpText, wideQuestion, subquestion)
+						: this.renderTitleAndAnswer(valueType, human)}
 				</span>
 			)
 		}
 
-		renderQuestion = (unfolded, helpText, wideQuestion, subquestion) =>
-				<div className="step-question">
-					<h1
-						style={{
-							// border: '2px solid ' + this.props.themeColours.colour, // higher border width and colour to emphasize focus
-							// background: 'none',
-							// color: this.props.themeColours.textColourOnWhite,
-							maxWidth: wideQuestion ? '95%' : ''
-						}}
-						>{this.props.step.question}</h1>
-						<div className="step-subquestion" dangerouslySetInnerHTML={{__html: subquestion}}></div>
-				</div>
+		renderQuestion = (unfolded, helpText, wideQuestion, subquestion) => (
+			<div className="step-question">
+				<h1
+					style={{
+						// border: '2px solid ' + this.props.themeColours.colour, // higher border width and colour to emphasize focus
+						// background: 'none',
+						// color: this.props.themeColours.textColourOnWhite,
+						maxWidth: wideQuestion ? '95%' : ''
+					}}
+				>
+					{this.props.step.question}
+				</h1>
+				<div
+					className="step-subquestion"
+					dangerouslySetInnerHTML={{ __html: subquestion }}
+				/>
+			</div>
+		)
 
 		renderTitleAndAnswer(valueType, human) {
 			let {
-				name,
-				stepAction,
-				answer,
-				themeColours,
-				step: {title}
-			} = this.props,
+					name,
+					stepAction,
+					answer,
+					themeColours,
+					step: { title }
+				} = this.props,
 				ignored = this.step.state === 'ignored'
 			return (
 				<div className="foldedQuestion">
 					<span className="borderWrapper">
 						<span className="title">{capitalise0(title)}</span>
-						<span className="answer">
-							{answer}
-						</span>
+						<span className="answer">{answer}</span>
 					</span>
 					<button
 						className="edit"
 						onClick={() => stepAction('unfold', name)}
-						style={{color: themeColours.textColourOnWhite}} >
-						<i
-							className="fa fa-pencil-square-o"
-							aria-hidden="true"
-							>
-						</i>
+						style={{ color: themeColours.textColourOnWhite }}
+					>
+						<i className="fa fa-pencil-square-o" aria-hidden="true" />
 						{'  '}
 						<span>Modifier</span>
 					</button>
 					{/* <StepAnswer	{...{value, human, valueType, ignored, themeColours}} /> */}
-				</div>)
+				</div>
+			)
 		}
 
 		renderHelpBox(helpText) {
 			let helpComponent =
-					typeof helpText === 'string' ?
-					(<p>{helpText}</p>) :
-					helpText
+				typeof helpText === 'string' ? <p>{helpText}</p> : helpText
 
-			return <div className="help-box">
-				<a
-					className="close-help"
-					onClick={() => this.setState({helpVisible: false})}>
-					<span className="close-text">revenir <span className="icon">&#x2715;</span></span>
-				</a>
-				{helpComponent}
-			</div>
+			return (
+				<div className="help-box">
+					<a
+						className="close-help"
+						onClick={() => this.setState({ helpVisible: false })}
+					>
+						<span className="close-text">
+							revenir <span className="icon">&#x2715;</span>
+						</span>
+					</a>
+					{helpComponent}
+				</div>
+			)
 		}
-
 	}