diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index d23fdff..d821436 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -14,10 +14,6 @@
   <string name="pref_layout_e_custom">Vlastní rozvržení</string>
   <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
   <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
-  <string name="pref_accents_title">(Univerzální) Diakritická znaménka</string>
-  <string name="pref_accents_e_all_installed">Zobrazovat znaménka pro všechny instalované systémové jazyky</string>
-  <string name="pref_accents_e_selected">Zobrazovat znaménka pouze pro současně zvolený jazyk</string>
-  <string name="pref_accents_e_none">Skrýt (univerzální) diakritická znaménka</string>
   <string name="pref_show_numpad_title">Zobrazit NumPad</string>
   <string name="pref_show_numpad_never">Nikdy</string>
   <string name="pref_show_numpad_landscape">Pouze v režimu na šířku</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 525eb00..c9405bb 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -14,10 +14,6 @@
   <string name="pref_layout_e_custom">Eigenes Layout</string>
   <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
   <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
-  <string name="pref_accents_title">Akzente</string>
-  <string name="pref_accents_e_all_installed">Akzente für alle installierten Sprachen anzeigen</string>
-  <string name="pref_accents_e_selected">Akzente nur für die gewählte Sprache anzeigen</string>
-  <string name="pref_accents_e_none">Akzente verbergen</string>
   <string name="pref_show_numpad_title">Ziffernblock anzeigen</string>
   <string name="pref_show_numpad_never">Nie</string>
   <string name="pref_show_numpad_landscape">Nur im Querformat</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 19a5ce3..b1bd0d3 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -14,10 +14,6 @@
   <string name="pref_layout_e_custom">Formato personalizado</string>
   <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
   <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
-  <string name="pref_accents_title">Acentos</string>
-  <string name="pref_accents_e_all_installed">Mostrar acentos para todos los lenguajes instalados</string>
-  <string name="pref_accents_e_selected">Solo mostrar acentos para el lenguaje seleccionado</string>
-  <string name="pref_accents_e_none">Ocultar acentos</string>
   <string name="pref_show_numpad_title">Mostrar pad numérico</string>
   <string name="pref_show_numpad_never">Nunca</string>
   <string name="pref_show_numpad_landscape">Solo en modo paisaje</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 7a51cac..3b80b14 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -14,10 +14,6 @@
   <string name="pref_layout_e_custom">طرح صفارشی</string>
   <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
   <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
-  <string name="pref_accents_title">لهجه‌ها</string>
-  <string name="pref_accents_e_all_installed">نمایش لهجه‌ها برای تمام زبان‌هی نصب شده</string>
-  <string name="pref_accents_e_selected">فقط نمایش لهجه‌ها برای زبان‌های انتخاب شده</string>
-  <string name="pref_accents_e_none">پنهان کردن لهجه‌ها</string>
   <string name="pref_show_numpad_title">نمایش پد شماره‌ها</string>
   <string name="pref_show_numpad_never">هرگز</string>
   <string name="pref_show_numpad_landscape">فقط در حالت افقی</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index a67e9b0..dd16ea6 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -14,10 +14,6 @@
   <string name="pref_layout_e_custom">Disposition personnalisée</string>
   <string name="pref_layouts_add">Ajouter un clavier alternatif</string>
   <string name="pref_layouts_item">Disposition %1$d: %2$s</string>
-  <string name="pref_accents_title">Accents</string>
-  <string name="pref_accents_e_all_installed">Afficher les accents pour les langues installées</string>
-  <string name="pref_accents_e_selected">Afficher les accents pour la langue sélectionnée</string>
-  <string name="pref_accents_e_none">Cacher les accents</string>
   <string name="pref_show_numpad_title">Afficher le pavé numérique</string>
   <string name="pref_show_numpad_never">Jamais</string>
   <string name="pref_show_numpad_landscape">Seulement en mode paysage</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index eb1c814..9170f19 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -14,10 +14,6 @@
   <!-- <string name="pref_layout_e_custom">Custom layout</string> -->
   <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
   <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
