diff --git a/app/src/main/ic_launcher-web.png b/app/src/main/ic_launcher-web.png
index 56f8bd6..df39719 100644
Binary files a/app/src/main/ic_launcher-web.png and b/app/src/main/ic_launcher-web.png differ
diff --git a/app/src/main/java/com/example/yink/amadeus/AlarmReceiver.java b/app/src/main/java/com/example/yink/amadeus/AlarmReceiver.java
index 494c3f9..0a995c1 100644
--- a/app/src/main/java/com/example/yink/amadeus/AlarmReceiver.java
+++ b/app/src/main/java/com/example/yink/amadeus/AlarmReceiver.java
@@ -2,12 +2,10 @@ package com.example.yink.amadeus;
 
 import android.app.Activity;
 import android.content.BroadcastReceiver;
-import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
-import android.support.v4.content.WakefulBroadcastReceiver;
 import android.util.Log;
 
 public class AlarmReceiver extends BroadcastReceiver {
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 8561c5a..8c44785 100644
--- a/app/src/main/java/com/example/yink/amadeus/Amadeus.java
+++ b/app/src/main/java/com/example/yink/amadeus/Amadeus.java
@@ -13,7 +13,6 @@ import android.media.MediaPlayer;
 import android.media.audiofx.Visualizer;
 import android.net.Uri;
 import android.preference.PreferenceManager;
-import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -22,18 +21,18 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Random;
 
-public class Amadeus extends AppCompatActivity {
+class Amadeus {
 
     private static String TAG = "Amadeus";
 
     private static int shaman_girls = -1;
     private static VoiceLine[] voiceLines = VoiceLine.Line.getLines();
 
-    public static Boolean isSpeaking = false;
-    public static Boolean isLoop = false;
-    public static MediaPlayer m;
+    static Boolean isSpeaking = false;
+    static Boolean isLoop = false;
+    static MediaPlayer m;
 
-    public static void speak(VoiceLine line, final Activity activity) {
+    static void speak(VoiceLine line, final Activity activity) {
         final AnimationDrawable animation;
         final TextView subtitles = (TextView) activity.findViewById(R.id.textView_subtitles);
         final ImageView kurisu = (ImageView) activity.findViewById(R.id.imageView_kurisu);
@@ -114,7 +113,7 @@ public class Amadeus extends AppCompatActivity {
         }
     }
 
-    public static void responseToInput(String input, Context context, Activity activity) {
+    static void responseToInput(String input, Context context, Activity activity) {
         Random randomgen = new Random();
 
         input = input.toLowerCase();
@@ -236,7 +235,7 @@ public class Amadeus extends AppCompatActivity {
         }
     }
 
-    public static void openApp(String[] input, Activity activity) {
+    static void openApp(String[] input, Activity activity) {
         final PackageManager pm = activity.getPackageManager();
         List<ApplicationInfo> packages = pm.getInstalledApplications(PackageManager.GET_META_DATA);
 
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 9f06e09..8f35b5e 100644
--- a/app/src/main/java/com/example/yink/amadeus/MainActivity.java
+++ b/app/src/main/java/com/example/yink/amadeus/MainActivity.java
@@ -82,7 +82,7 @@ public class MainActivity extends AppCompatActivity {
                     int permissionCheck = ContextCompat.checkSelfPermission(host,
                             Manifest.permission.RECORD_AUDIO);
 
-                    /* Input while loop producing bugs and mixes with output */
+                    /* Input during loop produces bugs and mixes with output */
                     if (!Amadeus.isLoop && !Amadeus.isSpeaking) {
                         if (permissionCheck == PackageManager.PERMISSION_GRANTED) {
                             promptSpeechInput();
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
index a51a0b2..56d1c48 100644
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
index 7b3409a..3405741 100644
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
index e0cd1fb..4c3c614 100644
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
index b0db4b1..59e961c 100644
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index 4b1ad6b..d5a5100 100644
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
new file mode 100644
index 0000000..a7e8c8b
--- /dev/null
+++ b/app/src/main/res/values-it/strings.xml
@@ -0,0 +1,112 @@
+<resources>
+    <!-- LaunchActivity -->
+    <string name="app_name">Amadeus</string>
+    <string name="call">Connettere a Kurisu?</string>
+    <string name="connecting">Collegamento…</string>
+    <string name="disconnected">Disconnesso.</string>
+    <string name="default_lang">en</string>
+    <string name="default_recog_lang">en-US</string>
+    <string name="google_app_error">App Google  non rilevata.</string>
+    <string name="incoming_call">Chiamata da Kurisu.</string>
+    <string name="notification_text">Manchi alla tua waifu.</string>
+
+    <!-- Settings -->
+    <string name="pref_app_settings">Impostazioni applicazione</string>
+    <string name="pref_recog_lang">Lingua di riconoscimento</string>
+    <string name="pref_recog_lang_desc">Seleziona lingua di riconoscimento vocale</string>
+    <string name="pref_lang">Lingua</string>
+    <string name="pref_lang_desc">Seleziona lingua app (riavvio app richiesto)</string>
+    <string name="pref_subtitles">Mostra sottotitoli</string>
+    <string name="pref_subtitles_desc">Mostra sottotitoli per le risposte di Amadeus</string>
+    <string name="pref_notification">Mostra &quot;XP&quot;-Icon</string>
+    <string name="pref_notification_desc">Mostra icona barra di notifica (riavvio app richiesto)</string>
+    <string name="pref_alarm_settings">Impostazioni sveglia</string>
+    <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_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_nice">Ottimo.</string>
+    <string name="line_pervert_confirmed">PERVERTITO CONFERMATO.</string>
+    <string name="line_sorry">Scusa.</string>
+    <string name="line_sounds_tough">Sembra dura.</string>
+    <string name="line_this_guy_hopeless">Questo tizio è senza speranze, meglio fare qualcosa al più presto.</string>
+    <string name="line_gah">Gah.</string>
+    <string name="line_dont_add_tina">Smettila di aggiungere -tina!</string>
+    <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_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_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_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>
+    <string name="line_senpai_question">Comunque, posso farti una domanda?</string>
+    <string name="line_senpai_question_mark">Um… Senpai? Scusami.</string>
+    <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_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_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_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_should_christina">O mi sarei dovuta presentare con, \"Sono 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="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="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/arrays.xml b/app/src/main/res/values/arrays.xml
index 75d636d..933db44 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -5,6 +5,7 @@
         <item>Русский</item>
         <item>Português</item>
         <item>Español</item>
+        <item>Italiano</item>
         <item>日本語</item>
     </string-array>
     
@@ -13,6 +14,7 @@
         <item>ru</item>
         <item>pt</item>
         <item>es</item>
+        <item>it</item>
         <item>ja</item>
     </string-array>