diff --git a/app/build.gradle b/app/build.gradle
index c23f4fd..92285ee 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,7 +16,8 @@ android {
 
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
+            shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
diff --git a/app/src/main/java/cfpi_fpsi/eu/titanboard/TitanboardIME.java b/app/src/main/java/cfpi_fpsi/eu/titanboard/TitanboardIME.java
index 48fc514..ce6aec5 100644
--- a/app/src/main/java/cfpi_fpsi/eu/titanboard/TitanboardIME.java
+++ b/app/src/main/java/cfpi_fpsi/eu/titanboard/TitanboardIME.java
@@ -16,6 +16,7 @@ import java.util.HashMap;
 public class TitanboardIME extends InputMethodService implements KeyboardView.OnKeyboardActionListener {
     private HashMap<Integer, int[]> mKeymap;
 
+    private boolean mAutoCapsOn = true;
     private boolean mShiftOn = false;
     private boolean mAltOn = false;
 
@@ -116,10 +117,10 @@ public class TitanboardIME extends InputMethodService implements KeyboardView.On
                 // And we send the character to the app.
                 int[] key = mKeymap.get(keyCode);
                 if (key != null) {
-                    if (mAltOn) {
+                    if (mAltOn || event.isAltPressed()) {
                         conn.commitText(new String(Character.toChars(key[1])), 1);
                         mAltOn = false;
-                    } else if (mShiftOn) {
+                    } else if (mShiftOn || event.isShiftPressed()) {
                         conn.commitText(new String(Character.toChars(key[0])).toUpperCase(), 1);
                         mShiftOn = false;
                     } else {