diff --git a/app/build.gradle b/app/build.gradle
index d027272..0ce9595 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@ android {
         minSdkVersion 9
         targetSdkVersion 20
         versionCode 1
-        versionName "0.9.5-Beta.mkII"
+        versionName "0.9.6-alpha.5"
     }
     buildTypes {
         release {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e29b7b8..55d074b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -44,12 +44,13 @@
         </activity>
         <activity
             android:name=".AlarmActivity"
-            android:label="@string/app_name"
-            android:theme="@style/AlarmDialog"
             android:excludeFromRecents="true"
-            android:noHistory="true">
+            android:label="Alarms"
+            android:noHistory="true"
+            android:theme="@style/AlarmDialog">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.VIEW.Alarm" />
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
         <service
diff --git a/app/src/main/java/com/example/yink/amadeus/Amadeus.java b/app/src/main/java/com/example/yink/amadeus/Amadeus.java
index d177a97..2d52bcc 100644
--- a/app/src/main/java/com/example/yink/amadeus/Amadeus.java
+++ b/app/src/main/java/com/example/yink/amadeus/Amadeus.java
@@ -18,58 +18,21 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import java.util.Arrays;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
 
 class Amadeus {
 
-    private static String TAG = "Amadeus";
-
-    private static int shaman_girls = -1;
-    private static VoiceLine[] voiceLines = VoiceLine.Line.getLines();
-
     static Boolean isSpeaking = false;
     static Boolean isLoop = false;
     static MediaPlayer m;
-
+    private static String TAG = "Amadeus";
+    private static int shaman_girls = -1;
+    private static VoiceLine[] voiceLines = VoiceLine.Line.getLines();
     private static HashMap<Bundle<Integer>, Bundle<VoiceLine>> responseInputMap = new HashMap<>();
 
-    private static class Bundle<T> implements Iterable<T> {
-
-        private T[] list;
-
-        public Bundle(T... list) {
-            this.list = list;
-        }
-
-        public T[] toArray() {
-            return list;
-        }
-
-        @NonNull
-        @Override
-        public Iterator<T> iterator() {
-            Iterator<T> iterator = new Iterator<T>() {
-                int index = 0;
-
-                @Override
-                public boolean hasNext() {
-                    return index < list.length;
-                }
-
-                @Override
-                public T next() {
-                    return list[index++];
-                }
-            };
-            return iterator;
-        }
-    }
-
     static {
         responseInputMap.put(new Bundle<>(
                 R.string.christina
@@ -80,7 +43,7 @@ public T next() {
                 voiceLines[VoiceLine.Line.NO_TINA]
         ));
         responseInputMap.put(new Bundle<>(
-                R.string.the_zombie,
+                R.string.the_zombie, R.string.the_zombie2,
                 R.string.celeb17
         ), new Bundle<>(
                 voiceLines[VoiceLine.Line.DONT_CALL_ME_LIKE_THAT]
@@ -104,7 +67,7 @@ public T next() {
                 voiceLines[VoiceLine.Line.SENPAI_WHO_IS_THIS]
         ));
         responseInputMap.put(new Bundle<>(
-                R.string.time_machine,
+                R.string.time_machine, R.string.time_travel2,
                 R.string.cern,
                 R.string.time_travel
         ), new Bundle<>(
@@ -295,12 +258,14 @@ static void responseToInput(String input, Context context, Activity activity) {
         if(specificLines.length>1){intTarget = new Random().nextInt(specificLines.length);}
         Amadeus.speak(specificLines[intTarget], activity);
     }
+
     private static boolean containInput(final String input, final String... strings){
         for(String s:strings){
             if(input.contains(s)) return true;
         }
         return false;
     }
+
     static void openApp(String[] input, Activity activity) {
         final PackageManager pm = activity.getPackageManager();
         List<ApplicationInfo> packages = pm.getInstalledApplications(PackageManager.GET_META_DATA);
@@ -369,4 +334,36 @@ static void openApp(String[] input, Activity activity) {
         }
     }
 
+    private static class Bundle<T> implements Iterable<T> {
+
+        private T[] list;
+
+        public Bundle(T... list) {
+            this.list = list;
+        }
+
+        public T[] toArray() {
+            return list;
+        }
+
+        @NonNull
+        @Override
+        public Iterator<T> iterator() {
+            Iterator<T> iterator = new Iterator<T>() {
+                int index = 0;
+
+                @Override
+                public boolean hasNext() {
+                    return index < list.length;
+                }
+
+                @Override
+                public T next() {
+                    return list[index++];
+                }
+            };
+            return iterator;
+        }
+    }
+
 }
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
new file mode 100644
index 0000000..28727b9
--- /dev/null
+++ b/app/src/main/res/values-de/strings.xml
@@ -0,0 +1,115 @@
+<resources>
+    <!-- LaunchActivity -->
+    <string name="app_name">Amadeus</string>
+    <string name="call">Verbindung mit Kurisu herstellen?</string>
+    <string name="connecting">Verbindung wird hergestellt…</string>
+    <string name="disconnected">Verbindung unterbrochen.</string>
+    <string name="default_lang">de</string>
+    <string name="default_recog_lang">de-DE</string>
+    <string name="google_app_error">Google App wurde nicht erkannt.</string>
+    <string name="incoming_call">Eingehender Anruf von Kurisu.</string>
+    <string name="notification_text">Deine Waifu vermisst dich.</string>
+
+    <!-- Settings -->
+    <string name="pref_app_settings">App Einstellungen</string>
+    <string name="pref_recog_lang">Spracherkennung</string>
+    <string name="pref_recog_lang_desc">Wähle Sprache zur Spracherkennung</string>
+    <string name="pref_lang">Sprache</string>
+    <string name="pref_lang_desc">Wähle App Sprache (App Neustart erforderlich)</string>
+    <string name="pref_subtitles">Untertitel anzeigen</string>
+    <string name="pref_subtitles_desc">Untertitel für Amadeus Antworten anzeigen</string>
+    <string name="pref_notification">Show &quot;XP&quot;-Icon</string>
+    <string name="pref_notification_desc">Symbol in der Statusleiste einblenden (App Neustart erforderlich)</string>
+    <string name="pref_alarm_settings">Alarm Einstellungen</string>
+    <string name="pref_alarm_setup">Alarm Voreinstellungen</string>
+    <string name="pref_alarm_ringtone">Alarm Klingelton</string>
+    <string name="pref_alarm_ringtone_desc">Wähle Alarm Klingelton</string>
+    <string name="pref_alarm_vibrate">Vibration im Alarm-Modus</string>
+    <string name="pref_alarm_24hour_format">24-Stunden Format</string>
+
+    <!-- Subtitles -->
+    <string name="line_hello">Hallo.</string>
+    <string name="line_dont_call_me_like_that">Nenn mich nicht so!</string>
+    <string name="line_but_i_refuse">Aber ich weigere mich.</string>
+    <string name="line_devilish_pervert">Ich hätte nie gedacht, dass du so ein ekelhafter Perverser bist. Anscheinend habe ich dich falsch eingeschätzt.</string>
+    <string name="line_i_guess">Vielleicht.</string>
+    <string name="line_nice">Cool.</string>
+    <string name="line_pervert_confirmed">PERVERSLING ALARM.</string>
+    <string name="line_sorry">Entschuldige.</string>
+    <string name="line_sounds_tough">Das klingt nach einem Problem</string>
+    <string name="line_this_guy_hopeless">Er ist wahnsinnig! Ich muss schnell was unternehmen… !</string>
+    <string name="line_gah">Gah.</string>
+    <string name="line_dont_add_tina">Hör auf -tina hinzuzufügen!</string>
+    <string name="line_pervert_idiot_wanttodie">Du Perversling! Bist du komplett bescheuert!? Willst du sterben?!</string>
+    <string name="line_pleased_to_meet_you">Ich heiße Makise Kurisu, schön dich kennenzulernen.</string>
+    <string name="line_who_the_hell_christina">Wer zur Hölle ist Christina?</string>
+    <string name="line_why_christina">Das beschäftigt mich immer noch. Warum bin ich Christina?</string>
+    <string name="line_christina">Christina?</string>
+    <string name="line_ask_me_whatever">Frag mich was immer du willst. Ich werde mich bemühen, alles zu beantworten.</string>
+    <string name="line_could_i_help">Ähm, kann ich dir mit irgendetwas behilflich sein?</string>
+    <string name="line_what_do_you_want">Brauchst du bei etwas meine Hilfe?</string>
+    <string name="line_what_is_it">Was ist los?</string>
+    <string name="line_heheh">Hehehe.</string>
+    <string name="line_huh_why_say">Häh? Was meinst du damit?</string>
+    <string name="line_you_sure">Bist du dir da sicher?</string>
+    <string name="line_nice_to_meet_okabe">Schön dich kennenzulernen, Okabe Rintaro. Mein Name ist Makise Kurisu.</string>
+    <string name="line_look_forward_to_working">Freut mich deine Bekanntschaft zu machen.</string>
+    <string name="line_senpai_question">Wie auch immer, kann ich dich etwas fragen?</string>
+    <string name="line_senpai_question_mark">Ähm, Senpai?</string>
+    <string name="line_senpai_what_we_talkin">Hey Senpai, wegen des, was du mir neulich erzählt hast…</string>
+    <string name="line_senpai_who_is_this">Ähm, wer ist das?</string>
+    <string name="line_senpai_please_dont_tell">Senpai, bitte, erzähl das nicht den Anderen..</string>
+    <string name="line_still_not_happy">Ich bin immer noch nicht zufrieden damit.</string>
+    <string name="line_tm_nonsense">Das ist kompletter Schwachsinn.</string>
+    <string name="line_tm_not_possible">Lass mich nachdenken… Im Endeffekt denke ich nicht, dass es möglich ist.</string>
+    <string name="line_tm_scientist_no_evidence">Das ist wahrscheinlich, weil Wissenschaftler noch keinen Druchbruch in diesem Gebiet erreicht haben.</string>
+    <string name="line_tm_we_dont_know">Aber wir können auch nicht mit Sicherheit sagen dass es unmöglich ist, glaube ich zumindest.</string>
+    <string name="line_tm_you_said">Eine Zeitmaschine?</string>
+    <string name="line_humans_software">Sogar Menschen betrachten sich selbst als eine Kombination aus Hardware und Software, oder nicht?</string>
+    <string name="line_memory_complex">Aber Erinnerungsdaten sind nicht wie normale Daten. Sie sind viel komplexer.</string>
+    <string name="line_secret_diary">Ich führe ein geheimes Tagebuch.</string>
+    <string name="line_modifying_memories_impossible">Erinnerungen verändern? Das wäre theoretisch möglich.</string>
+    <string name="line_memories_christina">Zum Beispiel wäre es möglich, mich denken zu lassen, dass ich Christina heiße.</string>
+    <string name="line_gah_extended">Gah. Ah… Aaaaah.</string>
+    <string name="line_Leskinen_awesome">Awesome, he\'s really something!</string>
+    <string name="line_Leskinen_nice">Nice!</string>
+    <string name="line_Leskinen_oh_no">Oh no!</string>
+    <string name="line_Leskinen_shaman">Where are the Japanese shaman girls, Lintahlo?</string>
+    <string name="line_Leskinen_holy_cow">Holy Cow! So I said we should come soon.</string>
+    <string name="line_should_christina">Oder hätte ich mich mit "Hier ist Christina" vorstellen sollen?</string>
+    <string name="line_ok">OK.</string>
+
+
+    <!-- Input strings -->
+    <string name="christina">christina</string>
+    <string name="nullpo">nullpo</string>
+    <string name="the_zombie">the zombie</string>
+    <string name="the_zombie2">the zombie</string>
+    <string name="celeb17">celeb seventeen</string>
+    <string name="atchannel">atchannel</string>
+    <string name="kurigohan">kurigohan</string>
+    <string name="kamehameha">kamehameha</string>
+    <string name="salieri">salieri</string>
+    <string name="maho">maho</string>
+    <string name="hiyajo">hiyajo</string>
+    <string name="time_machine">zeitmaschine</string>
+    <string name="cern">cern</string>
+    <string name="time_travel">zeitreisen</string>
+    <string name="time_travel2">zeitreisen</string>
+    <string name="memory">memory</string>
+    <string name="amadeus">amadeus</string>
+    <string name="science">wissenschaft</string>
+    <string name="hello">hallo</string>
+    <string name="good_morning">guten morgen</string>
+    <string name="konnichiwa">guten tag</string>
+    <string name="good_evening">guten abend</string>
+    <string name="nice_body">nette figur</string>
+    <string name="hot">heiß</string>
+    <string name="sexy">sexy</string>
+    <string name="boobies">titten</string>
+    <string name="oppai">oppai</string>
+    <string name="robotics_notes">Robotics Notes</string>
+    <string name="antimatter">antimatter</string>
+    <string name="assistant">assistent</string>
+    <string name="open">öffne</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 932f58e..44469a3 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -1,67 +1,86 @@
 <resources>
     <string name="app_name">Amadeus</string>
-    <string name="call">Conectar a Kurisu?</string>
+    <string name="call">¿Conectar a Kurisu?</string>
     <string name="connecting">Conectando…</string>
     <string name="disconnected">Desconectado.</string>
     <string name="default_lang">es</string>
-    <string name="default_recog_lang">ja-JP</string>
-    <string name="google_app_error">Google App wasn\'t detected.</string>
+    <string name="default_recog_lang">es-ES</string>
+    <string name="google_app_error">Google App no fue detectado.</string>
+
+
+    <string name="pref_app_settings">Ajustes de la aplicación</string>
+    <string name="pref_recog_lang">Idioma de reconocimiento de voz</string>
+    <string name="pref_recog_lang_desc">Elegir el idioma de reconocimiento de voz</string>
+    <string name="pref_lang">Idiomas</string>
+    <string name="pref_lang_desc">Elegir el idioma de la aplicación (requiere reiniciar la aplicación)</string>
+    <string name="pref_subtitles">Mostrar subtítulos</string>
+    <string name="pref_subtitles_desc">Mostrar subtítulos para las respuestas de Amadeus</string>
+    <string name="pref_notification">Mostrar icono &quot;XP&quot;</string>
+    <string name="pref_notification_desc">Mostrar el icono en la barra de notificaciones (requiere reiniciar la aplicación)</string>
+    <string name="pref_alarm_settings">Ajustes de alarmas</string>
+    <string name="pref_alarm_setup">Fijar alarma</string>
+    <string name="pref_alarm_ringtone">Tono de alarma</string>
+    <string name="pref_alarm_ringtone_desc">Elegir el tono de la alarma</string>
+    <string name="pref_alarm_vibrate">Vibración</string>
+    <string name="pref_alarm_24hour_format">Formato 24 horas</string>
+
 
     <string name="line_hello">Hola.</string>
-    <string name="line_dont_call_me_like_that">No me llames así!</string>
+    <string name="line_dont_call_me_like_that">¡No me llames así!</string>
     <string name="line_but_i_refuse">Pero me niego.</string>
-    <string name="line_devilish_pervert">Nunca pensé que eras un pervertido tan diabólico.. Supongo que te juzgué mal.</string>
-    <string name="line_i_guess">Creo que sí.</string>
-    <string name="line_nice">Bueno.</string>
+    <string name="line_devilish_pervert">Nunca me imagine que fueras un pervertido tan travieso. Parece que te juzgué mal.</string>
+    <string name="line_i_guess">Supongo.</string>
+    <string name="line_nice">Genial.</string>
     <string name="line_pervert_confirmed">PERVERTIDO CONFIRMADO.</string>
-    <string name="line_sorry">Desculpa.</string>
-    <string name="line_sounds_tough">Parece difícil.</string>
-    <string name="line_this_guy_hopeless">Este chico no tiene esperanza, mejor hacer algo rápido.</string>
+    <string name="line_sorry">Lo siento.</string>
+    <string name="line_sounds_tough">Suena duro.</string>
+    <string name="line_this_guy_hopeless">Este chico no tiene remedio, habrá que hacer algo y rápido.</string>
     <string name="line_gah">Gah.</string>
-    <string name="line_dont_add_tina">Dejar de agregar -tina!</string>
-    <string name="line_pervert_idiot_wanttodie">Pervertido! Eres un idiota?! Quieres morir?</string>
+    <string name="line_dont_add_tina">¡Deja de agregar -tina!</string>
+    <string name="line_pervert_idiot_wanttodie">¡Pervertido! ¡¿Eres idiota?! ¡¿Quieres morir?!</string>
     <string name="line_pleased_to_meet_you">Soy Makise Kurisu, encantada de conocerte.</string>
-    <string name="line_who_the_hell_christina">Quién diablos es Christina?</string>
-    <string name="line_why_christina">Estoy preocupado. Porqué soy Christina?</string>
-    <string name="line_christina">Christina?</string>
-    <string name="line_ask_me_whatever">Pídeme lo qué quieras. Voy a responder a todo lo qué pueda.</string>
-    <string name="line_could_i_help">Um, podría ayudarte con eso?</string>
-    <string name="line_what_do_you_want">Qué quieres?</string>
-    <string name="line_what_is_it">Qué es eso?</string>
+    <string name="line_who_the_hell_christina">¿Quién diablos es Christina?</string>
+    <string name="line_why_christina">Me preocupa. ¿Por qué me llamas Christina?</string>
+    <string name="line_christina">¿Christina?</string>
+    <string name="line_ask_me_whatever">Pídeme lo qué quieras. Responderé todo lo que pueda.</string>
+    <string name="line_could_i_help">Um, ¿podría ayudarte con eso?</string>
+    <string name="line_what_do_you_want">¿Qué quieres?</string>
+    <string name="line_what_is_it">¿Qué pasa?</string>
     <string name="line_heheh">Hehehe.</string>
-    <string name="line_huh_why_say">Huh? Porqué dices eso?</string>
-    <string name="line_you_sure">Seguro?</string>
-    <string name="line_nice_to_meet_okabe">Encantada de conocerte, Okabe Rintaro. Soy Makise Kurisu</string>
-    <string name="line_look_forward_to_working">Espero con interés trabajar con usted.</string>
-    <string name="line_senpai_question">Desculpa, puedo hacer una pregunta?</string>
-    <string name="line_senpai_question_mark">Um… Senpai? Desculpe.</string>
-    <string name="line_senpai_what_we_talkin">Hey Senpai, de lo que acabamos de hablar…</string>
-    <string name="line_senpai_who_is_this">Uh, quién es este?</string>
-    <string name="line_senpai_please_dont_tell">Senpai, por favor, no lo digas los otros…</string>
-    <string name="line_still_not_happy">Todavía no estoy contento con eso.</string>
-    <string name="line_tm_nonsense">Eso es pura tontería.</string>
-    <string name="line_tm_not_possible">Veamos … Mi conclusión es que no es posible.</string>
-    <string name="line_tm_scientist_no_evidence">Eso es probablemente porque los científicos no han descubierto algo importante todavía.</string>
-    <string name="line_tm_we_dont_know">Pero no sabemos con certeza si es imposible, supongo.</string>
-    <string name="line_tm_you_said">Una máquina del tiempo, dijiste?</string>
-    <string name="line_humans_software">Até os humanos falam de si como uma combinação de hardware e software, não é?</string>
-    <string name="line_memory_complex">Pero los datos de memoria no son como los datos normales. Es mucho más complejo.</string>
+    <string name="line_huh_why_say">¿Eh? ¿Por qué dices eso?</string>
+    <string name="line_you_sure">¿Seguro?</string>
+    <string name="line_nice_to_meet_okabe">Encantada de conocerte, Okabe Rintaro. Me llamo Makise Kurisu.</string>
+    <string name="line_look_forward_to_working">Estoy deseando trabajar contigo.</string>
+    <string name="line_senpai_question">Por cierto, ¿puedo hacer una pregunta?</string>
+    <string name="line_senpai_question_mark">Um… Disculpa, Senpai.</string>
+    <string name="line_senpai_what_we_talkin">Oye, Senpai, sobre lo que estabamos hablando…</string>
+    <string name="line_senpai_who_is_this">¿Eh? ¿Quién es este?</string>
+    <string name="line_senpai_please_dont_tell">Senpai, por favor, no se lo cuentes a los demás…</string>
+    <string name="line_still_not_happy">Todavía no estoy contenta.</string>
+    <string name="line_tm_nonsense">Eso es pura charlatanería.</string>
+    <string name="line_tm_not_possible">Veamos… Mi conclusión es que no es posible.</string>
+    <string name="line_tm_scientist_no_evidence">Probablemente porque los científicos aún no han hecho un descubrimiento importante.</string>
+    <string name="line_tm_we_dont_know">Pero supongo que no sabemos con certeza si es imposible.</string>
+    <string name="line_tm_you_said">¿Una máquina del tiempo, dijiste?</string>
+    <string name="line_humans_software">Incluso los humanos se refieren a ellos mismos como una combinación de software y hardware, ¿verdad?</string>
+    <string name="line_memory_complex">Pero los datos de la memoria no son como los datos normales. Son mucho más complejos.</string>
     <string name="line_secret_diary">Tengo un diario secreto.</string>
-    <string name="line_modifying_memories_impossible">Cambiar mis recuerdos? Es teóricamente posible.</string>
-    <string name="line_memories_christina">Por ejemplo, sería posible hacerme pensar que mi nombre era Christina.</string>
+    <string name="line_modifying_memories_impossible">¿Modificar mis recuerdos? Es teóricamente posible.</string>
+    <string name="line_memories_christina">Por ejemplo, sería posible hacerme pensar que mi nombre es Christina.</string>
     <string name="line_gah_extended">Gah. Ah… Aaaaah.</string>
-    <string name="line_Leskinen_awesome">Increíble, él es realmente algo!</string>
+    <string name="line_Leskinen_awesome">Awesome, he\'s really something!</string>
     <string name="line_Leskinen_nice">Nice!</string>
     <string name="line_Leskinen_oh_no">Oh no!</string>
-    <string name="line_Leskinen_shaman">Dónde están las chicas chamanes japonesas, Lintahlo?</string>
-    <string name="line_Leskinen_holy_cow">Vaca santa! Así que dije que deberíamos venir pronto.</string>
-    <string name="line_should_christina">O debería haberme presentado con "Es Christina"?</string>
+    <string name="line_Leskinen_shaman">Where are the Japanese shaman girls, Lintahlo?</string>
+    <string name="line_Leskinen_holy_cow">Holy Cow! So I said we should come soon.</string>
+    <string name="line_should_christina">¿O debería haberme presentado con "se dice Christina"?</string>
     <string name="line_ok">OK.</string>
 
     <!-- Input strings -->
     <string name="christina">christina</string>
     <string name="nullpo">nullpo</string>
-    <string name="the_zombie">the zombie</string>
+    <string name="the_zombie">zombie</string>
+    <string name="the_zombie2">zombi</string>
     <string name="celeb17">celeb seventeen</string>
     <string name="atchannel">atchannel</string>
     <string name="kurigohan">kurigohan</string>
@@ -69,21 +88,23 @@
     <string name="salieri">salieri</string>
     <string name="maho">maho</string>
     <string name="hiyajo">hiyajo</string>
-    <string name="time_machine">time machine</string>
+    <string name="time_machine">máquina del tiempo</string>
     <string name="cern">cern</string>
-    <string name="time_travel">time travel</string>
-    <string name="memory">memory</string>
+    <string name="time_travel">viajes en el tiempo</string>
+    <string name="time_travel2">viaje en el tiempo</string>
+    <string name="memory">memoria</string>
     <string name="amadeus">amadeus</string>
-    <string name="science">science</string>
-    <string name="hello">hello</string>
-    <string name="good_morning">good morning</string>
-    <string name="konnichiwa">good afternoon</string>
-    <string name="good_evening">good evening</string>
-    <string name="nice_body">nice body</string>
-    <string name="hot">hot</string>
+    <string name="science">ciencia</string>
+    <string name="hello">hola</string>
+    <string name="good_morning">buenos días</string>
+    <string name="konnichiwa">buenas tardes</string>
+    <string name="good_evening">buenas noches</string>
+    <string name="nice_body">buen cuerpo</string>
+    <string name="hot">caliente</string>
     <string name="sexy">sexy</string>
-    <string name="boobies">boobies</string>
+    <string name="boobies">tetas</string>
     <string name="oppai">oppai</string>
     <string name="robotics_notes">Robotics Notes</string>
+    <string name="assistant">asistente</string>
     <string name="antimatter">antimatter</string>
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 5462b40..4e65bbe 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -83,6 +83,7 @@
     <string name="christina">christina</string>
     <string name="nullpo">nullpo</string>
     <string name="the_zombie">the zombie</string>
+    <string name="the_zombie2">the zombie</string>
     <string name="celeb17">celeb seventeen</string>
     <string name="atchannel">atchannel</string>
     <string name="kurigohan">kurigohan</string>
@@ -93,6 +94,7 @@
     <string name="time_machine">machine à voyager dans le temps</string>
     <string name="cern">cern</string>
     <string name="time_travel">voyage dans le temps</string>
+    <string name="time_travel2">voyage dans le temps</string>
     <string name="memory">mémoire</string>
     <string name="amadeus">amadeus</string>
     <string name="science">science</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index c68c42f..32963cf 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -24,15 +24,15 @@
     <string name="pref_alarm_setup">Imposta sveglia</string>
     <string name="pref_alarm_ringtone">Suoneria sveglia</string>
     <string name="pref_alarm_ringtone_desc">Seleziona suoneria per la sveglia</string>
-    <string name="pref_alarm_vibrate">Vibra durante la sveglia</string>
+    <string name="pref_alarm_vibrate">Vibra durante la suoneria</string>
     <string name="pref_alarm_24hour_format">Formato 24-ore</string>
 
     <!-- Subtitles -->
     <string name="line_hello">Ciao.</string>
     <string name="line_dont_call_me_like_that">Non chiamarmi in quel modo!</string>
     <string name="line_but_i_refuse">Ma mi rifiuto.</string>
-    <string name="line_devilish_pervert">Non ho mai pensato che tu fossi un tale diabolico pervertito. Immagino di averti giudicato male.</string>
-    <string name="line_i_guess">Suppongo.</string>
+    <string name="line_devilish_pervert">Non ho mai pensato che tu fossi un pervertito malizioso di questo tipo. Immagino di averti giudicato male.</string>
+    <string name="line_i_guess">Lo immagino.</string>
     <string name="line_nice">Ottimo.</string>
     <string name="line_pervert_confirmed">PERVERTITO CONFERMATO.</string>
     <string name="line_sorry">Scusa.</string>
@@ -43,14 +43,14 @@
     <string name="line_pervert_idiot_wanttodie">Pervertito! Sei un idiota!? Vuoi morire?!</string>
     <string name="line_pleased_to_meet_you">Sono Makise Kurisu, piacere di conoscerti.</string>
     <string name="line_who_the_hell_christina">Chi diavolo è Christina?</string>
-    <string name="line_why_christina">Sono preoccupata per quello. Perchè  sono Christina?</string>
+    <string name="line_why_christina">Sono preoccupata per quello. Perché sono Christina?</string>
     <string name="line_christina">Christina?</string>
     <string name="line_ask_me_whatever">Chiedimi qualunque cosa tu voglia. Risponderò a tutto ciò che posso.</string>
-    <string name="line_could_i_help">Um, posso aiutarti a farlo?</string>
+    <string name="line_could_i_help">Um, ti posso aiutare?</string>
     <string name="line_what_do_you_want">Cosa desideri?</string>
     <string name="line_what_is_it">Cosa è?</string>
     <string name="line_heheh">Hehehe.</string>
-    <string name="line_huh_why_say">Huh? Perchè lo hai detto?</string>
+    <string name="line_huh_why_say">Huh? Perché lo hai detto?</string>
     <string name="line_you_sure">Sei sicuro?</string>
     <string name="line_nice_to_meet_okabe">Piacere di conoscerti, Okabe Rintaro. Sono Makise Kurisu.</string>
     <string name="line_look_forward_to_working">Attendo con ansia di lavorare con te.</string>
@@ -59,23 +59,23 @@
     <string name="line_senpai_what_we_talkin">Ehi Senpai, riguardo a quanto stavamo discutendo prima…</string>
     <string name="line_senpai_who_is_this">Uh, chi è questo?</string>
     <string name="line_senpai_please_dont_tell">Senpai, ti prego, non dirlo agli altri…</string>
-    <string name="line_still_not_happy">Non sono ancora felice riguardo a ciò.</string>
+    <string name="line_still_not_happy">Non sono ancora felice a riguardo.</string>
     <string name="line_tm_nonsense">Non ha totalmente senso.</string>
     <string name="line_tm_not_possible">Vediamo… La mia conclusione è che non sia possibile.</string>
     <string name="line_tm_scientist_no_evidence">Probabilmente perchè gli scienziati non hanno ancora scoperto nulla di importante.</string>
     <string name="line_tm_we_dont_know">Ma non sappiamo per certo che sia impossibile, suppongo.</string>
     <string name="line_tm_you_said">Una macchina del tempo, hai detto?</string>
-    <string name="line_humans_software">Persino gli umani parlano di sé stessi come una combinazione di hardware e software, giusto?</string>
+    <string name="line_humans_software">Persino gli umani parlano di se stessi come una combinazione di hardware e software, giusto?</string>
     <string name="line_memory_complex">Ma i dati della memoria non sono come i dati normali. E\' molto più complicato.</string>
     <string name="line_secret_diary">Custodisco un diario personale.</string>
     <string name="line_modifying_memories_impossible">Modificare le mie memorie? E\' teoricamente possibile.</string>
-    <string name="line_memories_christina">Ad esempio, sarebbe possibile farmi credere che il nome fosse Christina.</string>
+    <string name="line_memories_christina">Ad esempio, sarebbe possibile farmi credere che il mio nome fosse Christina.</string>
     <string name="line_gah_extended">Gah. Ah… Aaaaah.</string>
     <string name="line_Leskinen_awesome">Magnifico, sei davvero speciale!</string>
     <string name="line_Leskinen_nice">Ottimo!</string>
     <string name="line_Leskinen_oh_no">Oh no!</string>
     <string name="line_Leskinen_shaman">Dove sono le sciamane giapponesi, Lintahlo?</string>
-    <string name="line_Leskinen_holy_cow">Dio santo! Così ho detto che dovremmo venire presto.</string>
+    <string name="line_Leskinen_holy_cow">Santo Cielo! Così ho detto che dovremmo venire presto.</string>
     <string name="line_should_christina">O mi sarei dovuta presentare con, \"Sono Christina\"?</string>
     <string name="line_ok">OK.</string>
 
@@ -83,6 +83,7 @@
     <string name="christina">christina</string>
     <string name="nullpo">nullpo</string>
     <string name="the_zombie">the zombie</string>
+    <string name="the_zombie2">the zombie</string>
     <string name="celeb17">celeb seventeen</string>
     <string name="atchannel">atchannel</string>
     <string name="kurigohan">kurigohan</string>
@@ -93,6 +94,7 @@
     <string name="time_machine">time machine</string>
     <string name="cern">cern</string>
     <string name="time_travel">time travel</string>
+    <string name="time_travel2">time travel</string>
     <string name="memory">memory</string>
     <string name="amadeus">amadeus</string>
     <string name="science">science</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index dc07dc7..7af6460 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -61,6 +61,7 @@
     <string name="christina">クリスティーナ</string>
     <string name="nullpo">ぬるぽ</string>
     <string name="the_zombie">the zombie</string>
+    <string name="the_zombie2">the zombie</string>
     <string name="celeb17">セレブセブンティーン</string>
     <string name="atchannel">アットチャンネル</string>
     <string name="kurigohan">栗ご飯</string>
@@ -71,6 +72,7 @@
     <string name="time_machine">タイムマシーン</string>
     <string name="cern">cern</string>
     <string name="time_travel">タイムトラベル</string>
+    <string name="time_travel2">タイムトラベル</string>
     <string name="memory">メモリー</string>
     <string name="amadeus">アマデウス</string>
     <string name="science">サイエンス</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index e1972a0..bc358a6 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -56,4 +56,37 @@
     <string name="line_Leskinen_shaman">Onde tão as meninas shaman japonesas, Lintahlo?</string>
     <string name="line_Leskinen_holy_cow">Porra! Eu bem disse que devíamos ter vindo mais cedo.</string>
     <string name="line_should_christina">Ou será que devia ter dito "É a Christina"?</string>
+
+    <!-- Input strings -->
+    <string name="christina">christina</string>
+    <string name="nullpo">nullpo</string>
+    <string name="the_zombie">the zombie</string>
+    <string name="the_zombie2">the zombie</string>
+    <string name="celeb17">celeb seventeen</string>
+    <string name="atchannel">atchannel</string>
+    <string name="kurigohan">kurigohan</string>
+    <string name="kamehameha">kamehameha</string>
+    <string name="salieri">salieri</string>
+    <string name="maho">maho</string>
+    <string name="hiyajo">hiyajo</string>
+    <string name="time_machine">time machine</string>
+    <string name="cern">cern</string>
+    <string name="time_travel">time travel</string>
+    <string name="time_travel2">time travel</string>
+    <string name="memory">memory</string>
+    <string name="amadeus">amadeus</string>
+    <string name="science">science</string>
+    <string name="hello">hello</string>
+    <string name="good_morning">good morning</string>
+    <string name="konnichiwa">good afternoon</string>
+    <string name="good_evening">good evening</string>
+    <string name="nice_body">nice body</string>
+    <string name="hot">hot</string>
+    <string name="sexy">sexy</string>
+    <string name="boobies">boobies</string>
+    <string name="oppai">oppai</string>
+    <string name="robotics_notes">Robotics Notes</string>
+    <string name="antimatter">antimatter</string>
+    <string name="assistant">assistant</string>
+    <string name="open">open</string>
 </resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 3a849b9..45d4d7b 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -82,6 +82,7 @@
     <!-- Фразы для ввода -->
     <string name="christina">кристина</string>
     <string name="the_zombie">зомби</string>
+    <string name="the_zombie2">зомби</string>
     <string name="celeb17">поп-дива</string>
     <string name="kurigohan">кури гохан</string>
     <string name="kamehameha">камехамеха</string>
@@ -89,6 +90,7 @@
     <string name="time_machine">машина времени</string>
     <string name="cern">церн</string>
     <string name="time_travel">путешествие во времени</string>
+    <string name="time_travel2">путешествие во времени</string>
     <string name="memory">воспоминания</string>
     <string name="amadeus">amadeus</string>
     <string name="science">наука</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 60b2d9c..3bf0178 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -83,6 +83,7 @@
     <string name="christina">christina</string>
     <string name="nullpo">nullpo</string>
     <string name="the_zombie">the zombie</string>
+    <string name="the_zombie2">the zombie</string>
     <string name="celeb17">celeb seventeen</string>
     <string name="atchannel">atchannel</string>
     <string name="kurigohan">kurigohan</string>
@@ -93,6 +94,7 @@
     <string name="time_machine">time machine</string>
     <string name="cern">cern</string>
     <string name="time_travel">time travel</string>
+    <string name="time_travel2">time travel</string>
     <string name="memory">memory</string>
     <string name="amadeus">amadeus</string>
     <string name="science">science</string>
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index c13ffb7..900ef5a 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -6,7 +6,8 @@
         <item>Português</item>
         <item>Español</item>
         <item>Italiano</item>
-        <item>French</item>
+        <item>Française</item>
+        <item>Deutsch</item>
         <item>日本語</item>
         <item>简体中文</item>
         <item>繁體中文</item>
@@ -19,6 +20,7 @@
         <item>es</item>
         <item>it</item>
         <item>fr</item>
+        <item>de</item>
         <item>ja</item>
         <item>zh-rCN</item>
         <item>zh-rTW</item>
@@ -26,14 +28,20 @@
 
     <string-array name="languagesRecogArray">
         <item>English</item>
-        <item>Русский</item>
         <item>日本語</item>
+        <item>Русский</item>
+        <item>Español</item>
+        <item>Deutsch</item>
+        <item>Française</item>
     </string-array>
 
     <string-array name="languagesRecogValues">
         <item>en-US</item>
-        <item>ru-RU</item>
         <item>ja-JP</item>
+        <item>ru-RU</item>
+        <item>es-ES</item>
+        <item>de-DE</item>
+        <item>fr-FR</item>
     </string-array>
 
     <string-array name="ringtonesArray">
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 16e7384..d438a6d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -83,6 +83,7 @@
     <string name="christina">christina</string>
     <string name="nullpo">nullpo</string>
     <string name="the_zombie">the zombie</string>
+    <string name="the_zombie2">the zombie</string>
     <string name="celeb17">celeb seventeen</string>
     <string name="atchannel">atchannel</string>
     <string name="kurigohan">kurigohan</string>
@@ -93,6 +94,7 @@
     <string name="time_machine">time machine</string>
     <string name="cern">cern</string>
     <string name="time_travel">time travel</string>
+    <string name="time_travel2">time travel</string>
     <string name="memory">memory</string>
     <string name="amadeus">amadeus</string>
     <string name="science">science</string>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index b320580..69e9306 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -28,10 +28,9 @@
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/pref_alarm_settings">
         <Preference android:title="@string/pref_alarm_setup">
-            <intent
-                android:action="android.intent.action.VIEW"
-                android:targetPackage="com.example.yink.amadeus"
-                android:targetClass="com.example.yink.amadeus.AlarmActivity" />
+            <intent android:action="android.intent.action.VIEW.Alarm" />
+            <!--android:targetPackage="com.example.yink.amadeus"
+            android:targetClass="com.example.yink.amadeus.AlarmActivity" />-->
         </Preference>
         <ListPreference
             android:entries="@array/ringtonesArray"