diff --git a/app/build.gradle b/app/build.gradle
new file mode 100644
index 0000000..2630501
--- /dev/null
+++ b/app/build.gradle
@@ -0,0 +1,31 @@
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 25
+    buildToolsVersion "25.0.1"
+    defaultConfig {
+        applicationId "com.example.yink.amadeus"
+        minSdkVersion 21
+        targetSdkVersion 25
+        versionCode 1
+        versionName "1.0"
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+    productFlavors {
+    }
+}
+
+dependencies {
+    compile fileTree(include: ['*.jar'], dir: 'libs')
+    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+        exclude group: 'com.android.support', module: 'support-annotations'
+    })
+    compile 'com.android.support:appcompat-v7:25.2.0'
+    testCompile 'junit:junit:4.12'
+}
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
new file mode 100644
index 0000000..5c040a1
--- /dev/null
+++ b/app/proguard-rules.pro
@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in C:\Users\yinku\AppData\Local\Android\Sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 42ca585..409f885 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -15,7 +15,9 @@
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
         </activity>
-        <activity android:name=".LaunchActivity">
+        <activity
+            android:name=".LaunchActivity"
+            android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/app/src/main/java/com/example/yink/amadeus/LaunchActivity.java b/app/src/main/java/com/example/yink/amadeus/LaunchActivity.java
index 791c0bb..8eda5a6 100644
--- a/app/src/main/java/com/example/yink/amadeus/LaunchActivity.java
+++ b/app/src/main/java/com/example/yink/amadeus/LaunchActivity.java
@@ -1,33 +1,53 @@
 package com.example.yink.amadeus;
 
 import android.content.Intent;
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.widget.ImageView;
 
 public class LaunchActivity extends AppCompatActivity {
-    ImageView connect;
+    ImageView connect, cancel;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+
         super.onCreate(savedInstanceState);
+
         setContentView(R.layout.activity_launch);
         connect = (ImageView) findViewById(R.id.imageView_connect);
+        cancel = (ImageView) findViewById(R.id.imageView_cancel);
+
         connect.setImageResource(R.drawable.connect_unselect);
+        cancel.setImageResource(R.drawable.cancel_unselect);
+
         connect.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
                 connect.setImageResource(R.drawable.connect_select);
+
                 Intent intent = new Intent(LaunchActivity.this,MainActivity.class);
                 startActivity(intent);
             }
         });
+
+        cancel.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                cancel.setImageResource(R.drawable.cancel_select);
+
+                Intent intent = new Intent(Intent.ACTION_MAIN);
+                intent.addCategory(Intent.CATEGORY_HOME);
+                intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                startActivity(intent);
+            }
+        });
     }
 
     @Override
     protected void onResume(){
         connect.setImageResource(R.drawable.connect_unselect);
+        cancel.setImageResource(R.drawable.cancel_unselect);
         super.onResume();
     }
 }
diff --git a/app/src/main/java/com/example/yink/amadeus/MainActivity.java b/app/src/main/java/com/example/yink/amadeus/MainActivity.java
index 53247d5..5465ba7 100644
--- a/app/src/main/java/com/example/yink/amadeus/MainActivity.java
+++ b/app/src/main/java/com/example/yink/amadeus/MainActivity.java
@@ -4,55 +4,41 @@ package com.example.yink.amadeus;
  * Big thanks to https://github.com/RIP95 aka Emojikage
  */
 
+import android.Manifest;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.graphics.drawable.AnimationDrawable;
 import android.media.MediaPlayer;
+import android.os.Bundle;
 import android.os.Handler;
-import android.os.SystemClock;
 import android.speech.RecognitionListener;
 import android.speech.RecognizerIntent;
 import android.speech.SpeechRecognizer;
+import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AppCompatActivity;
-import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
+
 import java.util.ArrayList;
-import java.util.Locale;
+import java.util.Arrays;
+import java.util.List;
 import java.util.Random;
 
 
 public class MainActivity extends AppCompatActivity {
     final String TAG = "Amadeus";
-    MediaPlayer mediaPlayer;
     ImageView kurisu;
     AnimationDrawable animation;
     Handler handler;
     Boolean looping = false;
-
-    private SpeechRecognizer sr;
-    protected static final int REQ_CODE_SPEECH_INPUT = 1;
-
-    private final int eyes_closed = 0;
-    private final int normal = 1;
-    private final int sad = 2;
-    private final int indifferent = 3;
-    private final int wink = 4;
-    private final int pissed = 5;
-    private final int annoyed = 6;
-    private final int disappointed = 7;
-    private final int happy = 8;
-    private final int angry = 9;
-    private final int blush = 10;
-    private final int side = 11;
-
     ArrayList<VoiceLine> voiceLines = new ArrayList<>();
-
+    private SpeechRecognizer sr;
 
     @Override
     public void onWindowFocusChanged(boolean hasFocus){
         if(hasFocus){
-            speak(new VoiceLine(R.raw.hello,happy));
+            speak(new VoiceLine(R.raw.hello, Mood.HAPPY));
         }
 
     }
@@ -64,8 +50,6 @@ public class MainActivity extends AppCompatActivity {
         kurisu = (ImageView) findViewById(R.id.imageView_kurisu);
         handler = new Handler();
         setupLines();
-        kurisu.setImageResource(R.drawable.kurisu_1);
-        animation = (AnimationDrawable) kurisu.getDrawable();
 
         sr = SpeechRecognizer.createSpeechRecognizer(this);
         sr.setRecognitionListener(new listener());
@@ -73,15 +57,26 @@ public class MainActivity extends AppCompatActivity {
         final Runnable loop = new Runnable() {
             @Override
             public void run() {
+                if (looping) {
                 Random randomgen = new Random();
                 speak(voiceLines.get(randomgen.nextInt(voiceLines.size())));
-                handler.postDelayed(this,5000+randomgen.nextInt(5)*1000);
+                    handler.postDelayed(this, 5000 + randomgen.nextInt(5) * 1000);
+                }
             }
         };
         kurisu.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                promptSpeechInput();
+                MainActivity host = (MainActivity) view.getContext();
+
+                int permissionCheck = ContextCompat.checkSelfPermission(host,
+                        Manifest.permission.RECORD_AUDIO);
+
+                if (permissionCheck == PackageManager.PERMISSION_GRANTED) {
+                    promptSpeechInput();
+                } else {
+                    speak(new VoiceLine(R.raw.daga_kotowaru, Mood.PISSED));
+                }
 
             }});
 
@@ -100,115 +95,26 @@ public class MainActivity extends AppCompatActivity {
         });
     }
 
-
-    public void speak(VoiceLine line){
-
-        switch (line.getState()){
-            case eyes_closed:
-                kurisu.setImageResource(R.drawable.kurisu_1);
-                break;
-            case normal:
-                kurisu.setImageResource(R.drawable.kurisu_2);
-                break;
-            case sad:
-                kurisu.setImageResource(R.drawable.kurisu_3);
-                break;
-            case indifferent:
-                kurisu.setImageResource(R.drawable.kurisu_4);
-                break;
-            case wink:
-                kurisu.setImageResource(R.drawable.kurisu_5);
-                break;
-            case pissed:
-                kurisu.setImageResource(R.drawable.kurisu_6);
-                break;
-            case annoyed:
-                kurisu.setImageResource(R.drawable.kurisu_7);
-                break;
-            case disappointed:
-                kurisu.setImageResource(R.drawable.kurisu_8);
-                break;
-            case happy:
-                kurisu.setImageResource(R.drawable.kurisu_9);
-                break;
-            case angry:
-                kurisu.setImageResource(R.drawable.kurisu_10);
-                break;
-            case blush:
-                kurisu.setImageResource(R.drawable.kurisu_11);
-                break;
-            case side:
-                kurisu.setImageResource(R.drawable.kurisu_12);
-                break;
-            default:kurisu.setImageResource(R.drawable.kurisu_2);
-
-        }
-        animation = (AnimationDrawable) kurisu.getDrawable();
-        mediaPlayer = mediaPlayer.create(this,line.getId());
-        mediaPlayer.setOnCompletionListener(new MediaPlayer.OnCompletionListener() {
-            @Override
-            public void onCompletion(MediaPlayer mediaPlayer) {
-                animation.stop();
-                kurisu.setImageDrawable(animation.getFrame(0));
-                mediaPlayer.release();
-            }
-        });
-        mediaPlayer.setOnPreparedListener(new MediaPlayer.OnPreparedListener() {
-            @Override
-            public void onPrepared(MediaPlayer mediaPlayer) {
-                runOnUiThread(new Runnable() {
-                    @Override
-                    public void run() {
-                        animation.start();
-                    }
-                });
-            }
-        });
-        mediaPlayer.start();
-        animation.start();
-    }
-
-    private void answerSpeech(String request){
-        Log.e(TAG,request);
-        if (request.equals("ハロー")) {
-            speak(new VoiceLine(R.raw.hello,happy));
-        }else if (request.equals("ナイスボディ")) {
-            speak(new VoiceLine(R.raw.devilish_pervert,angry));
-        }else if (request.equals("クリスティーナ")) {
-            speak(new VoiceLine(R.raw.this_guy_hopeless,disappointed));
-        }
-    }
-
     @Override
     protected void onDestroy(){
         if(sr!=null)
             sr.destroy();
+        looping = false;
         super.onDestroy();
     }
 
     @Override
     protected void onStop(){
-        mediaPlayer.release();
-        mediaPlayer = null;
+        looping = false;
         super.onStop();
     }
 
     @Override
     protected void onPause(){
+        looping = false;
         super.onPause();
     }
 
