diff --git a/app/src/main/java/cfpi_fpsi/eu/titanboard/InputView.java b/app/src/main/java/cfpi_fpsi/eu/titanboard/InputView.java
index 51b2935..b8cc7e9 100644
--- a/app/src/main/java/cfpi_fpsi/eu/titanboard/InputView.java
+++ b/app/src/main/java/cfpi_fpsi/eu/titanboard/InputView.java
@@ -75,16 +75,16 @@ public class InputView extends RelativeLayout {
             view.setVisibility(GONE);
         }
 
-        LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(
-                new ContextThemeWrapper(this.getContext(), R.style.InputViewSymbol), null);
+        ContextThemeWrapper wrapper =
+                new ContextThemeWrapper(this.getContext(), R.style.InputViewSymbol);
+        LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(wrapper, null);
 
         if (symbols != null) {
             for (int i = 0; i < symbols.size(); ++i) {
                 TextView view = (TextView) mSymbolsList.getChildAt(i);
 
                 if (view == null) {
-                    view = new TextView(new ContextThemeWrapper(this.getContext(),
-                            R.style.InputViewSymbol), null, R.style.InputViewSymbol);
+                    view = new TextView(wrapper, null, R.style.InputViewSymbol);
                     mSymbolsList.addView(view, lp);
                 }
 
diff --git a/app/src/main/res/xml/keymaps_titan.xml b/app/src/main/res/xml/keymaps_titan.xml
index 212c7ac..8886a47 100644
--- a/app/src/main/res/xml/keymaps_titan.xml
+++ b/app/src/main/res/xml/keymaps_titan.xml
@@ -746,9 +746,10 @@
             <alt value="!" />
         </key>
     </keymap>
-    <!-- Modern Greek, monotonic orthography -->
+    <!-- Greek — mono and polytonic -->
     <!-- https://en.wikipedia.org/wiki/List_of_QWERTY_keyboard_language_variants#/media/File:Greek_keyboard_mono_3b.png -->
-    <!-- TODO: add diacritics -->
+    <!-- This differs a bit from the above layout, because the Titan keyboard already has : under
+         the alt key. The Q key is reused for diacritics. -->
     <keymap
         name="el"
         latched-name="El"
@@ -858,8 +859,11 @@
             <alt value="0" />
         </key>
         <key code="45"> <!-- Q -->
-            <base value=";" />
-            <shift value=":" />
+            <base value="́" /> <!-- Acute accent -->
+            <base value="̂" /> <!-- Circumflex -->
+            <base value="̀" /> <!-- Grave accent -->
+            <base value="̔" /> <!-- Rough breathing -->
+            <base value="̓" /> <!-- Smooth breathing -->
             <alt value=":" />
             <alt value=";" />
         </key>