-  <string name="pref_accents_title">Accenti</string>
-  <string name="pref_accents_e_all_installed">Mostra accenti per tutte le lingue installate</string>
-  <string name="pref_accents_e_selected">Mostra accenti solo per le lingue selezionate</string>
-  <string name="pref_accents_e_none">Nascondi accenti</string>
   <!-- <string name="pref_show_numpad_title">Show NumPad</string> -->
   <!-- <string name="pref_show_numpad_never">Never</string> -->
   <!-- <string name="pref_show_numpad_landscape">Only in landscape mode</string> -->
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index b821996..0f224ea 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -14,10 +14,6 @@
   <!-- <string name="pref_layout_e_custom">Custom layout</string> -->
   <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
   <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
-  <string name="pref_accents_title">악센트</string>
-  <string name="pref_accents_e_all_installed">설치된 모든 언어의 악센트 표시</string>
-  <string name="pref_accents_e_selected">선택한 언어의 악센트만 표시</string>
-  <string name="pref_accents_e_none">모든 언어의 악센트 숨기기</string>
   <!-- <string name="pref_show_numpad_title">Show NumPad</string> -->
   <!-- <string name="pref_show_numpad_never">Never</string> -->
   <!-- <string name="pref_show_numpad_landscape">Only in landscape mode</string> -->
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 31d54b3..131d986 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -14,10 +14,6 @@
   <string name="pref_layout_e_custom">Pielāgots izkārtojums</string>
   <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
   <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
-  <string name="pref_accents_title">Uzsvara zīmes</string>
-  <string name="pref_accents_e_all_installed">Rādīt uzsvara zīmes visām uzstādītajām valodām</string>
-  <string name="pref_accents_e_selected">Rādīt uzsvara zīmes tikai atlasītajām valodām</string>
-  <string name="pref_accents_e_none">Paslēpt uzsvara zīmes</string>
   <string name="pref_show_numpad_title">Rādīt ciparnīcu</string>
   <string name="pref_show_numpad_never">Nekad</string>
   <string name="pref_show_numpad_landscape">Tikai guleniskajā skatā</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index ef29072..89eff91 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -14,10 +14,6 @@
   <string name="pref_layout_e_custom">Własny układ</string>
   <string name="pref_layouts_add">Dodaj dodatkowy układ</string>
   <string name="pref_layouts_item">Układ %1$d: %2$s</string>
-  <string name="pref_accents_title">Znaki diakrytyczne</string>
-  <string name="pref_accents_e_all_installed">Pokaż znaki diakryt. dla wszystkich zainstalowanych języków</string>
-  <string name="pref_accents_e_selected">Pokaż znaki diakryt. tylko dla wybranego języka</string>
-  <string name="pref_accents_e_none">Ukryj znaki diakrytyczne</string>
   <string name="pref_show_numpad_title">Pokaż klawiaturę numeryczną</string>
   <string name="pref_show_numpad_never">Nigdy</string>
   <string name="pref_show_numpad_landscape">Tylko w orientacji poziomej</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index ce5ccb2..75c4fb5 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -14,10 +14,6 @@
   <string name="pref_layout_e_custom">Layout personalizado</string>
   <string name="pref_layouts_add">Adicione um layout alternativo</string>
   <string name="pref_layouts_item">Layout %1$d: %2$s</string>
-  <string name="pref_accents_title">Acentuação</string>
-  <string name="pref_accents_e_all_installed">Mostrar acentos de todos os idiomas instalados</string>
-  <string name="pref_accents_e_selected">Mostrar acentos apenas do idioma selecionado</string>
-  <string name="pref_accents_e_none">Ocultar acentos</string>
   <string name="pref_show_numpad_title">Mostrar Teclado Numérico</string>
   <string name="pref_show_numpad_never">Nunca</string>
   <string name="pref_show_numpad_landscape">Somente no modo paisagem</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 85d7f99..ccf682f 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -14,10 +14,6 @@
   <string name="pref_layout_e_custom">Aranjament personalizat</string>
   <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
   <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
-  <string name="pref_accents_title">Accente</string>
-  <string name="pref_accents_e_all_installed">Arată accentele pentru toate limbile instalate</string>
-  <string name="pref_accents_e_selected">Aratp accentele doar pentru limba selectată</string>
-  <string name="pref_accents_e_none">Ascunde accentele</string>
   <string name="pref_show_numpad_title">Arată NumPad</string>
   <string name="pref_show_numpad_never">Niciodată</string>
   <string name="pref_show_numpad_landscape">Doar în mod panoramă</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 05eacb4..727c78f 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -14,10 +14,6 @@
   <string name="pref_layout_e_custom">Пользовательская раскладка</string>
   <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
   <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
