diff --git a/app/src/main/java/com/example/myhabitat/CreationOuvertureActivity.java b/app/src/main/java/com/example/myhabitat/CreationOuvertureActivity.java
index 7746846c35a21b81f6edbc2d8b720ea23bbde129..39c37bc3439085045deb3d8720baed8507beffb8 100644
--- a/app/src/main/java/com/example/myhabitat/CreationOuvertureActivity.java
+++ b/app/src/main/java/com/example/myhabitat/CreationOuvertureActivity.java
@@ -13,6 +13,7 @@ import habitat.*;
 import org.json.JSONObject;
 
 import java.io.*;
+import java.time.Duration;
 
 public class CreationOuvertureActivity extends AppCompatActivity{
 
@@ -286,11 +287,12 @@ public class CreationOuvertureActivity extends AppCompatActivity{
     public void confirmer(View view) {
         Ouverture ouverture = new Ouverture(pieceDepart.getMurOrientation(orientationPieceDepart), pieceArrivee.getMurOrientation(orientationPieceArrivee), rectDepart, rectArrivee);
         habitat.addOuverture(ouverture);
-        //On re-set correctement les murs (pas besoin finalemnt...)
-        Log.i("testGetMur2", ouverture.getMurDepart().getPiece()+"");
-        Log.i("testGetMur2", ouverture.getMurArrivee().getPiece()+"");
+
+        Toast.makeText(getBaseContext(), "Ouverture créée !", Toast.LENGTH_SHORT).show();
 
         enregistrement();
+        finish();
+
     }
 
     public void enregistrement(){
diff --git a/app/src/main/java/com/example/myhabitat/MainActivity.java b/app/src/main/java/com/example/myhabitat/MainActivity.java
index 311d4cdde06d9443a593e41cf6888853289699ce..276b0520b8fb5f15fcb73d1236d40882c7fd784d 100644
--- a/app/src/main/java/com/example/myhabitat/MainActivity.java
+++ b/app/src/main/java/com/example/myhabitat/MainActivity.java
@@ -99,7 +99,6 @@ public class MainActivity extends AppCompatActivity {
     }
 
     public void ouvrirJSON(){
-        //habitat.reset();
         habitat = new Habitat();
         FileInputStream fis = null;
         try {
diff --git a/app/src/main/java/com/example/myhabitat/ModeConceptionActivity.java b/app/src/main/java/com/example/myhabitat/ModeConceptionActivity.java
index 79bdf8a1a02995189285e6292640c29aeb9f14bd..31ba040cbc6de0937e48491710cbacfe9b6a5887 100644
--- a/app/src/main/java/com/example/myhabitat/ModeConceptionActivity.java
+++ b/app/src/main/java/com/example/myhabitat/ModeConceptionActivity.java
@@ -7,6 +7,7 @@ import android.provider.MediaStore;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.util.Log;
+import android.view.Gravity;
 import android.view.View;
 import android.view.inputmethod.EditorInfo;
 import android.widget.*;
@@ -121,11 +122,10 @@ public class ModeConceptionActivity extends AppCompatActivity {
             ll.addView(editText);
             for(Mur mur : piece.getMurs()){
                 LinearLayout llMur = new LinearLayout(this);
-                llMur.setOrientation(LinearLayout.HORIZONTAL);
+                //llMur.setGravity(Gravity.CENTER_HORIZONTAL);
                 ImageButton imageButton = new ImageButton(this);
                 imageButton.setMaxHeight(50);
                 imageButton.setMaxWidth(50);
-                //imageButton.setImageBitmap(mur.getPhoto());
 
                 //On récupère la photo
                 FileInputStream fis = null;
diff --git a/app/src/main/java/com/example/myhabitat/ModeImmersionActivity.java b/app/src/main/java/com/example/myhabitat/ModeImmersionActivity.java
index 50b8a237433b4a94c8c6b5e0dee49cbb33698de1..34af0c1b3a196e993d41a794d6aa514938310b22 100644
--- a/app/src/main/java/com/example/myhabitat/ModeImmersionActivity.java
+++ b/app/src/main/java/com/example/myhabitat/ModeImmersionActivity.java
@@ -185,6 +185,7 @@ public class ModeImmersionActivity extends AppCompatActivity implements SensorEv
             try {
                 canvas = surfaceView.getHolder().lockCanvas();
                 synchronized (surfaceView.getHolder()) {
+                    canvas.drawColor(0, PorterDuff.Mode.CLEAR);
                     for(Rect rect : rectangles){
                         canvas.drawRect(rect, myPaint);
                     }
diff --git a/app/src/main/res/layout/activity_creation_ouverture.xml b/app/src/main/res/layout/activity_creation_ouverture.xml
index 85adf75d35b2db6d5f9f4da7221c06d63523d89d..e5715adf428877b72dae4abfc77aea95e001b34e 100644
--- a/app/src/main/res/layout/activity_creation_ouverture.xml
+++ b/app/src/main/res/layout/activity_creation_ouverture.xml
@@ -30,7 +30,7 @@
             app:layout_constraintHorizontal_bias="0.892"/>
 
     <TextView
-            android:text="Direction"
+            android:text="@string/direction"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/textView4"
@@ -41,7 +41,7 @@
             app:layout_constraintHorizontal_bias="0.83"/>
 
     <TextView
-            android:text="Piece de Depart"
+            android:text="@string/piecededepart"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/textViewDepart"
@@ -53,7 +53,7 @@
             app:layout_constraintVertical_bias="0.484"/>
 
     <TextView
-            android:text="Piece d'Arrivee"
+            android:text="@string/piecedarrivee"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/textViewArrivee"
@@ -85,7 +85,7 @@
             app:layout_constraintHorizontal_bias="1.0"/>
 
     <TextView
-            android:text="Direction"
+            android:text="@string/direction"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/textView3"
@@ -116,7 +116,7 @@
             app:layout_constraintHorizontal_bias="0.0"/>
 
     <Button
-            android:text="Selectionner"
+            android:text="@string/selectionner"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/buttonSDepart"
@@ -128,7 +128,7 @@
             app:layout_constraintHorizontal_bias="0.419"/>
 
     <Button
-            android:text="Selectionner"
+            android:text="@string/selectionner"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/buttonSArrivee"
@@ -139,7 +139,7 @@
             android:layout_marginTop="16dp"/>
 
     <Button
-            android:text="Confirmer"
+            android:text="@string/confirmer"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/buttonConfirmer"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 2f556665b0e38ab6ac6c9770e93d9b2b260978fb..2c5d01f914151336c45a9420859e11f1fd9779c1 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -8,7 +8,7 @@
         tools:context=".MainActivity">
 
     <Button
-            android:text="Mode Conception"
+            android:text="@string/modeconception"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/buttonConception"
@@ -29,7 +29,7 @@
             app:layout_constraintTop_toTopOf="parent"/>
 
     <Button
-            android:text="Mode Immersion"
+            android:text="@string/modeimmersion"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/buttonImmersion"
diff --git a/app/src/main/res/layout/activity_mode_conception.xml b/app/src/main/res/layout/activity_mode_conception.xml
index e108fdb38e6f18031dcaff7d7c7d77e7fe7e9204..c01c60175d1fffafecb15b632a0bfb9cea64773a 100644
--- a/app/src/main/res/layout/activity_mode_conception.xml
+++ b/app/src/main/res/layout/activity_mode_conception.xml
@@ -26,7 +26,7 @@
     </ScrollView>
 
     <Button
-            android:text="Confirmer"
+            android:text="@string/confirmer"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/button"
@@ -37,7 +37,7 @@
             />
 
     <Button
-            android:text="Ajouter une ouverture"
+            android:text="@string/ajouteruneouverture"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/button2"
@@ -48,7 +48,7 @@
             android:layout_marginTop="24dp"/>
 
     <Button
-            android:text="Ajouter une piece"
+            android:text="@string/ajouterunepiece"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/addPiece"
diff --git a/app/src/main/res/layout/activity_mode_immersion.xml b/app/src/main/res/layout/activity_mode_immersion.xml
index fa8eabe31903f05e3ed2f524cd591458ea620728..f66d6223f2ca3b9c7ad5ce930a7393d9f191d4e1 100644
--- a/app/src/main/res/layout/activity_mode_immersion.xml
+++ b/app/src/main/res/layout/activity_mode_immersion.xml
@@ -43,11 +43,12 @@
             android:id="@+id/surfaceView"/>
 
     <TextView
-            android:text="TextView"
+            android:text="@string/textview"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/textViewPiece"
             tools:layout_editor_absoluteX="176dp"
             app:layout_constraintTop_toBottomOf="@+id/imageViewMur"
-            app:layout_constraintBottom_toBottomOf="parent"/>
+            app:layout_constraintBottom_toBottomOf="parent"
+            tools:ignore="MissingConstraints"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8f0533a9cca72bbf4260cdd3bb0f5082f68dee04
--- /dev/null
+++ b/app/src/main/res/values-en/strings.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">MyHabitat</string>
+    <string name="title_activity_scrolling">ScrollingActivity</string>
+    <string name="large_text">large_text</string>
+    <string name="action_settings">Settings</string>
+    <string name="direction">Direction</string>
+    <string name="piecededepart">Starting Room</string>
+    <string name="piecedarrivee">Ending Room</string>
+    <string name="selectionner">Select</string>
+    <string name="confirmer">Submit</string>
+    <string name="modeconception">Design Mode</string>
+    <string name="modeimmersion">Immersive Mode</string>
+    <string name="ajouteruneouverture">Add an opening</string>
+    <string name="ajouterunepiece">Add a room</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 79d656622d1afc57bbbe32a04dcfe2f12df094dd..cd4d739d961c541f82a2f6b72429ecb747a29ebc 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -91,4 +91,14 @@
         "when a user tries to pick up one of cards.\n\n"
     </string>
     <string name="action_settings">Settings</string>
+    <string name="direction">Direction</string>
+    <string name="piecededepart">Piece De Depart</string>
+    <string name="piecedarrivee">Piece d\'Arrivee</string>
+    <string name="selectionner">Selectionner</string>
+    <string name="confirmer">Confirmer</string>
+    <string name="modeconception">Mode Conception</string>
+    <string name="modeimmersion">Mode Immersion</string>
+    <string name="ajouteruneouverture">Ajouter une ouverture</string>
+    <string name="ajouterunepiece">Ajouter une piece</string>
+    <string name="textview">TextView</string>
 </resources>
\ No newline at end of file