diff --git a/.gitignore b/.gitignore
index 5095ba7..86aa253 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,3 +46,4 @@ Network Trash Folder
 Temporary Items
 .apdisk
 SimongGame/.idea/vcs.xml
+SimongGame/.idea/gradle.xml
diff --git a/SimongGame/.idea/gradle.xml b/SimongGame/.idea/gradle.xml
index fc132b2..cda1f3c 100644
--- a/SimongGame/.idea/gradle.xml
+++ b/SimongGame/.idea/gradle.xml
@@ -5,7 +5,7 @@
       <GradleProjectSettings>
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="C:\Program Files\Android\Android Studio\gradle\gradle-2.8" />
+        <option name="gradleHome" value="D:\Program files\Android\Android Studio\gradle\gradle-2.8" />
         <option name="gradleJvm" value="1.8" />
         <option name="modules">
           <set>
diff --git a/SimongGame/.idea/vcs.xml b/SimongGame/.idea/vcs.xml
index 075f87f..6c0b863 100644
--- a/SimongGame/.idea/vcs.xml
+++ b/SimongGame/.idea/vcs.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="" />
     <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/SimongGame/app/src/main/java/cyril/simonggame/activity/GameActivity.java b/SimongGame/app/src/main/java/cyril/simonggame/activity/GameActivity.java
index 50c780e..6456075 100644
--- a/SimongGame/app/src/main/java/cyril/simonggame/activity/GameActivity.java
+++ b/SimongGame/app/src/main/java/cyril/simonggame/activity/GameActivity.java
@@ -4,6 +4,7 @@
 import android.os.Bundle;
 import android.app.Activity;
 import android.view.Window;
+import android.view.WindowManager;
 
 import cyril.simonggame.view.Game_View;
 
@@ -13,8 +14,12 @@ public class GameActivity extends Activity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         requestWindowFeature(Window.FEATURE_NO_TITLE); //retire le titre (Toolbar)
+        setInfullScreen();
         game_View = new Game_View(this);
         setContentView(game_View);
     }
-
+    public void setInfullScreen(){
+        getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
+                WindowManager.LayoutParams.FLAG_FULLSCREEN);
+    }
 }
diff --git a/SimongGame/app/src/main/java/cyril/simonggame/activity/Menu_Activity.java b/SimongGame/app/src/main/java/cyril/simonggame/activity/Menu_Activity.java
index e99702f..69fd827 100644
--- a/SimongGame/app/src/main/java/cyril/simonggame/activity/Menu_Activity.java
+++ b/SimongGame/app/src/main/java/cyril/simonggame/activity/Menu_Activity.java
@@ -3,6 +3,7 @@
 import android.app.Activity;
 import android.os.Bundle;
 import android.view.Window;
+import android.view.WindowManager;
 
 import cyril.simonggame.view.Menu_view;
 
@@ -15,8 +16,13 @@ public class Menu_Activity extends Activity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         requestWindowFeature(Window.FEATURE_NO_TITLE); //retire le titre (Toolbar)
+        setInfullScreen();
         menu_view = new Menu_view(this);
         setContentView(menu_view);
     }
 
+    public void setInfullScreen(){
+        getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
+                WindowManager.LayoutParams.FLAG_FULLSCREEN);
+    }
 }
\ No newline at end of file
diff --git a/SimongGame/app/src/main/java/cyril/simonggame/activity/Setting_Activity.java b/SimongGame/app/src/main/java/cyril/simonggame/activity/Setting_Activity.java
index 827f7cb..5b80cee 100644
--- a/SimongGame/app/src/main/java/cyril/simonggame/activity/Setting_Activity.java
+++ b/SimongGame/app/src/main/java/cyril/simonggame/activity/Setting_Activity.java
@@ -3,6 +3,7 @@
 import android.app.Activity;
 import android.os.Bundle;
 import android.view.Window;
+import android.view.WindowManager;
 
 import cyril.simonggame.view.Menu_view;
 import cyril.simonggame.view.Setting_View;