-  <string name="pref_accents_title">Акцент</string>
-  <string name="pref_accents_e_all_installed">Показывать акценты для всех установленных языков</string>
-  <string name="pref_accents_e_selected">Показывать акценты только для выбранного языка</string>
-  <string name="pref_accents_e_none">Скрыть акценты</string>
   <string name="pref_show_numpad_title">Показывать NumPad</string>
   <string name="pref_show_numpad_never">Никогда</string>
   <string name="pref_show_numpad_landscape">Только в ландшафтном режиме</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 5f7dccf..6f3df29 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -14,10 +14,6 @@
   <!-- <string name="pref_layout_e_custom">Custom layout</string> -->
   <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
   <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
-  <string name="pref_accents_title">Aksanlar</string>
-  <string name="pref_accents_e_all_installed">Yüklü tüm dillerin aksanlarını göster</string>
-  <string name="pref_accents_e_selected">Sadece seçili dilin aksanlarını göster</string>
-  <string name="pref_accents_e_none">Aksanları gizle</string>
   <!-- <string name="pref_show_numpad_title">Show NumPad</string> -->
   <!-- <string name="pref_show_numpad_never">Never</string> -->
   <!-- <string name="pref_show_numpad_landscape">Only in landscape mode</string> -->
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 291af47..707417f 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -14,12 +14,6 @@
   <string name="pref_layout_e_custom">Tùy chỉnh bố cục</string>
   <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
   <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
-  <string name="pref_accents_title">Dấu phụ</string>
-  <string name="pref_accents_e_all_installed">Hiển thị cho các ngôn ngữ đã cài đặt</string>
-  <string name="pref_accents_e_selected">Chỉ hiển thị cho các ngôn ngữ đã chọn</string>
-  <string name="pref_accents_e_none">
-    Ẩn dấu phụ
-  </string>
   <string name="pref_show_numpad_title">Hiện NumPad</string>
   <string name="pref_show_numpad_never">Không bao giờ</string>
   <string name="pref_show_numpad_landscape">Chỉ trong chế độ phong cảnh</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index f80e102..0e77a26 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -14,10 +14,6 @@
   <string name="pref_layout_e_custom">自定义布局</string>
   <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
   <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
-  <string name="pref_accents_title">声调</string>
-  <string name="pref_accents_e_all_installed">显示所有安装的语言的声调符号</string>
-  <string name="pref_accents_e_selected">只显示选择的语言的声调符号</string>
-  <string name="pref_accents_e_none">隐藏声调符号</string>
   <string name="pref_show_numpad_title">显示数字小键盘</string>
   <string name="pref_show_numpad_never">从不</string>
   <string name="pref_show_numpad_landscape">只在横屏显示</string>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 14a536d..2bbb9b6 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string-array name="pref_accents_entries">
-    <item>@string/pref_accents_e_all_installed</item>
-    <item>@string/pref_accents_e_selected</item>
-    <item>@string/pref_accents_e_none</item>
-  </string-array>
   <string-array name="pref_show_numpad_values">
     <item>never</item>
     <item>landscape</item>
@@ -23,11 +18,6 @@
     <item>@string/pref_numpad_layout_e_high_first</item>
     <item>@string/pref_numpad_layout_e_low_first</item>
   </string-array>
-  <string-array name="pref_accents_values">
-    <item>1</item>
-    <item>2</item>
-    <item>4</item>
-  </string-array>
   <string-array name="pref_theme_entries">
     <item>@string/pref_theme_e_system</item>
     <item>@string/pref_theme_e_dark</item>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2a164e0..7ba2a16 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -14,10 +14,6 @@
   <string name="pref_layout_e_custom">Custom layout</string>
   <string name="pref_layouts_add">Add an alternate layout</string>
   <string name="pref_layouts_item">Layout %1$d: %2$s</string>
