diff --git a/res/values/strings.xml b/res/values/strings.xml
index a15fc5b..688667f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -5,8 +5,7 @@
 
 	<string name="settings_activity_label">Unexpected Keyboard Settings</string>
 
-  <string name="subtype_label_azerty">%s</string>
-  <string name="subtype_label_qwerty">%s</string>
+  <string name="subtype_label">%s</string>
 
 	<string name="pref_category_layout">Layout</string>
   <string name="pref_layout_title">Change keyboard layout</string>
diff --git a/res/xml/method.xml b/res/xml/method.xml
index a84df7c..c5f1092 100644
--- a/res/xml/method.xml
+++ b/res/xml/method.xml
@@ -2,18 +2,32 @@
 <input-method xmlns:android="http://schemas.android.com/apk/res/android"
 		android:settingsActivity="juloo.keyboard2.SettingsActivity"
 		android:supportsSwitchingToNextInputMethod="true">
-  <subtype android:label="@string/subtype_label_qwerty"
+  <subtype android:label="@string/subtype_label"
       android:languageTag="en"
       android:imeSubtypeLocale="en_US"
       android:imeSubtypeMode="keyboard"
       android:isAsciiCapable="true"
       android:imeSubtypeExtraValue="default_layout=qwerty"
     />
-  <subtype android:label="@string/subtype_label_azerty"
+  <subtype android:label="@string/subtype_label"
       android:languageTag="fr"
       android:imeSubtypeLocale="fr_FR"
       android:imeSubtypeMode="keyboard"
       android:isAsciiCapable="true"
-      android:imeSubtypeExtraValue="default_layout=azerty,accents=grave|aigu|circonflexe|tilde|cedille|trema"
+      android:imeSubtypeExtraValue="default_layout=azerty,accents=grave|aigu|circonflexe|cedille|trema"
+    />
+  <subtype android:label="@string/subtype_label"
+      android:languageTag="es"
+      android:imeSubtypeLocale="es_ES"
+      android:imeSubtypeMode="keyboard"
+      android:isAsciiCapable="true"
+      android:imeSubtypeExtraValue="default_layout=qwerty,accents=aigu|tilde|trema"
+    />
+  <subtype android:label="@string/subtype_label"
+      android:languageTag="it"
+      android:imeSubtypeLocale="it_IT"
+      android:imeSubtypeMode="keyboard"
+      android:isAsciiCapable="true"
+      android:imeSubtypeExtraValue="default_layout=qwerty,accents=grave|aigu"
     />
 </input-method>