@@ -16,7 +17,13 @@ public class Setting_Activity extends Activity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         requestWindowFeature(Window.FEATURE_NO_TITLE); //retire le titre (Toolbar)
+        setInfullScreen();
         setting_view = new Setting_View(this);
         setContentView(setting_view);
     }
+
+    public void setInfullScreen(){
+        getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
+                WindowManager.LayoutParams.FLAG_FULLSCREEN);
+    }
 }
diff --git a/SimongGame/app/src/main/java/cyril/simonggame/controller/Game_Controller.java b/SimongGame/app/src/main/java/cyril/simonggame/controller/Game_Controller.java
index 0f5fade..e29dee4 100644
--- a/SimongGame/app/src/main/java/cyril/simonggame/controller/Game_Controller.java
+++ b/SimongGame/app/src/main/java/cyril/simonggame/controller/Game_Controller.java
@@ -16,24 +16,9 @@ public Game_Controller(Game_View view){
         this.game_View = view;
         this.simonGame = game_View.simonGame;
     }
+
     public void onClick(View v) {
         Button currentButton = (Button)v;
-        game_View.doAnimationBounce(currentButton);
-        System.out.println(simonGame.getgameStarted());
-       if(simonGame.getgameStarted() && !simonGame.getInAnimation()){
-
-            if(currentButton == simonGame.getPattern().get(simonGame.getRound())){
-
-                simonGame.setRound(simonGame.getRound()+1);
-            }else{
-                simonGame.setGameStarted(false);
-                System.out.println("GameOver");
-            }
-
-            if(simonGame.getPattern().size() == simonGame.getRound()){
-                System.out.println("GG");
-                game_View.startGamePartternAnimation();
-            }
-        }
+        simonGame.userHadClick(currentButton);
     }
 }