-    private void setupLines(){
-        voiceLines.add(new VoiceLine(R.raw.daga_kotowaru,annoyed));
-        voiceLines.add(new VoiceLine(R.raw.devilish_pervert,angry));
-        voiceLines.add(new VoiceLine(R.raw.i_guess,indifferent));
-        voiceLines.add(new VoiceLine(R.raw.nice,wink));
-        voiceLines.add(new VoiceLine(R.raw.pervert_confirmed,pissed));
-        voiceLines.add(new VoiceLine(R.raw.sorry,sad));
-        voiceLines.add(new VoiceLine(R.raw.sounds_tough,side));
-        voiceLines.add(new VoiceLine(R.raw.this_guy_hopeless,disappointed));
-    }
-
     private void promptSpeechInput() {
         Intent intent = new Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH);
         intent.putExtra(RecognizerIntent.EXTRA_LANGUAGE_MODEL,
@@ -220,6 +126,103 @@ public class MainActivity extends AppCompatActivity {
         sr.startListening(intent);
     }
 
+    public void speak(VoiceLine line) {
+        try {
+            MediaPlayer m = MediaPlayer.create(getApplicationContext(), line.getId());
+
+            kurisu.setImageResource(line.getMood());
+
+            animation = (AnimationDrawable) kurisu.getDrawable();
+
+            if (m.isPlaying()) {
+                m.stop();
+                m.release();
+                m = new MediaPlayer();
+            }
+
+            m.setOnPreparedListener(new MediaPlayer.OnPreparedListener() {
+                @Override
+                public void onPrepared(MediaPlayer mp) {
+                    runOnUiThread(new Runnable() {
+                        @Override
+                        public void run() {
+                            animation.start();
+                        }
+                    });
+                }
+            });
+
+            m.setOnCompletionListener(new MediaPlayer.OnCompletionListener() {
+                @Override
+                public void onCompletion(MediaPlayer mp) {
+                    mp.release();
+
+                    runOnUiThread(new Runnable() {
+                        @Override
+                        public void run() {
+                            animation.stop();
+                            kurisu.setImageDrawable(animation.getFrame(0));
+                        }
+                    });
+                }
+            });
+
+            m.start();
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    private void answerSpeech(String request) {
+        String[] greetingArr = new String[]{"ハロー", "おはよう", "こんにちは", "こんばんは"};
+        List<String> greeting = Arrays.asList(greetingArr);
+        Log.e(TAG, request);
+        if (greeting.contains(request)) {
+            speak(new VoiceLine(R.raw.hello, Mood.HAPPY));
+        } else if (request.equals("ナイスボディ")) {
+            speak(new VoiceLine(R.raw.devilish_pervert, Mood.ANGRY));
+        } else if (request.contains("クリスティーナ")) {
+            speak(new VoiceLine(R.raw.this_guy_hopeless, Mood.DISAPPOINTED));
+        }
+    }
+
+    private void setupLines() {
+        voiceLines.add(new VoiceLine(R.raw.daga_kotowaru, Mood.ANNOYED));
+        voiceLines.add(new VoiceLine(R.raw.devilish_pervert, Mood.ANGRY));
+        voiceLines.add(new VoiceLine(R.raw.i_guess, Mood.INDIFFERENT));
+        voiceLines.add(new VoiceLine(R.raw.nice, Mood.WINKING));
+        voiceLines.add(new VoiceLine(R.raw.pervert_confirmed, Mood.PISSED));
+        voiceLines.add(new VoiceLine(R.raw.sorry, Mood.SAD));
+        voiceLines.add(new VoiceLine(R.raw.sounds_tough, Mood.SIDE));
+        voiceLines.add(new VoiceLine(R.raw.this_guy_hopeless, Mood.DISAPPOINTED));
+    }
+
+    public void onPartialResults(Bundle partialResults) {
+        Log.d(TAG, "onPartialResults");
+    }
+
+    public void onEvent(int eventType, Bundle params) {
+        Log.d(TAG, "onEvent " + eventType);
+    }
+
+    private class Mood {
+        public static final int HAPPY = R.drawable.kurisu_9;
+        public static final int PISSED = R.drawable.kurisu_6;
+        public static final int ANNOYED = R.drawable.kurisu_7;
+        public static final int ANGRY = R.drawable.kurisu_10;
+        public static final int BLUSH = R.drawable.kurisu_11;
+        public static final int SIDE = R.drawable.kurisu_12;
+        public static final int SAD = R.drawable.kurisu_3;
+        public static final int NORMAL = R.drawable.kurisu_2;
+        public static final int SLEEPY = R.drawable.kurisu_1;
+        public static final int WINKING = R.drawable.kurisu_5;
+        public static final int DISAPPOINTED = R.drawable.kurisu_8;
+        public static final int INDIFFERENT = R.drawable.kurisu_4;
+        public static final int SIDED_PLEASANT = R.drawable.kurisu_15;
+        public static final int SIDED_WORRIED = R.drawable.kurisu_17;
+    }
+
     public class listener implements RecognitionListener {
         final String TAG = "Amadeus.listener";
 
diff --git a/app/src/main/java/com/example/yink/amadeus/voiceLine.java b/app/src/main/java/com/example/yink/amadeus/voiceLine.java
index deccbe6..3b00854 100644
--- a/app/src/main/java/com/example/yink/amadeus/voiceLine.java
+++ b/app/src/main/java/com/example/yink/amadeus/voiceLine.java
@@ -5,18 +5,19 @@ package com.example.yink.amadeus;
  */
 
 public class VoiceLine {
+    final private int id;
+    final private int mood;
+
+    public VoiceLine(int id, int mood) {
+        this.id = id;
+        this.mood = mood;
+    }
+
     public int getId(){
         return id;
     }
-    public int getState() {
-        return state;
-    }
 
-    final private int id;
-    final private int state;
-
-    public VoiceLine(int id, int state){
-        this.id = id;
-        this.state = state;
+    public int getMood() {
+        return mood;
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable-hdpi/amadeus_icon.png b/app/src/main/res/drawable-hdpi/amadeus_icon.png
new file mode 100644
index 0000000..d4e58ed
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/amadeus_icon.png differ
diff --git a/app/src/main/res/drawable-hdpi/amadeus_icon_smaller.png b/app/src/main/res/drawable-hdpi/amadeus_icon_smaller.png
new file mode 100644
index 0000000..dabcd67
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/amadeus_icon_smaller.png differ
diff --git a/app/src/main/res/drawable-hdpi/cancel_select.png b/app/src/main/res/drawable-hdpi/cancel_select.png
new file mode 100644
index 0000000..d75d4df
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/cancel_select.png differ
diff --git a/app/src/main/res/drawable-hdpi/cancel_unselect.png b/app/src/main/res/drawable-hdpi/cancel_unselect.png
new file mode 100644
index 0000000..8a88f27
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/cancel_unselect.png differ
diff --git a/app/src/main/res/drawable-hdpi/connect_select.png b/app/src/main/res/drawable-hdpi/connect_select.png
new file mode 100644
index 0000000..42ddf4b
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/connect_select.png differ
diff --git a/app/src/main/res/drawable-hdpi/connect_unselect.png b/app/src/main/res/drawable-hdpi/connect_unselect.png
new file mode 100644
index 0000000..874761a
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/connect_unselect.png differ
diff --git a/app/src/main/res/drawable-hdpi/kurisu10a.png b/app/src/main/res/drawable-hdpi/kurisu10a.png
index 26c50cf..a84d6be 100644
Binary files a/app/src/main/res/drawable-hdpi/kurisu10a.png and b/app/src/main/res/drawable-hdpi/kurisu10a.png differ
diff --git a/app/src/main/res/drawable-hdpi/kurisu10b.png b/app/src/main/res/drawable-hdpi/kurisu10b.png
index 996d198..8e327d3 100644
Binary files a/app/src/main/res/drawable-hdpi/kurisu10b.png and b/app/src/main/res/drawable-hdpi/kurisu10b.png differ
diff --git a/app/src/main/res/drawable-hdpi/kurisu10c.png b/app/src/main/res/drawable-hdpi/kurisu10c.png
index 1c7b02d..a742f24 100644
Binary files a/app/src/main/res/drawable-hdpi/kurisu10c.png and b/app/src/main/res/drawable-hdpi/kurisu10c.png differ
diff --git a/app/src/main/res/drawable-hdpi/kurisu11a.png b/app/src/main/res/drawable-hdpi/kurisu11a.png
index 44ecd12..5fe6606 100644
Binary files a/app/src/main/res/drawable-hdpi/kurisu11a.png and b/app/src/main/res/drawable-hdpi/kurisu11a.png differ
diff --git a/app/src/main/res/drawable-hdpi/kurisu11b.png b/app/src/main/res/drawable-hdpi/kurisu11b.png
index 8e01b26..602656c 100644
Binary files a/app/src/main/res/drawable-hdpi/kurisu11b.png and b/app/src/main/res/drawable-hdpi/kurisu11b.png differ
diff --git a/app/src/main/res/drawable-hdpi/kurisu11c.png b/app/src/main/res/drawable-hdpi/kurisu11c.png
index 66da792..134ecd8 100644
Binary files a/app/src/main/res/drawable-hdpi/kurisu11c.png and b/app/src/main/res/drawable-hdpi/kurisu11c.png differ
diff --git a/app/src/main/res/drawable-hdpi/kurisu12a.png b/app/src/main/res/drawable-hdpi/kurisu12a.png
index f509130..54f03c5 100644
Binary files a/app/src/main/res/drawable-hdpi/kurisu12a.png and b/app/src/main/res/drawable-hdpi/kurisu12a.png differ
diff --git a/app/src/main/res/drawable-hdpi/kurisu12b.png b/app/src/main/res/drawable-hdpi/kurisu12b.png
index 48e1b9b..55689cd 100644
Binary files a/app/src/main/res/drawable-hdpi/kurisu12b.png and b/app/src/main/res/drawable-hdpi/kurisu12b.png differ
diff --git a/app/src/main/res/drawable-hdpi/kurisu12c.png b/app/src/main/res/drawable-hdpi/kurisu12c.png
index 9219668..b7df75f 100644
Binary files a/app/src/main/res/drawable-hdpi/kurisu12c.png and b/app/src/main/res/drawable-hdpi/kurisu12c.png differ
diff --git a/app/src/main/res/drawable-hdpi/kurisu13a.png b/app/src/main/res/drawable-hdpi/kurisu13a.png
index b67eaab..1b61429 100644
Binary files a/app/src/main/res/drawable-hdpi/kurisu13a.png and b/app/src/main/res/drawable-hdpi/kurisu13a.png differ
diff --git a/app/src/main/res/drawable-hdpi/kurisu13b.png b/app/src/main/res/drawable-hdpi/kurisu13b.png
index 830f41e..cf72596 100644
Binary files a/app/src/main/res/drawable-hdpi/kurisu13b.png and b/app/src/main/res/drawable-hdpi/kurisu13b.png differ
diff --git a/app/src/main/res/drawable-hdpi/kurisu13c.png b/app/src/main/res/drawable-hdpi/kurisu13c.png
index 61302ed..196cd64 100644
Binary files a/app/src/main/res/drawable-hdpi/kurisu13c.png and b/app/src/main/res/drawable-hdpi/kurisu13c.png differ
diff --git a/app/src/main/res/drawable-hdpi/kurisu14a.png b/app/src/main/res/drawable-hdpi/kurisu14a.png
index 54136dd..b451e20 100644
Binary files a/app/src/main/res/drawable-hdpi/kurisu14a.png and b/app/src/main/res/drawable-hdpi/kurisu14a.png differ
diff --git a/app/src/main/res/drawable-hdpi/kurisu14b.png b/app/src/main/res/drawable-hdpi/kurisu14b.png
index 55f2658..a86daf4 100644
Binary files a/app/src/main/res/drawable-hdpi/kurisu14b.png and b/app/src/main/res/drawable-hdpi/kurisu14b.png differ
diff --git a/app/src/main/res/drawable-hdpi/kurisu14c.png b/app/src/main/res/drawable-hdpi/kurisu14c.png
index 7e9347a..ecbd52f 100644
Binary files a/app/src/main/res/drawable-hdpi/kurisu14c.png and b/app/src/main/res/drawable-hdpi/kurisu14c.png differ
diff --git a/app/src/main/res/drawable-hdpi/kurisu15a.png b/app/src/main/res/drawable-hdpi/kurisu15a.png
index 212a48e..cd741c3 100644
Binary files a/app/src/main/res/drawable-hdpi/kurisu15a.png and b/app/src/main/res/drawable-hdpi/kurisu15a.png differ
diff --git a/app/src/main/res/drawable-hdpi/kurisu15b.png b/app/src/main/res/drawable-hdpi/kurisu15b.png
index e7d4d5b..a08b4ce 100644
Binary files a/app/src/main/res/drawable-hdpi/kurisu15b.png and b/app/src/main/res/drawable-hdpi/kurisu15b.png differ
diff --git a/app/src/main/res/drawable-hdpi/kurisu15c.png b/app/src/main/res/drawable-hdpi/kurisu15c.png
index 75300c0..3c7fd4a 100644
Binary files a/app/src/main/res/drawable-hdpi/kurisu15c.png and b/app/src/main/res/drawable-hdpi/kurisu15c.png differ
diff --git a/app/src/main/res/drawable-hdpi/kurisu16a.png b/app/src/main/res/drawable-hdpi/kurisu16a.png
index 45c54a4..7d4f499 100644
Binary files a/app/src/main/res/drawable-hdpi/kurisu16a.png and b/app/src/main/res/drawable-hdpi/kurisu16a.png differ
diff --git a/app/src/main/res/drawable-hdpi/kurisu16b.png b/app/src/main/res/drawable-hdpi/kurisu16b.png
index 321e804..98d9418 100644
Binary files a/app/src/main/res/drawable-hdpi/kurisu16b.png and b/app/src/main/res/drawable-hdpi/kurisu16b.png differ
diff --git a/app/src/main/res/drawable-hdpi/kurisu16c.png b/app/src/main/res/drawable-hdpi/kurisu16c.png
index 435e641..1bb5810 100644
Binary files a/app/src/main/res/drawable-hdpi/kurisu16c.png and b/app/src/main/res/drawable-hdpi/kurisu16c.png differ
diff --git a/app/src/main/res/drawable-hdpi/kurisu17a.png b/app/src/main/res/drawable-hdpi/kurisu17a.png
index 8982a4a..3eea360 100644
Binary files a/app/src/main/res/drawable-hdpi/kurisu17a.png and b/app/src/main/res/drawable-hdpi/kurisu17a.png differ
diff --git a/app/src/main/res/drawable-hdpi/kurisu17b.png b/app/src/main/res/drawable-hdpi/kurisu17b.png
index e5cc6e4..ebc0ff2 100644
Binary files a/app/src/main/res/drawable-hdpi/kurisu17b.png and b/app/src/main/res/drawable-hdpi/kurisu17b.png differ
diff --git a/app/src/main/res/drawable-hdpi/kurisu17c.png b/app/src/main/res/drawable-hdpi/kurisu17c.png
index 32faec7..813f94c 100644
Binary files a/app/src/main/res/drawable-hdpi/kurisu17c.png and b/app/src/main/res/drawable-hdpi/kurisu17c.png differ
diff --git a/app/src/main/res/drawable-hdpi/kurisu18a.png b/app/src/main/res/drawable-hdpi/kurisu18a.png
index f5f8824..b7f8a97 100644
Binary files a/app/src/main/res/drawable-hdpi/kurisu18a.png and b/app/src/main/res/drawable-hdpi/kurisu18a.png differ
diff --git a/app/src/main/res/drawable-hdpi/kurisu18b.png b/app/src/main/res/drawable-hdpi/kurisu18b.png
index 3089121..2d5742d 100644
Binary files a/app/src/main/res/drawable-hdpi/kurisu18b.png and b/app/src/main/res/drawable-hdpi/kurisu18b.png differ
diff --git a/app/src/main/res/drawable-hdpi/kurisu18c.png b/app/src/main/res/drawable-hdpi/kurisu18c.png
index 7f7d451..229afc3 100644
Binary files a/app/src/main/res/drawable-hdpi/kurisu18c.png and b/app/src/main/res/drawable-hdpi/kurisu18c.png differ
diff --git a/app/src/main/res/drawable-hdpi/kurisu19a.png b/app/src/main/res/drawable-hdpi/kurisu19a.png
index 9fe3d7a..dda9372 100644
Binary files a/app/src/main/res/drawable-hdpi/kurisu19a.png and b/app/src/main/res/drawable-hdpi/kurisu19a.png differ
diff --git a/app/src/main/res/drawable-hdpi/kurisu19b.png b/app/src/main/res/drawable-hdpi/kurisu19b.png
index 550e12c..550a7e9 100644
Binary files a/app/src/main/res/drawable-hdpi/kurisu19b.png and b/app/src/main/res/drawable-hdpi/kurisu19b.png differ
diff --git a/app/src/main/res/drawable-hdpi/kurisu19c.png b/app/src/main/res/drawable-hdpi/kurisu19c.png
index bead664..7b63906 100644
Binary files a/app/src/main/res/drawable-hdpi/kurisu19c.png and b/app/src/main/res/drawable-hdpi/kurisu19c.png differ
diff --git a/app/src/main/res/drawable-hdpi/kurisu1a.png b/app/src/main/res/drawable-hdpi/kurisu1a.png
index 05cf0be..d0f9bca 100644
Binary files a/app/src/main/res/drawable-hdpi/kurisu1a.png and b/app/src/main/res/drawable-hdpi/kurisu1a.png differ
diff --git a/app/src/main/res/drawable-hdpi/kurisu1b.png b/app/src/main/res/drawable-hdpi/kurisu1b.png
index 79bfaa1..9c2fe33 100644
Binary files a/app/src/main/res/drawable-hdpi/kurisu1b.png and b/app/src/main/res/drawable-hdpi/kurisu1b.png differ
diff --git a/app/src/main/res/drawable-hdpi/kurisu1c.png b/app/src/main/res/drawable-hdpi/kurisu1c.png
index 8fd3d96..6734544 100644
Binary files a/app/src/main/res/drawable-hdpi/kurisu1c.png and b/app/src/main/res/drawable-hdpi/kurisu1c.png differ
diff --git a/app/src/main/res/drawable-hdpi/kurisu2a.png b/app/src/main/res/drawable-hdpi/kurisu2a.png
index 07882fa..8e01590 100644
Binary files a/app/src/main/res/drawable-hdpi/kurisu2a.png and b/app/src/main/res/drawable-hdpi/kurisu2a.png differ
diff --git a/app/src/main/res/drawable-hdpi/kurisu2b.png b/app/src/main/res/drawable-hdpi/kurisu2b.png
index 6566286..dca78a0 100644
Binary files a/app/src/main/res/drawable-hdpi/kurisu2b.png and b/app/src/main/res/drawable-hdpi/kurisu2b.png differ
diff --git a/app/src/main/res/drawable-hdpi/kurisu2c.png b/app/src/main/res/drawable-hdpi/kurisu2c.png
index 2892f95..68dd4ee 100644
Binary files a/app/src/main/res/drawable-hdpi/kurisu2c.png and b/app/src/main/res/drawable-hdpi/kurisu2c.png differ
diff --git a/app/src/main/res/drawable-hdpi/kurisu3a.png b/app/src/main/res/drawable-hdpi/kurisu3a.png
index 2ee85b7..532db4e 100644
Binary files a/app/src/main/res/drawable-hdpi/kurisu3a.png and b/app/src/main/res/drawable-hdpi/kurisu3a.png differ
diff --git a/app/src/main/res/drawable-hdpi/kurisu3b.png b/app/src/main/res/drawable-hdpi/kurisu3b.png
index f7f2f15..0320bc6 100644
Binary files a/app/src/main/res/drawable-hdpi/kurisu3b.png and b/app/src/main/res/drawable-hdpi/kurisu3b.png differ
diff --git a/app/src/main/res/drawable-hdpi/kurisu3c.png b/app/src/main/res/drawable-hdpi/kurisu3c.png
index 33bdb75..f0be2f4 100644
Binary files a/app/src/main/res/drawable-hdpi/kurisu3c.png and b/app/src/main/res/drawable-hdpi/kurisu3c.png differ
diff --git a/app/src/main/res/drawable-hdpi/kurisu4a.png b/app/src/main/res/drawable-hdpi/kurisu4a.png
index 2d1f5fc..3c6cc8c 100644
Binary files a/app/src/main/res/drawable-hdpi/kurisu4a.png and b/app/src/main/res/drawable-hdpi/kurisu4a.png differ
diff --git a/app/src/main/res/drawable-hdpi/kurisu4b.png b/app/src/main/res/drawable-hdpi/kurisu4b.png
index a6a05f0..0463ae7 100644
Binary files a/app/src/main/res/drawable-hdpi/kurisu4b.png and b/app/src/main/res/drawable-hdpi/kurisu4b.png differ
diff --git a/app/src/main/res/drawable-hdpi/kurisu4c.png b/app/src/main/res/drawable-hdpi/kurisu4c.png
index 3db154f..8825963 100644
Binary files a/app/src/main/res/drawable-hdpi/kurisu4c.png and b/app/src/main/res/drawable-hdpi/kurisu4c.png differ
diff --git a/app/src/main/res/drawable-hdpi/kurisu5a.png b/app/src/main/res/drawable-hdpi/kurisu5a.png
index 2f3ddd3..c45018f 100644
Binary files a/app/src/main/res/drawable-hdpi/kurisu5a.png and b/app/src/main/res/drawable-hdpi/kurisu5a.png differ
diff --git a/app/src/main/res/drawable-hdpi/kurisu5b.png b/app/src/main/res/drawable-hdpi/kurisu5b.png
index c64cde5..4c9ce1b 100644
Binary files a/app/src/main/res/drawable-hdpi/kurisu5b.png and b/app/src/main/res/drawable-hdpi/kurisu5b.png differ
diff --git a/app/src/main/res/drawable-hdpi/kurisu5c.png b/app/src/main/res/drawable-hdpi/kurisu5c.png
index 40c1d19..04aab02 100644
Binary files a/app/src/main/res/drawable-hdpi/kurisu5c.png and b/app/src/main/res/drawable-hdpi/kurisu5c.png differ
diff --git a/app/src/main/res/drawable-hdpi/kurisu6a.png b/app/src/main/res/drawable-hdpi/kurisu6a.png
index 11542b2..79e9698 100644
Binary files a/app/src/main/res/drawable-hdpi/kurisu6a.png and b/app/src/main/res/drawable-hdpi/kurisu6a.png differ
diff --git a/app/src/main/res/drawable-hdpi/kurisu6b.png b/app/src/main/res/drawable-hdpi/kurisu6b.png
index 0d5c622..127cc16 100644
Binary files a/app/src/main/res/drawable-hdpi/kurisu6b.png and b/app/src/main/res/drawable-hdpi/kurisu6b.png differ
diff --git a/app/src/main/res/drawable-hdpi/kurisu6c.png b/app/src/main/res/drawable-hdpi/kurisu6c.png
index f27ab42..9f4ac34 100644
Binary files a/app/src/main/res/drawable-hdpi/kurisu6c.png and b/app/src/main/res/drawable-hdpi/kurisu6c.png differ
diff --git a/app/src/main/res/drawable-hdpi/kurisu7a.png b/app/src/main/res/drawable-hdpi/kurisu7a.png
index 75b326f..b04491d 100644
Binary files a/app/src/main/res/drawable-hdpi/kurisu7a.png and b/app/src/main/res/drawable-hdpi/kurisu7a.png differ
diff --git a/app/src/main/res/drawable-hdpi/kurisu7b.png b/app/src/main/res/drawable-hdpi/kurisu7b.png
index c3813a0..5a3e196 100644
Binary files a/app/src/main/res/drawable-hdpi/kurisu7b.png and b/app/src/main/res/drawable-hdpi/kurisu7b.png differ
diff --git a/app/src/main/res/drawable-hdpi/kurisu7c.png b/app/src/main/res/drawable-hdpi/kurisu7c.png
index 273aba8..631567a 100644
Binary files a/app/src/main/res/drawable-hdpi/kurisu7c.png and b/app/src/main/res/drawable-hdpi/kurisu7c.png differ
diff --git a/app/src/main/res/drawable-hdpi/kurisu8a.png b/app/src/main/res/drawable-hdpi/kurisu8a.png
index bbb3e6f..0fc07b3 100644
Binary files a/app/src/main/res/drawable-hdpi/kurisu8a.png and b/app/src/main/res/drawable-hdpi/kurisu8a.png differ
diff --git a/app/src/main/res/drawable-hdpi/kurisu8b.png b/app/src/main/res/drawable-hdpi/kurisu8b.png
index 8766116..34deed9 100644
Binary files a/app/src/main/res/drawable-hdpi/kurisu8b.png and b/app/src/main/res/drawable-hdpi/kurisu8b.png differ
diff --git a/app/src/main/res/drawable-hdpi/kurisu8c.png b/app/src/main/res/drawable-hdpi/kurisu8c.png
index 67b7108..7a45b77 100644
Binary files a/app/src/main/res/drawable-hdpi/kurisu8c.png and b/app/src/main/res/drawable-hdpi/kurisu8c.png differ
diff --git a/app/src/main/res/drawable-hdpi/kurisu9a.png b/app/src/main/res/drawable-hdpi/kurisu9a.png
index 7c91a8d..80d5207 100644
Binary files a/app/src/main/res/drawable-hdpi/kurisu9a.png and b/app/src/main/res/drawable-hdpi/kurisu9a.png differ
diff --git a/app/src/main/res/drawable-hdpi/kurisu9b.png b/app/src/main/res/drawable-hdpi/kurisu9b.png
index 1de7432..e482ad4 100644
Binary files a/app/src/main/res/drawable-hdpi/kurisu9b.png and b/app/src/main/res/drawable-hdpi/kurisu9b.png differ
diff --git a/app/src/main/res/drawable-hdpi/kurisu9c.png b/app/src/main/res/drawable-hdpi/kurisu9c.png
index 1820cbe..652b201 100644
Binary files a/app/src/main/res/drawable-hdpi/kurisu9c.png and b/app/src/main/res/drawable-hdpi/kurisu9c.png differ
diff --git a/app/src/main/res/drawable-mdpi/amadeus_icon.png b/app/src/main/res/drawable-mdpi/amadeus_icon.png
new file mode 100644
index 0000000..ac26116
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/amadeus_icon.png differ
diff --git a/app/src/main/res/drawable-mdpi/amadeus_icon_smaller.png b/app/src/main/res/drawable-mdpi/amadeus_icon_smaller.png
new file mode 100644
index 0000000..1fb99c8
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/amadeus_icon_smaller.png differ
diff --git a/app/src/main/res/drawable-mdpi/cancel_select.png b/app/src/main/res/drawable-mdpi/cancel_select.png
new file mode 100644
index 0000000..abd11e8
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/cancel_select.png differ
diff --git a/app/src/main/res/drawable-mdpi/cancel_unselect.png b/app/src/main/res/drawable-mdpi/cancel_unselect.png
new file mode 100644
index 0000000..c3ff7e8
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/cancel_unselect.png differ
diff --git a/app/src/main/res/drawable-mdpi/connect_select.png b/app/src/main/res/drawable-mdpi/connect_select.png
new file mode 100644
index 0000000..c607994
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/connect_select.png differ
diff --git a/app/src/main/res/drawable-mdpi/connect_unselect.png b/app/src/main/res/drawable-mdpi/connect_unselect.png
new file mode 100644
index 0000000..ec5c454
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/connect_unselect.png differ
diff --git a/app/src/main/res/drawable-xhdpi/amadeus_icon.png b/app/src/main/res/drawable-xhdpi/amadeus_icon.png
new file mode 100644
index 0000000..c652048
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/amadeus_icon.png differ
diff --git a/app/src/main/res/drawable-xhdpi/amadeus_icon_smaller.png b/app/src/main/res/drawable-xhdpi/amadeus_icon_smaller.png
new file mode 100644
index 0000000..7458382
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/amadeus_icon_smaller.png differ
diff --git a/app/src/main/res/drawable-xhdpi/cancel_select.png b/app/src/main/res/drawable-xhdpi/cancel_select.png
new file mode 100644
index 0000000..23ff938
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/cancel_select.png differ
diff --git a/app/src/main/res/drawable-xhdpi/cancel_unselect.png b/app/src/main/res/drawable-xhdpi/cancel_unselect.png
new file mode 100644
index 0000000..7f6f987
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/cancel_unselect.png differ
diff --git a/app/src/main/res/drawable-xhdpi/connect_select.png b/app/src/main/res/drawable-xhdpi/connect_select.png
new file mode 100644
index 0000000..752e8f8
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/connect_select.png differ
diff --git a/app/src/main/res/drawable-xhdpi/connect_unselect.png b/app/src/main/res/drawable-xhdpi/connect_unselect.png
new file mode 100644
index 0000000..6a15090
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/connect_unselect.png differ
diff --git a/app/src/main/res/drawable-xhdpi/kurisu10a.png b/app/src/main/res/drawable-xhdpi/kurisu10a.png
index abe8044..62d20f6 100644
Binary files a/app/src/main/res/drawable-xhdpi/kurisu10a.png and b/app/src/main/res/drawable-xhdpi/kurisu10a.png differ
diff --git a/app/src/main/res/drawable-xhdpi/kurisu10b.png b/app/src/main/res/drawable-xhdpi/kurisu10b.png
index 5bf1e4d..33f42a6 100644
Binary files a/app/src/main/res/drawable-xhdpi/kurisu10b.png and b/app/src/main/res/drawable-xhdpi/kurisu10b.png differ
diff --git a/app/src/main/res/drawable-xhdpi/kurisu10c.png b/app/src/main/res/drawable-xhdpi/kurisu10c.png
index 306f6eb..e5b95c7 100644
Binary files a/app/src/main/res/drawable-xhdpi/kurisu10c.png and b/app/src/main/res/drawable-xhdpi/kurisu10c.png differ
diff --git a/app/src/main/res/drawable-xhdpi/kurisu11a.png b/app/src/main/res/drawable-xhdpi/kurisu11a.png
index 515f303..c60ef24 100644
Binary files a/app/src/main/res/drawable-xhdpi/kurisu11a.png and b/app/src/main/res/drawable-xhdpi/kurisu11a.png differ
diff --git a/app/src/main/res/drawable-xhdpi/kurisu11b.png b/app/src/main/res/drawable-xhdpi/kurisu11b.png
index 77821a2..959623a 100644
Binary files a/app/src/main/res/drawable-xhdpi/kurisu11b.png and b/app/src/main/res/drawable-xhdpi/kurisu11b.png differ
diff --git a/app/src/main/res/drawable-xhdpi/kurisu11c.png b/app/src/main/res/drawable-xhdpi/kurisu11c.png
index e609582..546bc0f 100644
Binary files a/app/src/main/res/drawable-xhdpi/kurisu11c.png and b/app/src/main/res/drawable-xhdpi/kurisu11c.png differ
diff --git a/app/src/main/res/drawable-xhdpi/kurisu12a.png b/app/src/main/res/drawable-xhdpi/kurisu12a.png
index 0b51d99..d80246f 100644
Binary files a/app/src/main/res/drawable-xhdpi/kurisu12a.png and b/app/src/main/res/drawable-xhdpi/kurisu12a.png differ
diff --git a/app/src/main/res/drawable-xhdpi/kurisu12b.png b/app/src/main/res/drawable-xhdpi/kurisu12b.png
index fb967ac..248d19d 100644
Binary files a/app/src/main/res/drawable-xhdpi/kurisu12b.png and b/app/src/main/res/drawable-xhdpi/kurisu12b.png differ
diff --git a/app/src/main/res/drawable-xhdpi/kurisu12c.png b/app/src/main/res/drawable-xhdpi/kurisu12c.png
index 66ea183..0186e4f 100644
Binary files a/app/src/main/res/drawable-xhdpi/kurisu12c.png and b/app/src/main/res/drawable-xhdpi/kurisu12c.png differ
diff --git a/app/src/main/res/drawable-xhdpi/kurisu13a.png b/app/src/main/res/drawable-xhdpi/kurisu13a.png
index 0fb7df5..1601871 100644
Binary files a/app/src/main/res/drawable-xhdpi/kurisu13a.png and b/app/src/main/res/drawable-xhdpi/kurisu13a.png differ
diff --git a/app/src/main/res/drawable-xhdpi/kurisu13b.png b/app/src/main/res/drawable-xhdpi/kurisu13b.png
index b193c66..e9ac3a5 100644
Binary files a/app/src/main/res/drawable-xhdpi/kurisu13b.png and b/app/src/main/res/drawable-xhdpi/kurisu13b.png differ
diff --git a/app/src/main/res/drawable-xhdpi/kurisu13c.png b/app/src/main/res/drawable-xhdpi/kurisu13c.png
index 15aed87..61afdf4 100644
Binary files a/app/src/main/res/drawable-xhdpi/kurisu13c.png and b/app/src/main/res/drawable-xhdpi/kurisu13c.png differ
diff --git a/app/src/main/res/drawable-xhdpi/kurisu14a.png b/app/src/main/res/drawable-xhdpi/kurisu14a.png
index 23b22fb..43bb7b7 100644
Binary files a/app/src/main/res/drawable-xhdpi/kurisu14a.png and b/app/src/main/res/drawable-xhdpi/kurisu14a.png differ
diff --git a/app/src/main/res/drawable-xhdpi/kurisu14b.png b/app/src/main/res/drawable-xhdpi/kurisu14b.png
index aa9d983..1085d42 100644
Binary files a/app/src/main/res/drawable-xhdpi/kurisu14b.png and b/app/src/main/res/drawable-xhdpi/kurisu14b.png differ
diff --git a/app/src/main/res/drawable-xhdpi/kurisu14c.png b/app/src/main/res/drawable-xhdpi/kurisu14c.png
index d1fcbfa..cee3916 100644
Binary files a/app/src/main/res/drawable-xhdpi/kurisu14c.png and b/app/src/main/res/drawable-xhdpi/kurisu14c.png differ
diff --git a/app/src/main/res/drawable-xhdpi/kurisu15a.png b/app/src/main/res/drawable-xhdpi/kurisu15a.png
index b8a579c..bb3f03e 100644
Binary files a/app/src/main/res/drawable-xhdpi/kurisu15a.png and b/app/src/main/res/drawable-xhdpi/kurisu15a.png differ
diff --git a/app/src/main/res/drawable-xhdpi/kurisu15b.png b/app/src/main/res/drawable-xhdpi/kurisu15b.png
index 17fed9e..c51a6b2 100644
Binary files a/app/src/main/res/drawable-xhdpi/kurisu15b.png and b/app/src/main/res/drawable-xhdpi/kurisu15b.png differ
diff --git a/app/src/main/res/drawable-xhdpi/kurisu15c.png b/app/src/main/res/drawable-xhdpi/kurisu15c.png
index 70714ab..b6378f4 100644
Binary files a/app/src/main/res/drawable-xhdpi/kurisu15c.png and b/app/src/main/res/drawable-xhdpi/kurisu15c.png differ
diff --git a/app/src/main/res/drawable-xhdpi/kurisu16a.png b/app/src/main/res/drawable-xhdpi/kurisu16a.png
index 5d38e33..afceee1 100644
Binary files a/app/src/main/res/drawable-xhdpi/kurisu16a.png and b/app/src/main/res/drawable-xhdpi/kurisu16a.png differ
diff --git a/app/src/main/res/drawable-xhdpi/kurisu16b.png b/app/src/main/res/drawable-xhdpi/kurisu16b.png
index de2231e..4d80c01 100644
Binary files a/app/src/main/res/drawable-xhdpi/kurisu16b.png and b/app/src/main/res/drawable-xhdpi/kurisu16b.png differ
diff --git a/app/src/main/res/drawable-xhdpi/kurisu16c.png b/app/src/main/res/drawable-xhdpi/kurisu16c.png
index a27251d..242209b 100644
Binary files a/app/src/main/res/drawable-xhdpi/kurisu16c.png and b/app/src/main/res/drawable-xhdpi/kurisu16c.png differ
diff --git a/app/src/main/res/drawable-xhdpi/kurisu17a.png b/app/src/main/res/drawable-xhdpi/kurisu17a.png
index 0d0107b..91a2e5c 100644
Binary files a/app/src/main/res/drawable-xhdpi/kurisu17a.png and b/app/src/main/res/drawable-xhdpi/kurisu17a.png differ
diff --git a/app/src/main/res/drawable-xhdpi/kurisu17b.png b/app/src/main/res/drawable-xhdpi/kurisu17b.png
index 64b1ffc..f480301 100644
Binary files a/app/src/main/res/drawable-xhdpi/kurisu17b.png and b/app/src/main/res/drawable-xhdpi/kurisu17b.png differ
diff --git a/app/src/main/res/drawable-xhdpi/kurisu17c.png b/app/src/main/res/drawable-xhdpi/kurisu17c.png
index 58ecc5f..e817ea0 100644
Binary files a/app/src/main/res/drawable-xhdpi/kurisu17c.png and b/app/src/main/res/drawable-xhdpi/kurisu17c.png differ
diff --git a/app/src/main/res/drawable-xhdpi/kurisu18a.png b/app/src/main/res/drawable-xhdpi/kurisu18a.png
index 97b6cf2..0415125 100644
Binary files a/app/src/main/res/drawable-xhdpi/kurisu18a.png and b/app/src/main/res/drawable-xhdpi/kurisu18a.png differ
diff --git a/app/src/main/res/drawable-xhdpi/kurisu18b.png b/app/src/main/res/drawable-xhdpi/kurisu18b.png
index e3b52b1..49c9221 100644
Binary files a/app/src/main/res/drawable-xhdpi/kurisu18b.png and b/app/src/main/res/drawable-xhdpi/kurisu18b.png differ
diff --git a/app/src/main/res/drawable-xhdpi/kurisu18c.png b/app/src/main/res/drawable-xhdpi/kurisu18c.png
index 61c88ca..8b3798e 100644
Binary files a/app/src/main/res/drawable-xhdpi/kurisu18c.png and b/app/src/main/res/drawable-xhdpi/kurisu18c.png differ
diff --git a/app/src/main/res/drawable-xhdpi/kurisu19a.png b/app/src/main/res/drawable-xhdpi/kurisu19a.png
index 594bdfd..57c7236 100644
Binary files a/app/src/main/res/drawable-xhdpi/kurisu19a.png and b/app/src/main/res/drawable-xhdpi/kurisu19a.png differ
diff --git a/app/src/main/res/drawable-xhdpi/kurisu19b.png b/app/src/main/res/drawable-xhdpi/kurisu19b.png
index ad46290..609b76b 100644
Binary files a/app/src/main/res/drawable-xhdpi/kurisu19b.png and b/app/src/main/res/drawable-xhdpi/kurisu19b.png differ
diff --git a/app/src/main/res/drawable-xhdpi/kurisu19c.png b/app/src/main/res/drawable-xhdpi/kurisu19c.png
index 35e49df..27b8f1e 100644
Binary files a/app/src/main/res/drawable-xhdpi/kurisu19c.png and b/app/src/main/res/drawable-xhdpi/kurisu19c.png differ
diff --git a/app/src/main/res/drawable-xhdpi/kurisu1a.png b/app/src/main/res/drawable-xhdpi/kurisu1a.png
index 2284708..346c1db 100644
Binary files a/app/src/main/res/drawable-xhdpi/kurisu1a.png and b/app/src/main/res/drawable-xhdpi/kurisu1a.png differ
diff --git a/app/src/main/res/drawable-xhdpi/kurisu1b.png b/app/src/main/res/drawable-xhdpi/kurisu1b.png
index 4075d51..caf2d14 100644
Binary files a/app/src/main/res/drawable-xhdpi/kurisu1b.png and b/app/src/main/res/drawable-xhdpi/kurisu1b.png differ
diff --git a/app/src/main/res/drawable-xhdpi/kurisu1c.png b/app/src/main/res/drawable-xhdpi/kurisu1c.png
index 38a7a1f..78918cf 100644
Binary files a/app/src/main/res/drawable-xhdpi/kurisu1c.png and b/app/src/main/res/drawable-xhdpi/kurisu1c.png differ
diff --git a/app/src/main/res/drawable-xhdpi/kurisu2a.png b/app/src/main/res/drawable-xhdpi/kurisu2a.png
index 0790b6c..60703f2 100644
Binary files a/app/src/main/res/drawable-xhdpi/kurisu2a.png and b/app/src/main/res/drawable-xhdpi/kurisu2a.png differ
diff --git a/app/src/main/res/drawable-xhdpi/kurisu2b.png b/app/src/main/res/drawable-xhdpi/kurisu2b.png
index 019c0d9..050a692 100644
Binary files a/app/src/main/res/drawable-xhdpi/kurisu2b.png and b/app/src/main/res/drawable-xhdpi/kurisu2b.png differ
diff --git a/app/src/main/res/drawable-xhdpi/kurisu2c.png b/app/src/main/res/drawable-xhdpi/kurisu2c.png
index 3b205d2..2f58a89 100644
Binary files a/app/src/main/res/drawable-xhdpi/kurisu2c.png and b/app/src/main/res/drawable-xhdpi/kurisu2c.png differ
diff --git a/app/src/main/res/drawable-xhdpi/kurisu3a.png b/app/src/main/res/drawable-xhdpi/kurisu3a.png
index 7e971c0..b64bc2b 100644
Binary files a/app/src/main/res/drawable-xhdpi/kurisu3a.png and b/app/src/main/res/drawable-xhdpi/kurisu3a.png differ
diff --git a/app/src/main/res/drawable-xhdpi/kurisu3b.png b/app/src/main/res/drawable-xhdpi/kurisu3b.png
index 07c1659..e29ebb5 100644
Binary files a/app/src/main/res/drawable-xhdpi/kurisu3b.png and b/app/src/main/res/drawable-xhdpi/kurisu3b.png differ
diff --git a/app/src/main/res/drawable-xhdpi/kurisu3c.png b/app/src/main/res/drawable-xhdpi/kurisu3c.png
index 44a905f..a137e35 100644
Binary files a/app/src/main/res/drawable-xhdpi/kurisu3c.png and b/app/src/main/res/drawable-xhdpi/kurisu3c.png differ
diff --git a/app/src/main/res/drawable-xhdpi/kurisu4a.png b/app/src/main/res/drawable-xhdpi/kurisu4a.png
index 57fcce9..69a9c97 100644
Binary files a/app/src/main/res/drawable-xhdpi/kurisu4a.png and b/app/src/main/res/drawable-xhdpi/kurisu4a.png differ
diff --git a/app/src/main/res/drawable-xhdpi/kurisu4b.png b/app/src/main/res/drawable-xhdpi/kurisu4b.png
index fcb7597..ee9c9c1 100644
Binary files a/app/src/main/res/drawable-xhdpi/kurisu4b.png and b/app/src/main/res/drawable-xhdpi/kurisu4b.png differ
diff --git a/app/src/main/res/drawable-xhdpi/kurisu4c.png b/app/src/main/res/drawable-xhdpi/kurisu4c.png
index 6303b7f..edc4715 100644
Binary files a/app/src/main/res/drawable-xhdpi/kurisu4c.png and b/app/src/main/res/drawable-xhdpi/kurisu4c.png differ
diff --git a/app/src/main/res/drawable-xhdpi/kurisu5a.png b/app/src/main/res/drawable-xhdpi/kurisu5a.png
index c37a1f0..0ed0aae 100644
Binary files a/app/src/main/res/drawable-xhdpi/kurisu5a.png and b/app/src/main/res/drawable-xhdpi/kurisu5a.png differ
diff --git a/app/src/main/res/drawable-xhdpi/kurisu5b.png b/app/src/main/res/drawable-xhdpi/kurisu5b.png
index da6b912..4b58e63 100644
Binary files a/app/src/main/res/drawable-xhdpi/kurisu5b.png and b/app/src/main/res/drawable-xhdpi/kurisu5b.png differ
diff --git a/app/src/main/res/drawable-xhdpi/kurisu5c.png b/app/src/main/res/drawable-xhdpi/kurisu5c.png
index 8e198d1..05ae452 100644
Binary files a/app/src/main/res/drawable-xhdpi/kurisu5c.png and b/app/src/main/res/drawable-xhdpi/kurisu5c.png differ
diff --git a/app/src/main/res/drawable-xhdpi/kurisu6a.png b/app/src/main/res/drawable-xhdpi/kurisu6a.png
index 0256542..cf05223 100644
Binary files a/app/src/main/res/drawable-xhdpi/kurisu6a.png and b/app/src/main/res/drawable-xhdpi/kurisu6a.png differ
diff --git a/app/src/main/res/drawable-xhdpi/kurisu6b.png b/app/src/main/res/drawable-xhdpi/kurisu6b.png
index 903bfe3..979266b 100644
Binary files a/app/src/main/res/drawable-xhdpi/kurisu6b.png and b/app/src/main/res/drawable-xhdpi/kurisu6b.png differ
diff --git a/app/src/main/res/drawable-xhdpi/kurisu6c.png b/app/src/main/res/drawable-xhdpi/kurisu6c.png
index 3f93c71..bb23cae 100644
Binary files a/app/src/main/res/drawable-xhdpi/kurisu6c.png and b/app/src/main/res/drawable-xhdpi/kurisu6c.png differ
diff --git a/app/src/main/res/drawable-xhdpi/kurisu7a.png b/app/src/main/res/drawable-xhdpi/kurisu7a.png
index 0eb9067..1c51dd0 100644
Binary files a/app/src/main/res/drawable-xhdpi/kurisu7a.png and b/app/src/main/res/drawable-xhdpi/kurisu7a.png differ
diff --git a/app/src/main/res/drawable-xhdpi/kurisu7b.png b/app/src/main/res/drawable-xhdpi/kurisu7b.png
index b81086b..2ddd419 100644
Binary files a/app/src/main/res/drawable-xhdpi/kurisu7b.png and b/app/src/main/res/drawable-xhdpi/kurisu7b.png differ
diff --git a/app/src/main/res/drawable-xhdpi/kurisu7c.png b/app/src/main/res/drawable-xhdpi/kurisu7c.png
index cbaa8ce..1d98b2b 100644
Binary files a/app/src/main/res/drawable-xhdpi/kurisu7c.png and b/app/src/main/res/drawable-xhdpi/kurisu7c.png differ
diff --git a/app/src/main/res/drawable-xhdpi/kurisu8a.png b/app/src/main/res/drawable-xhdpi/kurisu8a.png
index fd94f02..b96bfda 100644
Binary files a/app/src/main/res/drawable-xhdpi/kurisu8a.png and b/app/src/main/res/drawable-xhdpi/kurisu8a.png differ
diff --git a/app/src/main/res/drawable-xhdpi/kurisu8b.png b/app/src/main/res/drawable-xhdpi/kurisu8b.png
index 5f33e0d..e5dfa36 100644
Binary files a/app/src/main/res/drawable-xhdpi/kurisu8b.png and b/app/src/main/res/drawable-xhdpi/kurisu8b.png differ
diff --git a/app/src/main/res/drawable-xhdpi/kurisu8c.png b/app/src/main/res/drawable-xhdpi/kurisu8c.png
index 3f780bc..f4b3359 100644
Binary files a/app/src/main/res/drawable-xhdpi/kurisu8c.png and b/app/src/main/res/drawable-xhdpi/kurisu8c.png differ
diff --git a/app/src/main/res/drawable-xhdpi/kurisu9a.png b/app/src/main/res/drawable-xhdpi/kurisu9a.png
index b66dbc2..61682d6 100644
Binary files a/app/src/main/res/drawable-xhdpi/kurisu9a.png and b/app/src/main/res/drawable-xhdpi/kurisu9a.png differ
diff --git a/app/src/main/res/drawable-xhdpi/kurisu9b.png b/app/src/main/res/drawable-xhdpi/kurisu9b.png
index 6503325..6b7fc96 100644
Binary files a/app/src/main/res/drawable-xhdpi/kurisu9b.png and b/app/src/main/res/drawable-xhdpi/kurisu9b.png differ
diff --git a/app/src/main/res/drawable-xhdpi/kurisu9c.png b/app/src/main/res/drawable-xhdpi/kurisu9c.png
index 8f98b3b..6cf80fe 100644
Binary files a/app/src/main/res/drawable-xhdpi/kurisu9c.png and b/app/src/main/res/drawable-xhdpi/kurisu9c.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/amadeus_icon.png b/app/src/main/res/drawable-xxhdpi/amadeus_icon.png
new file mode 100644
index 0000000..1ac47d7
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/amadeus_icon.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/amadeus_icon_smaller.png b/app/src/main/res/drawable-xxhdpi/amadeus_icon_smaller.png
new file mode 100644
index 0000000..c736356
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/amadeus_icon_smaller.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/cancel_select.png b/app/src/main/res/drawable-xxhdpi/cancel_select.png
new file mode 100644
index 0000000..de133d1
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/cancel_select.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/cancel_unselect.png b/app/src/main/res/drawable-xxhdpi/cancel_unselect.png
new file mode 100644
index 0000000..4ab091f
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/cancel_unselect.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/connect_select.png b/app/src/main/res/drawable-xxhdpi/connect_select.png
new file mode 100644
index 0000000..2f43971
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/connect_select.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/connect_unselect.png b/app/src/main/res/drawable-xxhdpi/connect_unselect.png
new file mode 100644
index 0000000..04d402e
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/connect_unselect.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/kurisu10a.png b/app/src/main/res/drawable-xxhdpi/kurisu10a.png
index c15f1e6..16f9318 100644
Binary files a/app/src/main/res/drawable-xxhdpi/kurisu10a.png and b/app/src/main/res/drawable-xxhdpi/kurisu10a.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/kurisu10b.png b/app/src/main/res/drawable-xxhdpi/kurisu10b.png
index 0668230..2a94a31 100644
Binary files a/app/src/main/res/drawable-xxhdpi/kurisu10b.png and b/app/src/main/res/drawable-xxhdpi/kurisu10b.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/kurisu10c.png b/app/src/main/res/drawable-xxhdpi/kurisu10c.png
index 0dcb6ef..a1e8ca4 100644
Binary files a/app/src/main/res/drawable-xxhdpi/kurisu10c.png and b/app/src/main/res/drawable-xxhdpi/kurisu10c.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/kurisu11a.png b/app/src/main/res/drawable-xxhdpi/kurisu11a.png
index 521249d..d997429 100644
Binary files a/app/src/main/res/drawable-xxhdpi/kurisu11a.png and b/app/src/main/res/drawable-xxhdpi/kurisu11a.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/kurisu11b.png b/app/src/main/res/drawable-xxhdpi/kurisu11b.png
index d7c5518..c01dc37 100644
Binary files a/app/src/main/res/drawable-xxhdpi/kurisu11b.png and b/app/src/main/res/drawable-xxhdpi/kurisu11b.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/kurisu11c.png b/app/src/main/res/drawable-xxhdpi/kurisu11c.png
index e2498bb..ff6f0c1 100644
Binary files a/app/src/main/res/drawable-xxhdpi/kurisu11c.png and b/app/src/main/res/drawable-xxhdpi/kurisu11c.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/kurisu12a.png b/app/src/main/res/drawable-xxhdpi/kurisu12a.png
index b2ed59e..30a6d9f 100644
Binary files a/app/src/main/res/drawable-xxhdpi/kurisu12a.png and b/app/src/main/res/drawable-xxhdpi/kurisu12a.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/kurisu12b.png b/app/src/main/res/drawable-xxhdpi/kurisu12b.png
index 1fc68dc..5e67816 100644
Binary files a/app/src/main/res/drawable-xxhdpi/kurisu12b.png and b/app/src/main/res/drawable-xxhdpi/kurisu12b.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/kurisu12c.png b/app/src/main/res/drawable-xxhdpi/kurisu12c.png
index 68a2961..0282e23 100644
Binary files a/app/src/main/res/drawable-xxhdpi/kurisu12c.png and b/app/src/main/res/drawable-xxhdpi/kurisu12c.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/kurisu13a.png b/app/src/main/res/drawable-xxhdpi/kurisu13a.png
index 6d27c6a..845287b 100644
Binary files a/app/src/main/res/drawable-xxhdpi/kurisu13a.png and b/app/src/main/res/drawable-xxhdpi/kurisu13a.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/kurisu13b.png b/app/src/main/res/drawable-xxhdpi/kurisu13b.png
index 4ca5824..c2d8295 100644
Binary files a/app/src/main/res/drawable-xxhdpi/kurisu13b.png and b/app/src/main/res/drawable-xxhdpi/kurisu13b.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/kurisu13c.png b/app/src/main/res/drawable-xxhdpi/kurisu13c.png
index 7f26bfe..4419e1d 100644
Binary files a/app/src/main/res/drawable-xxhdpi/kurisu13c.png and b/app/src/main/res/drawable-xxhdpi/kurisu13c.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/kurisu14a.png b/app/src/main/res/drawable-xxhdpi/kurisu14a.png
index bd44d13..bbbc2f9 100644
Binary files a/app/src/main/res/drawable-xxhdpi/kurisu14a.png and b/app/src/main/res/drawable-xxhdpi/kurisu14a.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/kurisu14b.png b/app/src/main/res/drawable-xxhdpi/kurisu14b.png
index e241c15..f2a9586 100644
Binary files a/app/src/main/res/drawable-xxhdpi/kurisu14b.png and b/app/src/main/res/drawable-xxhdpi/kurisu14b.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/kurisu14c.png b/app/src/main/res/drawable-xxhdpi/kurisu14c.png
index c7e1507..cab8b69 100644
Binary files a/app/src/main/res/drawable-xxhdpi/kurisu14c.png and b/app/src/main/res/drawable-xxhdpi/kurisu14c.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/kurisu15a.png b/app/src/main/res/drawable-xxhdpi/kurisu15a.png
index 325989c..d849e43 100644
Binary files a/app/src/main/res/drawable-xxhdpi/kurisu15a.png and b/app/src/main/res/drawable-xxhdpi/kurisu15a.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/kurisu15b.png b/app/src/main/res/drawable-xxhdpi/kurisu15b.png
index 47c84e9..e3ad55c 100644
Binary files a/app/src/main/res/drawable-xxhdpi/kurisu15b.png and b/app/src/main/res/drawable-xxhdpi/kurisu15b.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/kurisu15c.png b/app/src/main/res/drawable-xxhdpi/kurisu15c.png
index b66dcc2..bd0672a 100644
Binary files a/app/src/main/res/drawable-xxhdpi/kurisu15c.png and b/app/src/main/res/drawable-xxhdpi/kurisu15c.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/kurisu16a.png b/app/src/main/res/drawable-xxhdpi/kurisu16a.png
index 9b32f2d..b75f5ea 100644
Binary files a/app/src/main/res/drawable-xxhdpi/kurisu16a.png and b/app/src/main/res/drawable-xxhdpi/kurisu16a.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/kurisu16b.png b/app/src/main/res/drawable-xxhdpi/kurisu16b.png
index 5c088a5..1283176 100644
Binary files a/app/src/main/res/drawable-xxhdpi/kurisu16b.png and b/app/src/main/res/drawable-xxhdpi/kurisu16b.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/kurisu16c.png b/app/src/main/res/drawable-xxhdpi/kurisu16c.png
index 6abb99a..aa0c8e8 100644
Binary files a/app/src/main/res/drawable-xxhdpi/kurisu16c.png and b/app/src/main/res/drawable-xxhdpi/kurisu16c.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/kurisu17a.png b/app/src/main/res/drawable-xxhdpi/kurisu17a.png
index 62ae57a..4aff1a3 100644
Binary files a/app/src/main/res/drawable-xxhdpi/kurisu17a.png and b/app/src/main/res/drawable-xxhdpi/kurisu17a.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/kurisu17b.png b/app/src/main/res/drawable-xxhdpi/kurisu17b.png
index 22b7552..f37805d 100644
Binary files a/app/src/main/res/drawable-xxhdpi/kurisu17b.png and b/app/src/main/res/drawable-xxhdpi/kurisu17b.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/kurisu17c.png b/app/src/main/res/drawable-xxhdpi/kurisu17c.png
index f75c8da..3a24020 100644
Binary files a/app/src/main/res/drawable-xxhdpi/kurisu17c.png and b/app/src/main/res/drawable-xxhdpi/kurisu17c.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/kurisu18a.png b/app/src/main/res/drawable-xxhdpi/kurisu18a.png
index ffb40cc..c43061e 100644
Binary files a/app/src/main/res/drawable-xxhdpi/kurisu18a.png and b/app/src/main/res/drawable-xxhdpi/kurisu18a.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/kurisu18b.png b/app/src/main/res/drawable-xxhdpi/kurisu18b.png
index 36ac045..b85f445 100644
Binary files a/app/src/main/res/drawable-xxhdpi/kurisu18b.png and b/app/src/main/res/drawable-xxhdpi/kurisu18b.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/kurisu18c.png b/app/src/main/res/drawable-xxhdpi/kurisu18c.png
index a95221c..7f8c6f4 100644
Binary files a/app/src/main/res/drawable-xxhdpi/kurisu18c.png and b/app/src/main/res/drawable-xxhdpi/kurisu18c.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/kurisu19a.png b/app/src/main/res/drawable-xxhdpi/kurisu19a.png
index 894ca45..f240ea2 100644
Binary files a/app/src/main/res/drawable-xxhdpi/kurisu19a.png and b/app/src/main/res/drawable-xxhdpi/kurisu19a.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/kurisu19b.png b/app/src/main/res/drawable-xxhdpi/kurisu19b.png
index 79e1a65..2a24d54 100644
Binary files a/app/src/main/res/drawable-xxhdpi/kurisu19b.png and b/app/src/main/res/drawable-xxhdpi/kurisu19b.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/kurisu19c.png b/app/src/main/res/drawable-xxhdpi/kurisu19c.png
index 208d31e..bf74297 100644
Binary files a/app/src/main/res/drawable-xxhdpi/kurisu19c.png and b/app/src/main/res/drawable-xxhdpi/kurisu19c.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/kurisu1a.png b/app/src/main/res/drawable-xxhdpi/kurisu1a.png
index ece06ff..3ebbf10 100644
Binary files a/app/src/main/res/drawable-xxhdpi/kurisu1a.png and b/app/src/main/res/drawable-xxhdpi/kurisu1a.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/kurisu1b.png b/app/src/main/res/drawable-xxhdpi/kurisu1b.png
index 88d461f..5b34b32 100644
Binary files a/app/src/main/res/drawable-xxhdpi/kurisu1b.png and b/app/src/main/res/drawable-xxhdpi/kurisu1b.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/kurisu1c.png b/app/src/main/res/drawable-xxhdpi/kurisu1c.png
index 7d37771..56afad9 100644
Binary files a/app/src/main/res/drawable-xxhdpi/kurisu1c.png and b/app/src/main/res/drawable-xxhdpi/kurisu1c.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/kurisu2a.png b/app/src/main/res/drawable-xxhdpi/kurisu2a.png
index c950a4c..142c3ca 100644
Binary files a/app/src/main/res/drawable-xxhdpi/kurisu2a.png and b/app/src/main/res/drawable-xxhdpi/kurisu2a.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/kurisu2b.png b/app/src/main/res/drawable-xxhdpi/kurisu2b.png
index aa04e92..6aec90c 100644
Binary files a/app/src/main/res/drawable-xxhdpi/kurisu2b.png and b/app/src/main/res/drawable-xxhdpi/kurisu2b.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/kurisu2c.png b/app/src/main/res/drawable-xxhdpi/kurisu2c.png
index 0d5b55f..84aba64 100644
Binary files a/app/src/main/res/drawable-xxhdpi/kurisu2c.png and b/app/src/main/res/drawable-xxhdpi/kurisu2c.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/kurisu3a.png b/app/src/main/res/drawable-xxhdpi/kurisu3a.png
index e462c64..a1baae0 100644
Binary files a/app/src/main/res/drawable-xxhdpi/kurisu3a.png and b/app/src/main/res/drawable-xxhdpi/kurisu3a.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/kurisu3b.png b/app/src/main/res/drawable-xxhdpi/kurisu3b.png
index 95a49ca..5a5762c 100644
Binary files a/app/src/main/res/drawable-xxhdpi/kurisu3b.png and b/app/src/main/res/drawable-xxhdpi/kurisu3b.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/kurisu3c.png b/app/src/main/res/drawable-xxhdpi/kurisu3c.png
index b634404..355faac 100644
Binary files a/app/src/main/res/drawable-xxhdpi/kurisu3c.png and b/app/src/main/res/drawable-xxhdpi/kurisu3c.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/kurisu4a.png b/app/src/main/res/drawable-xxhdpi/kurisu4a.png
index 42ee507..3c36504 100644
Binary files a/app/src/main/res/drawable-xxhdpi/kurisu4a.png and b/app/src/main/res/drawable-xxhdpi/kurisu4a.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/kurisu4b.png b/app/src/main/res/drawable-xxhdpi/kurisu4b.png
index 7de342f..f6b4640 100644
Binary files a/app/src/main/res/drawable-xxhdpi/kurisu4b.png and b/app/src/main/res/drawable-xxhdpi/kurisu4b.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/kurisu4c.png b/app/src/main/res/drawable-xxhdpi/kurisu4c.png
index b8a4378..e6cfb58 100644
Binary files a/app/src/main/res/drawable-xxhdpi/kurisu4c.png and b/app/src/main/res/drawable-xxhdpi/kurisu4c.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/kurisu5a.png b/app/src/main/res/drawable-xxhdpi/kurisu5a.png
index 3815a96..acac40c 100644
Binary files a/app/src/main/res/drawable-xxhdpi/kurisu5a.png and b/app/src/main/res/drawable-xxhdpi/kurisu5a.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/kurisu5b.png b/app/src/main/res/drawable-xxhdpi/kurisu5b.png
index 8fff56f..399803e 100644
Binary files a/app/src/main/res/drawable-xxhdpi/kurisu5b.png and b/app/src/main/res/drawable-xxhdpi/kurisu5b.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/kurisu5c.png b/app/src/main/res/drawable-xxhdpi/kurisu5c.png
index a95e42c..2f725da 100644
Binary files a/app/src/main/res/drawable-xxhdpi/kurisu5c.png and b/app/src/main/res/drawable-xxhdpi/kurisu5c.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/kurisu6a.png b/app/src/main/res/drawable-xxhdpi/kurisu6a.png
index 8ae157c..052e248 100644
Binary files a/app/src/main/res/drawable-xxhdpi/kurisu6a.png and b/app/src/main/res/drawable-xxhdpi/kurisu6a.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/kurisu6b.png b/app/src/main/res/drawable-xxhdpi/kurisu6b.png
index 29340e4..4640606 100644
Binary files a/app/src/main/res/drawable-xxhdpi/kurisu6b.png and b/app/src/main/res/drawable-xxhdpi/kurisu6b.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/kurisu6c.png b/app/src/main/res/drawable-xxhdpi/kurisu6c.png
index f749edf..55d6a10 100644
Binary files a/app/src/main/res/drawable-xxhdpi/kurisu6c.png and b/app/src/main/res/drawable-xxhdpi/kurisu6c.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/kurisu7a.png b/app/src/main/res/drawable-xxhdpi/kurisu7a.png
index ac74fd9..1ec2c2c 100644
Binary files a/app/src/main/res/drawable-xxhdpi/kurisu7a.png and b/app/src/main/res/drawable-xxhdpi/kurisu7a.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/kurisu7b.png b/app/src/main/res/drawable-xxhdpi/kurisu7b.png
index 3e3f7ea..945a896 100644
Binary files a/app/src/main/res/drawable-xxhdpi/kurisu7b.png and b/app/src/main/res/drawable-xxhdpi/kurisu7b.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/kurisu7c.png b/app/src/main/res/drawable-xxhdpi/kurisu7c.png
index 15bc41b..8660d2a 100644
Binary files a/app/src/main/res/drawable-xxhdpi/kurisu7c.png and b/app/src/main/res/drawable-xxhdpi/kurisu7c.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/kurisu8a.png b/app/src/main/res/drawable-xxhdpi/kurisu8a.png
index 61e9756..c6e9d27 100644
Binary files a/app/src/main/res/drawable-xxhdpi/kurisu8a.png and b/app/src/main/res/drawable-xxhdpi/kurisu8a.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/kurisu8b.png b/app/src/main/res/drawable-xxhdpi/kurisu8b.png
index 516d1dc..df9cafd 100644
Binary files a/app/src/main/res/drawable-xxhdpi/kurisu8b.png and b/app/src/main/res/drawable-xxhdpi/kurisu8b.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/kurisu8c.png b/app/src/main/res/drawable-xxhdpi/kurisu8c.png
index b449267..e3db66f 100644
Binary files a/app/src/main/res/drawable-xxhdpi/kurisu8c.png and b/app/src/main/res/drawable-xxhdpi/kurisu8c.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/kurisu9a.png b/app/src/main/res/drawable-xxhdpi/kurisu9a.png
index 6eae114..4993dba 100644
Binary files a/app/src/main/res/drawable-xxhdpi/kurisu9a.png and b/app/src/main/res/drawable-xxhdpi/kurisu9a.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/kurisu9b.png b/app/src/main/res/drawable-xxhdpi/kurisu9b.png
index 50e098f..63102d2 100644
Binary files a/app/src/main/res/drawable-xxhdpi/kurisu9b.png and b/app/src/main/res/drawable-xxhdpi/kurisu9b.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/kurisu9c.png b/app/src/main/res/drawable-xxhdpi/kurisu9c.png
index 7788f31..408b9a9 100644
Binary files a/app/src/main/res/drawable-xxhdpi/kurisu9c.png and b/app/src/main/res/drawable-xxhdpi/kurisu9c.png differ
diff --git a/app/src/main/res/drawable/amadeus_icon.png b/app/src/main/res/drawable/amadeus_icon.png
new file mode 100644
index 0000000..5ac86ee
Binary files /dev/null and b/app/src/main/res/drawable/amadeus_icon.png differ
diff --git a/app/src/main/res/drawable/amadeus_icon_smaller.png b/app/src/main/res/drawable/amadeus_icon_smaller.png
new file mode 100644
index 0000000..be2ff19
Binary files /dev/null and b/app/src/main/res/drawable/amadeus_icon_smaller.png differ
diff --git a/app/src/main/res/drawable/cancel_select.png b/app/src/main/res/drawable/cancel_select.png
new file mode 100644
index 0000000..bbd62ea
Binary files /dev/null and b/app/src/main/res/drawable/cancel_select.png differ
diff --git a/app/src/main/res/drawable/cancel_unselect.png b/app/src/main/res/drawable/cancel_unselect.png
new file mode 100644
index 0000000..d5eb542
Binary files /dev/null and b/app/src/main/res/drawable/cancel_unselect.png differ
diff --git a/app/src/main/res/drawable/connect_select.png b/app/src/main/res/drawable/connect_select.png
new file mode 100644
index 0000000..341dba2
Binary files /dev/null and b/app/src/main/res/drawable/connect_select.png differ
diff --git a/app/src/main/res/drawable/connect_unselect.png b/app/src/main/res/drawable/connect_unselect.png
new file mode 100644
index 0000000..280d987
Binary files /dev/null and b/app/src/main/res/drawable/connect_unselect.png differ
diff --git a/app/src/main/res/drawable/kurisu_15.xml b/app/src/main/res/drawable/kurisu_15.xml
new file mode 100644
index 0000000..f3d6136
--- /dev/null
+++ b/app/src/main/res/drawable/kurisu_15.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<animation-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:drawable="@drawable/kurisu15a"
+        android:duration="150" />
+    <item
+        android:drawable="@drawable/kurisu15b"
+        android:duration="150" />
+    <item
+        android:drawable="@drawable/kurisu15c"
+        android:duration="150" />
+</animation-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/kurisu_17.xml b/app/src/main/res/drawable/kurisu_17.xml
new file mode 100644
index 0000000..33a778f
--- /dev/null
+++ b/app/src/main/res/drawable/kurisu_17.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<animation-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:drawable="@drawable/kurisu17a"
+        android:duration="150" />
+    <item
+        android:drawable="@drawable/kurisu17b"
+        android:duration="150" />
+    <item
+        android:drawable="@drawable/kurisu17c"
+        android:duration="150" />
+</animation-list>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_launch.xml b/app/src/main/res/layout/activity_launch.xml
index 39a3255..96ebdb9 100644
--- a/app/src/main/res/layout/activity_launch.xml
+++ b/app/src/main/res/layout/activity_launch.xml
@@ -1,51 +1,60 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/activity_launch"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:background="@color/colorPrimaryDark"
     android:paddingBottom="@dimen/activity_vertical_margin"
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    android:background="@color/colorPrimaryDark"
-    tools:context="com.example.yink.amadeus.LaunchActivity">
+    android:paddingTop="@dimen/activity_vertical_margin">
 
     <ImageView
-        android:id="@+id/imageView_logo"
-        android:src="@drawable/amadeus_icon"
+        android:id="@+id/imageView_cancel"
+        android:layout_width="180.0dip"
+        android:layout_height="40.0dip"
+        android:layout_below="@+id/textView_call"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="51dp"
+        android:adjustViewBounds="false"
+        android:cropToPadding="false"
+        android:src="@drawable/cancel_unselect" />
+
+    <TextView
+        android:id="@+id/textView_call"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="98dp"
-        android:scaleX="2.5"
-        android:scaleY="2.5"
-        android:adjustViewBounds="true"
-        android:layout_alignParentTop="true"
-        android:layout_centerHorizontal="true" />
+        android:layout_above="@+id/imageView_connect"
+        android:layout_alignParentStart="true"
+        android:layout_marginBottom="39dp"
+        android:fontFamily="monospace"
+        android:text="@string/call"
+        android:textAppearance="@style/TextAppearance.AppCompat"
+        android:textColor="#ffdec752"
+        android:textSize="22.0sp"
+        android:typeface="monospace" />
 
     <ImageView
         android:id="@+id/imageView_connect"
-        android:src="@drawable/connect_unselect"
-        android:layout_height="40dp"
-        android:layout_marginBottom="120dp"
+        android:layout_width="180.0dip"
+        android:layout_height="40.0dip"
+        android:layout_alignParentBottom="true"
+        android:layout_alignStart="@+id/imageView_cancel"
+        android:layout_marginBottom="137dp"
         android:adjustViewBounds="false"
         android:cropToPadding="false"
-        android:layout_width="180dp"
-        android:layout_alignParentBottom="true"
-        android:layout_centerHorizontal="true" />
+        android:src="@drawable/connect_unselect" />
 
-    <TextView
-        android:text="@string/call"
+    <ImageView
+        android:id="@+id/imageView_logo"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="35dp"
-        android:id="@+id/textView_call"
-        android:layout_above="@+id/imageView_connect"
-        android:layout_alignParentStart="true"
-        android:typeface="monospace"
-        android:textAppearance="@style/TextAppearance.AppCompat"
-        android:textSize="22sp"
-        android:fontFamily="monospace"
-        android:textColor="#dec752" />
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="125dp"
+        android:adjustViewBounds="true"
+        android:scaleX="2.5"
+        android:scaleY="2.5"
 
-</RelativeLayout>
+        android:src="@drawable/amadeus_icon" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index c544d90..28e0c56 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,39 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/activity_main"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingBottom="0dp"
-    android:paddingLeft="0dp"
-    android:paddingRight="0dp"
-    android:paddingTop="0dp"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
     android:background="@color/colorPrimary"
-
-    tools:context="com.example.yink.amadeus.MainActivity">
+    android:paddingBottom="0.0dip"
+    android:paddingLeft="0.0dip"
+    android:paddingRight="0.0dip"
+    android:paddingTop="0.0dip">
 
     <ImageView
         android:id="@+id/imageView_bg"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:src="@drawable/bg"
-        android:scaleType="centerCrop"/>
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:scaleType="centerCrop"
+        android:src="@drawable/bg" />
+
     <ImageView
         android:id="@+id/imageView_kurisu"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
         android:scaleType="centerCrop" />
 
     <ImageView
         android:id="@+id/imageView_logo_small"
-        android:src="@drawable/amadeus_icon_smaller"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="35dp"
+        android:layout_height="35dp"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        android:layout_marginBottom="33.0dip"
+        android:layout_marginEnd="35.0dip"
+        android:layout_marginRight="35.0dip"
         android:scaleX="2.5"
         android:scaleY="2.5"
-        android:layout_marginEnd="35dp"
-        android:layout_marginBottom="33dp"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentEnd="true" />
+        android:src="@drawable/amadeus_icon_smaller" />
 
-</RelativeLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..74b2ab0
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,23 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:2.2.3'
+
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
+allprojects {
+    repositories {
+        jcenter()
+    }
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 0000000..743d692
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,13 @@
+# Project-wide Gradle settings.
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx1536m
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..04e285f
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Mon Dec 28 10:00:20 PST 2015
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 0000000..e7b4def
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1 @@
+include ':app'