-  <string name="pref_accents_title">Accents</string>
-  <string name="pref_accents_e_all_installed">Show accents for all installed languages</string>
-  <string name="pref_accents_e_selected">Only show accents for the selected language</string>
-  <string name="pref_accents_e_none">Hide accents</string>
   <string name="pref_show_numpad_title">Show NumPad</string>
   <string name="pref_show_numpad_never">Never</string>
   <string name="pref_show_numpad_landscape">Only in landscape mode</string>
diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index 71d16d4..c670dfb 100644
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@@ -11,7 +11,6 @@
     <CheckBoxPreference android:key="number_row" android:title="@string/pref_number_row_title" android:summary="@string/pref_number_row_summary" android:defaultValue="false"/>
     <ListPreference android:key="show_numpad" android:title="@string/pref_show_numpad_title" android:summary="%s" android:defaultValue="1" android:entries="@array/pref_show_numpad_entries" android:entryValues="@array/pref_show_numpad_values"/>
     <ListPreference android:key="numpad_layout" android:title="@string/pref_numpad_layout" android:summary="%s" android:defaultValue="high_first" android:entries="@array/pref_numpad_layout_entries" android:entryValues="@array/pref_numpad_layout_values"/>
-    <ListPreference android:key="accents" android:title="@string/pref_accents_title" android:summary="%s" android:defaultValue="1" android:entries="@array/pref_accents_entries" android:entryValues="@array/pref_accents_values"/>
   </PreferenceCategory>
   <PreferenceCategory android:title="@string/pref_category_typing">
     <ListPreference android:key="swipe_dist" android:title="@string/pref_swipe_dist_title" android:summary="@string/pref_swipe_dist_summary" android:defaultValue="15" android:entries="@array/pref_swipe_dist_entries" android:entryValues="@array/pref_swipe_dist_values"/>
diff --git a/srcs/juloo.keyboard2/Config.java b/srcs/juloo.keyboard2/Config.java
index 53bd2d2..8a81556 100644
--- a/srcs/juloo.keyboard2/Config.java
+++ b/srcs/juloo.keyboard2/Config.java
@@ -49,7 +49,6 @@ final class Config
   public int keyActivatedOpacity; // 0 - 255
   public boolean double_tap_lock_shift;
   public float characterSize; // Ratio
-  public int accents; // Values are R.values.pref_accents_v_*
   public int theme; // Values are R.style.*
   public boolean autocapitalisation;
   public boolean switch_input_immediate;
@@ -153,7 +152,6 @@ final class Config
     characterSize =
       _prefs.getFloat("character_size", 1.f)
       * characterSizeScale;
-    accents = Integer.valueOf(_prefs.getString("accents", "1"));
     theme = getThemeId(res, _prefs.getString("theme", ""));
     autocapitalisation = _prefs.getBoolean("autocapitalisation", true);
     switch_input_immediate = _prefs.getBoolean("switch_input_immediate", false);
diff --git a/srcs/juloo.keyboard2/Keyboard2.java b/srcs/juloo.keyboard2/Keyboard2.java
index 51026e1..5f7442b 100644
--- a/srcs/juloo.keyboard2/Keyboard2.java
+++ b/srcs/juloo.keyboard2/Keyboard2.java
@@ -124,20 +124,10 @@ public class Keyboard2 extends InputMethodService
   {
     List<InputMethodSubtype> enabled_subtypes = getEnabledSubtypes(imm);
     List<ExtraKeys> extra_keys = new ArrayList<ExtraKeys>();
-    switch (_config.accents)
-    {
-      // '3' was "all accents", now unused
-      case 1: case 3:
-        extra_keys.add(extra_keys_of_subtype(subtype));
-        for (InputMethodSubtype s : enabled_subtypes)
-          extra_keys.add(extra_keys_of_subtype(s));
-        break;
-      case 2:
-        extra_keys.add(extra_keys_of_subtype(subtype));
-        break;
-      case 4: break;
-      default: throw new IllegalArgumentException();
-    }
+    // Gather extra keys from all enabled subtypes
+    extra_keys.add(extra_keys_of_subtype(subtype));
+    for (InputMethodSubtype s : enabled_subtypes)
+      extra_keys.add(extra_keys_of_subtype(s));
     _config.extra_keys_subtype = ExtraKeys.merge(extra_keys);
     if (enabled_subtypes.size() > 1)
       _config.shouldOfferSwitchingToNextInputMethod = true;