diff --git a/SimongGame/app/src/main/java/cyril/simonggame/controller/Menu_Controller.java b/SimongGame/app/src/main/java/cyril/simonggame/controller/Menu_Controller.java
index 79c8d09..3f859df 100644
--- a/SimongGame/app/src/main/java/cyril/simonggame/controller/Menu_Controller.java
+++ b/SimongGame/app/src/main/java/cyril/simonggame/controller/Menu_Controller.java
@@ -25,16 +25,18 @@ public class Menu_Controller implements View.OnClickListener {
     public Menu_Controller(Menu_view view){
         this.menu_view = view;
     }
-    ActivityOptionsCompat compat = ActivityOptionsCompat.makeSceneTransitionAnimation((Activity) menu_view.getContext(), null);
+    ActivityOptionsCompat compat ;
     @Override
     public void onClick(View v) {
         switch (v.getId()){
             case R.id.btPlay :
+                compat = ActivityOptionsCompat.makeSceneTransitionAnimation((Activity) menu_view.getContext(), null);
                 Intent intent = new Intent(menu_view.getContext(), GameActivity.class);
                 intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                 menu_view.getContext().startActivity(intent,compat.toBundle());
                 break;
             case R.id.btSetting :
+                compat = ActivityOptionsCompat.makeSceneTransitionAnimation((Activity) menu_view.getContext(), null);
                 Intent intent2 = new Intent(menu_view.getContext(), Setting_Activity.class);
                 intent2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                 menu_view.getContext().startActivity(intent2,compat.toBundle());
diff --git a/SimongGame/app/src/main/java/cyril/simonggame/model/SimonGame.java b/SimongGame/app/src/main/java/cyril/simonggame/model/SimonGame.java
index 8879b7f..b59bcc6 100644
--- a/SimongGame/app/src/main/java/cyril/simonggame/model/SimonGame.java
+++ b/SimongGame/app/src/main/java/cyril/simonggame/model/SimonGame.java
@@ -23,11 +23,10 @@ public class SimonGame {
     private Game_View game_View;
     private boolean gameStarted = false;
     private boolean inAnimation = false;
-    private Handler mainHandle;
+
     private Button buttons[];
-    private boolean canPlay = false;
-    private int round;
-    private int currentTurn;
+    private int score;
+    private int tour;
     private ArrayList<Button> pattern = new ArrayList<Button>();
     public SimonGame(Game_View game_View,Button buttons[]){
         this.buttons = buttons;
@@ -36,11 +35,16 @@ public SimonGame(Game_View game_View,Button buttons[]){
     public void startGame(){
         pattern.clear();
         gameStarted = true;
-        round = 0;
-        currentTurn = 0;
+        score = 0;
+        tour = 0;
+        game_View.updateScore(0);
         game_View.startGamePartternAnimation();
     }
-
+    public void addColorToPattern(){
+        setTour(0);
+        int randnb = random(0,3);
+        pattern.add(buttons[randnb]);
+    }
     public Integer random(int min, int max){
         return min + (int)(Math.random() * ((max - min) + 1));
     }
@@ -52,11 +56,11 @@ public Button getButtonAt(int index){
         return buttons[index];
     }
 
-    public void setRound(int round){
-        this.round = round;
+    public void setTour(int tour){
+        this.tour = tour;
     }
-    public int getRound(){
-        return round;
+    public int getTour(){
+        return tour;
     }
 
 
@@ -73,4 +77,35 @@ public boolean getgameStarted(){
     public void setGameStarted(boolean gameStarted){
         this.gameStarted = gameStarted;
     }
+
+    public void scoreUp(){
+        score++;
+    }
+    public int getScore(){return score;}
+
+    public void userHadClick(Button currentButton){
+        if(gameStarted && !inAnimation){
+            game_View.doAnimationBounce(currentButton);
+            if(currentButton == pattern.get(tour)){
+                tour++;
+            }else{
+                gameOver();
+                System.out.println("GameOver");
+            }
+
+            if(pattern.size() == tour){
+                scoreUp();
+                game_View.updateScore(score);
+                System.out.println("GG");
+                inAnimation = true;
+                game_View.startGamePartternAnimation();
+            }
+        }
+    }
+    public void gameOver(){
+        gameStarted = false;
+        game_View.setTextViewFinalScore(score);
+        game_View.doGameOverAnimation();
+
+    }
 }
diff --git a/SimongGame/app/src/main/java/cyril/simonggame/view/Game_View.java b/SimongGame/app/src/main/java/cyril/simonggame/view/Game_View.java
index 9380fb6..74caf11 100644
--- a/SimongGame/app/src/main/java/cyril/simonggame/view/Game_View.java
+++ b/SimongGame/app/src/main/java/cyril/simonggame/view/Game_View.java
@@ -7,7 +7,10 @@
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
 import android.widget.Button;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
 
 import cyril.simonggame.R;
 import cyril.simonggame.controller.Game_Controller;
@@ -18,23 +21,36 @@
  */
 public class Game_View extends LinearLayout {
     public SimonGame simonGame;
-    private Button buttons[] =  new Button[4];
+    private Game_View itSelf;
+    private Button buttons[] = new Button[4];
+    private ImageView retrybutton;
+    private TextView textViewScore;
+    private TextView textViewFinalScore;
+    private LinearLayout layoutButtons;
     private Animation animFondu;
+    private Animation animApparitionFondu;
+    private Animation animDipparitionFondu;
     private Animation animRotate;
     private Animation animStartGame;
     private Animation animBounceButton;
+    private Animation animScaleToInvisible;
+    private RelativeLayout layoutGameOver;
+    private RelativeLayout layoutGameInProgress;
     final Context context;
     private Handler mainHandler = new Handler();
+
     public Game_View(Context context) {
         super(context);
+        itSelf = this;
         this.context = context;
 
         inflate();
         bindView();
         initAnimation();
 
-        simonGame = new SimonGame(this,buttons);
-        simonGame.startGame();
+        simonGame = new SimonGame(this, buttons);
+        doStartGameAnimation();
+
         initListener();
     }
 
@@ -42,59 +58,188 @@ private void inflate() {
         LayoutInflater layoutInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
         layoutInflater.inflate(R.layout.activity_game, this, true);
     }
-    private void bindView(){
-        //BindButton
-        buttons[0] = (Button)findViewById(R.id.buttonBlue);
-        buttons[1] = (Button)findViewById(R.id.buttonGreen);
-        buttons[2] = (Button)findViewById(R.id.buttonPurple);
-        buttons[3] = (Button)findViewById(R.id.buttonRed);
 
+    private void bindView() {
+        //BindButton
+        buttons[0] = (Button) findViewById(R.id.buttonBlue);
+        buttons[1] = (Button) findViewById(R.id.buttonGreen);
+        buttons[2] = (Button) findViewById(R.id.buttonPurple);
+        buttons[3] = (Button) findViewById(R.id.buttonRed);
+        textViewScore = (TextView) findViewById(R.id.textViewScoreNb);
+        textViewFinalScore = (TextView) findViewById(R.id.textViewFinalScore);
+        layoutButtons = (LinearLayout) findViewById(R.id.layoutButtons);
+        layoutGameInProgress = (RelativeLayout) findViewById(R.id.layoutGameInProgress);
+        layoutGameOver = (RelativeLayout) findViewById(R.id.layoutGameOver);
+        retrybutton = (ImageView) findViewById(R.id.retrybutton);
     }
-    public  void initAnimation(){
+
+    public void initAnimation() {
         animFondu = AnimationUtils.loadAnimation(context, R.anim.alpha);
         animStartGame = AnimationUtils.loadAnimation(context, R.anim.startgame);
+        animStartGame.setAnimationListener(new Animation.AnimationListener() {
+           @Override
+            public void onAnimationStart(Animation animation) {
+
+            }
+
+           @Override
+           public void onAnimationEnd(Animation animation) {
+               layoutGameInProgress.setVisibility(View.VISIBLE);
+               layoutButtons.setVisibility(View.VISIBLE);
+           }
+
+           @Override
+           public void onAnimationRepeat(Animation animation) {
+
+           }
+        });
         animBounceButton = AnimationUtils.loadAnimation(context, R.anim.littlebounce);
+        animApparitionFondu = AnimationUtils.loadAnimation(context, R.anim.apparitionfondu);
+        animApparitionFondu.setAnimationListener(new Animation.AnimationListener() {
+            @Override
+            public void onAnimationStart(Animation animation) {
+            }
+
+            @Override
+            public void onAnimationEnd(Animation animation) {
+                layoutGameOver.setVisibility(View.VISIBLE);
+            }
+
+            @Override
+            public void onAnimationRepeat(Animation animation) {
+
+            }
+        });
+        animDipparitionFondu = AnimationUtils.loadAnimation(context, R.anim.disparitionfondu);
+        animDipparitionFondu.setAnimationListener(new Animation.AnimationListener() {
+            @Override
+            public void onAnimationStart(Animation animation) {
+
+            }
+
+            @Override
+            public void onAnimationEnd(Animation animation) {
+                layoutGameOver.setVisibility(View.INVISIBLE);
+            }
+
+            @Override
+            public void onAnimationRepeat(Animation animation) {
+
+            }
+        });
+        animScaleToInvisible = AnimationUtils.loadAnimation(context, R.anim.scaletoinvisible);
+        animScaleToInvisible.setAnimationListener(new Animation.AnimationListener() {
+            @Override
+            public void onAnimationStart(Animation animation) {
+
+            }
+
+            @Override
+            public void onAnimationEnd(Animation animation) {
+                layoutGameInProgress.setVisibility(View.INVISIBLE);
+            }
+
+            @Override
+            public void onAnimationRepeat(Animation animation) {
+
+            }
+        });
     }
-    public void initListener(){
-        for(final Button x: buttons) {
+
+    public void initListener() {
+        for (final Button x : buttons) {
             x.setOnClickListener(new Game_Controller(this));
         }
+
+        retrybutton.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                updateScore(0);
+                layoutGameOver.startAnimation(animDipparitionFondu);
+                doStartGameAnimation();
+            }
+        });
     }
+
+
+
     public void doAnimationFondu(final Button button) {
         button.startAnimation(animFondu);
     }
-    public void doAnimationBounce(final Button button){
+
+    public void doAnimationBounce(final Button button) {
         button.startAnimation(animBounceButton);
     }
-    public void startGamePartternAnimation(){
+
+    public void startGamePartternAnimation() {
         GamePatternAnimation gamePatternAnimation = new GamePatternAnimation();
         gamePatternAnimation.start();
     }
-    public class GamePatternAnimation extends Thread{
-        public Integer random(int min, int max){
-            return min + (int)(Math.random() * ((max - min) + 1));
-        }
-        public void run(){
-            try{
-                sleep(2000);
-            }catch (InterruptedException e){
-            }
-            int randnb;
-            simonGame.setInAnimation(true);
-            simonGame.setRound(0);
-            randnb = random(0,3);
-            simonGame.getPattern().add(simonGame.getButtonAt(randnb));
-            for(final Button x: simonGame.getPattern()) {
-                doAnimInMainHandle(x);
-                try{
-                    sleep(400);
-                }catch (InterruptedException e){
+
+    public void updateScore(int score) {
+        textViewScore.setText(String.valueOf(score));
+    }
+
+
+    public void setTextViewFinalScore(int score){
+        textViewFinalScore.setText(String.valueOf(score));
+    }
+    public class StartGameAnimation extends Thread {
+        public void run() {
+            try {
+            Runnable runnable = new Runnable() {
+                @Override
+                public void run() {
+                    layoutGameInProgress.setVisibility(View.VISIBLE);
+                    layoutButtons.setVisibility(View.INVISIBLE);
+                }
+            };
+            mainHandler.post(runnable);
+
+            sleep(1000);
+
+            runnable = new Runnable() {
+                @Override
+                public void run() {
+                    layoutButtons.startAnimation(animStartGame);
+                }
+            };
+            mainHandler.post(runnable);
+
+            sleep(2000);
+
+            runnable = new Runnable() {
+                @Override
+                public void run() {
+                    simonGame.startGame();
                 }
+            };
+            mainHandler.post(runnable);
+            } catch (InterruptedException e) {
+
             }
-            simonGame.setInAnimation(false);
+        }
 
+    }
+
+    public class GamePatternAnimation extends Thread {
+        public void run() {
+            try {
+                sleep(1000);
+                simonGame.setInAnimation(true);
+                int randnb;
+                simonGame.addColorToPattern();
+                for (final Button x : simonGame.getPattern()) {
+                    doAnimInMainHandle(x);
+                    sleep(700);
+                }
+                simonGame.setInAnimation(false);
+
+            } catch (InterruptedException e) {
+            }
         }
-        public void doAnimInMainHandle(final Button button){
+
+        public void doAnimInMainHandle(final Button button) {
             Runnable runAnimation = new Runnable() {
                 @Override
                 public void run() {
@@ -104,4 +249,40 @@ public void run() {
             mainHandler.post(runAnimation);
         }
     }
+    public void doGameOverAnimation(){
+        (new GameOverAnimation()).start();
+    }
+    public void doHiddenbuttonAnimation() {
+        for (Button x : buttons) {
+            x.startAnimation(animScaleToInvisible);
+        }
+    }
+
+    public class GameOverAnimation extends Thread {
+        public void run() {
+            Runnable runAnimation = new Runnable() {
+                @Override
+                public void run() {
+                    doHiddenbuttonAnimation();
+                }
+            };
+            mainHandler.post(runAnimation);
+            try {
+                sleep(1000);
+            } catch (InterruptedException e) {
+            }
+            runAnimation = new Runnable() {
+                @Override
+                public void run() {
+                    layoutGameOver.startAnimation(animApparitionFondu);
+                }
+            };
+            mainHandler.post(runAnimation);
+        }
+    }
+
+    public void doStartGameAnimation(){
+        (new StartGameAnimation()).start();
+    }
+
 }
\ No newline at end of file
diff --git a/SimongGame/app/src/main/res/anim/alpha.xml b/SimongGame/app/src/main/res/anim/alpha.xml
index 4f48a2c..5ac91f6 100644
--- a/SimongGame/app/src/main/res/anim/alpha.xml
+++ b/SimongGame/app/src/main/res/anim/alpha.xml
@@ -3,8 +3,8 @@
     android:interpolator="@android:anim/linear_interpolator">
     <alpha
         android:fromAlpha="1.0"
-        android:toAlpha="0.5"
-        android:duration="100"
+        android:toAlpha="0.4"
+        android:duration="200"
         android:repeatCount="1"
         android:repeatMode="reverse" />
 </set>
\ No newline at end of file
diff --git a/SimongGame/app/src/main/res/anim/apparitionfondu.xml b/SimongGame/app/src/main/res/anim/apparitionfondu.xml
new file mode 100644
index 0000000..9626fe1
--- /dev/null
+++ b/SimongGame/app/src/main/res/anim/apparitionfondu.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"  android:interpolator="@android:interpolator/linear">
+    <alpha
+        android:fromAlpha="0.0"
+        android:toAlpha="1.0"
+        android:duration="1500" />
+</set>
\ No newline at end of file
diff --git a/SimongGame/app/src/main/res/anim/disparitionfondu.xml b/SimongGame/app/src/main/res/anim/disparitionfondu.xml
new file mode 100644
index 0000000..e896311
--- /dev/null
+++ b/SimongGame/app/src/main/res/anim/disparitionfondu.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"  android:interpolator="@android:interpolator/linear">
+    <alpha
+        android:fromAlpha="1.0"
+        android:toAlpha="0"
+        android:duration="1500" />
+</set>
\ No newline at end of file
diff --git a/SimongGame/app/src/main/res/anim/littlebounce.xml b/SimongGame/app/src/main/res/anim/littlebounce.xml
index 9d57d92..2fb4de5 100644
--- a/SimongGame/app/src/main/res/anim/littlebounce.xml
+++ b/SimongGame/app/src/main/res/anim/littlebounce.xml
@@ -3,9 +3,9 @@
     android:interpolator="@android:anim/anticipate_overshoot_interpolator">
     <scale
         android:fromXScale="1.0"
-        android:toXScale="0.7"
+        android:toXScale="0.9"
         android:fromYScale="1.0"
-        android:toYScale="0.7"
+        android:toYScale="0.9"
         android:pivotX="50%"
         android:pivotY="50%"
         android:duration="150"
diff --git a/SimongGame/app/src/main/res/anim/scaletoinvisible.xml b/SimongGame/app/src/main/res/anim/scaletoinvisible.xml
new file mode 100644
index 0000000..1f201e8
--- /dev/null
+++ b/SimongGame/app/src/main/res/anim/scaletoinvisible.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@android:anim/bounce_interpolator">
+    <scale
+        android:fromXScale="1.0"
+        android:toXScale="0"
+        android:fromYScale="1.0"
+        android:toYScale="0"
+        android:pivotX="50%"
+        android:pivotY="50%"
+        android:duration="500"
+        android:repeatCount="0"/>
+</set>
\ No newline at end of file
diff --git a/SimongGame/app/src/main/res/anim/startgame.xml b/SimongGame/app/src/main/res/anim/startgame.xml
index b77d05c..787f183 100644
--- a/SimongGame/app/src/main/res/anim/startgame.xml
+++ b/SimongGame/app/src/main/res/anim/startgame.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:interpolator="@android:anim/bounce_interpolator">
+    android:interpolator="@android:anim/accelerate_decelerate_interpolator">
     <alpha
         android:fromAlpha="0"
         android:toAlpha="1.0"
diff --git a/SimongGame/app/src/main/res/drawable/background.xml b/SimongGame/app/src/main/res/drawable/background.xml
new file mode 100644
index 0000000..1b9ecf4
--- /dev/null
+++ b/SimongGame/app/src/main/res/drawable/background.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+    <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
+        <gradient
+            android:type="radial"
+            android:centerX="50%"
+            android:centerY="50%"
+            android:startColor="#FFFFFFFF"
+            android:endColor="#FF8AD4FF"
+            android:gradientRadius="90%"/>
+    </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/SimongGame/app/src/main/res/drawable/bluecircle.xml b/SimongGame/app/src/main/res/drawable/bluecircle.xml
index e1f730e..8acaab9 100644
--- a/SimongGame/app/src/main/res/drawable/bluecircle.xml
+++ b/SimongGame/app/src/main/res/drawable/bluecircle.xml
@@ -4,13 +4,13 @@
         android:width="120dp"
         android:height="120dp">
         <shape android:shape="oval">
-
             <solid
-                android:color="#04a3bf"/>
+                android:color="#9fb7ff"/>
             <size
                 android:width="120dp"
                 android:height="120dp"
                 android:paddingRight="50dp"/>
+            <stroke android:width="1px" android:color="#d2d2d2"/>
         </shape>
     </item>
 </selector>
diff --git a/SimongGame/app/src/main/res/drawable/greencircle.xml b/SimongGame/app/src/main/res/drawable/greencircle.xml
index 5536d90..68998f3 100644
--- a/SimongGame/app/src/main/res/drawable/greencircle.xml
+++ b/SimongGame/app/src/main/res/drawable/greencircle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape android:shape="oval" xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="#94ef16"/>
+    <solid android:color="#d5ff9c"/>
     <size android:width="120dp" android:height="120dp" />
+    <stroke android:width="1px" android:color="#d2d2d2"/>
 </shape>
diff --git a/SimongGame/app/src/main/res/drawable/pinkcircle.xml b/SimongGame/app/src/main/res/drawable/pinkcircle.xml
index a16e759..1f2bdb3 100644
--- a/SimongGame/app/src/main/res/drawable/pinkcircle.xml
+++ b/SimongGame/app/src/main/res/drawable/pinkcircle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape android:shape="oval" xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="#c515ec"/>
+    <solid android:color="#f2b7ff"/>
     <size android:width="120dp" android:height="120dp" />
+    <stroke android:width="1px" android:color="#d2d2d2"/>
 </shape>
diff --git a/SimongGame/app/src/main/res/drawable/redcircle.xml b/SimongGame/app/src/main/res/drawable/redcircle.xml
index 23492d0..ed834a6 100644
--- a/SimongGame/app/src/main/res/drawable/redcircle.xml
+++ b/SimongGame/app/src/main/res/drawable/redcircle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape android:shape="oval" xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="#d61117"/>
+    <solid android:color="#ffa5a8"/>
     <size android:width="120dp" android:height="120dp" />
+    <stroke android:width="1px" android:color="#d2d2d2"/>
 </shape>
diff --git a/SimongGame/app/src/main/res/drawable/retrybutton.png b/SimongGame/app/src/main/res/drawable/retrybutton.png
new file mode 100644
index 0000000..cbcdb8a
Binary files /dev/null and b/SimongGame/app/src/main/res/drawable/retrybutton.png differ
diff --git a/SimongGame/app/src/main/res/layout/activity_game.xml b/SimongGame/app/src/main/res/layout/activity_game.xml
index 0f07c1b..a57a698 100644
--- a/SimongGame/app/src/main/res/layout/activity_game.xml
+++ b/SimongGame/app/src/main/res/layout/activity_game.xml
@@ -2,61 +2,142 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#000000"
+    android:background="@drawable/background"
     android:weightSum="1">
-
     <RelativeLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignWithParentIfMissing="false"
-        android:layout_centerVertical="true"
-        android:layout_centerHorizontal="true">
-
-        <LinearLayout
-            android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/layoutGameInProgress"
+        >
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Score : "
+            android:id="@+id/textViewScore"
+            android:textColor="#ffffff"
+            android:textIsSelectable="true"
+            android:textSize="30dp"
+            android:layout_alignParentTop="true"
+            android:layout_alignParentStart="true"
+            android:paddingLeft="5dp" />
+
+        <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true">
+            android:id="@+id/textViewScoreNb"
+            android:layout_alignBottom="@+id/textViewScore"
+            android:layout_toEndOf="@+id/textViewScore"
+            android:textSize="30dp"
+            android:textColor="#ffffff" />
+
+        <RelativeLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignWithParentIfMissing="false"
+            android:layout_centerVertical="true"
+            android:layout_centerHorizontal="true"
+            android:text=" "
+            android:id="@+id/relativeLayout">
 
             <LinearLayout
-                android:orientation="horizontal"
+                android:orientation="vertical"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content">
-                <Button
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:id="@+id/buttonPurple"
-                    android:background="@drawable/pinkcircle"
-                    android:layout_marginRight="10dp"
-                    android:layout_marginBottom="10dp"/>
-                <Button
+                android:layout_height="wrap_content"
+                android:id="@+id/layoutButtons">
+
+                <LinearLayout
+                    android:orientation="horizontal"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:id="@+id/buttonRed"
-                    android:background="@drawable/redcircle"/>
-            </LinearLayout>
+                    android:layout_height="wrap_content">
+                    <Button
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:id="@+id/buttonPurple"
+                        android:background="@drawable/pinkcircle"
+                        android:layout_marginRight="50dp"
+                        android:layout_marginBottom="50dp"
+                        style="?android:attr/borderlessButtonStyle"/>
+                    <Button
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:id="@+id/buttonRed"
+                        android:background="@drawable/redcircle"
+                        style="?android:attr/borderlessButtonStyle"/>
+                </LinearLayout>
 
-            <LinearLayout
-                android:orientation="horizontal"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                <LinearLayout
+                    android:orientation="horizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
 
-                <Button
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:id="@+id/buttonGreen"
-                    android:background="@drawable/greencircle"
-                    android:layout_marginRight="10dp"
-                    android:layout_marginBottom="10dp"/>
+                    <Button
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:id="@+id/buttonGreen"
+                        android:background="@drawable/greencircle"
+                        android:layout_marginRight="50dp"
+                        style="?android:attr/borderlessButtonStyle"/>
 
-                <Button
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:id="@+id/buttonBlue"
-                    android:background="@drawable/bluecircle"/>
+                    <Button
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:id="@+id/buttonBlue"
+                        android:background="@drawable/bluecircle"
+                        style="?android:attr/borderlessButtonStyle"/>
+                </LinearLayout>
             </LinearLayout>
-        </LinearLayout>
+
+        </RelativeLayout>
+    </RelativeLayout>
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/layoutGameOver"
+        android:visibility="invisible">
+
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="GAME OVER"
+            android:id="@+id/textView2"
+            android:layout_centerVertical="true"
+            android:layout_centerHorizontal="true"
+            android:textSize="50dp"
+            android:typeface="monospace"
+            android:textStyle="bold|italic" />
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/retrybutton"
+            android:src="@drawable/retrybutton"
+            android:layout_below="@+id/textView2"
+            android:layout_centerHorizontal="true" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="SCORE"
+            android:id="@+id/textView3"
+            android:textColor="#000000"
+            android:textSize="40dp"
+            android:textStyle="bold|italic"
+            android:typeface="monospace"
+            android:layout_alignParentTop="true"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="48dp" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="0"
+            android:id="@+id/textViewFinalScore"
+            android:textSize="50dp"
+            android:layout_marginTop="44dp"
+            android:layout_below="@+id/textView3"
+            android:layout_centerHorizontal="true" />
 
     </RelativeLayout>
 
-    </RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
\ No newline at end of file