diff --git a/app/build.gradle b/app/build.gradle
index d617e20..11e8a6c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,12 +1,11 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25"
+    compileSdkVersion 26
     defaultConfig {
         applicationId "om.sstvencoder"
         minSdkVersion 15
-        targetSdkVersion 25
+        targetSdkVersion 26
         versionCode 22
         versionName "2.1"
     }
@@ -20,5 +19,6 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:25.1.1'
+    compile 'com.android.support:appcompat-v7:26.1.0'
+    compile "com.android.support:exifinterface:26.1.0"
 }
diff --git a/app/src/main/java/om/sstvencoder/ColorFragment.java b/app/src/main/java/om/sstvencoder/ColorFragment.java
index 411cde6..fb4d174 100644
--- a/app/src/main/java/om/sstvencoder/ColorFragment.java
+++ b/app/src/main/java/om/sstvencoder/ColorFragment.java
@@ -64,7 +64,7 @@ public class ColorFragment extends DialogFragment
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
         View view = getActivity().getLayoutInflater().inflate(R.layout.fragment_color, null);
-        ColorPaletteView colorView = (ColorPaletteView) view.findViewById(R.id.select_color);
+        ColorPaletteView colorView = view.findViewById(R.id.select_color);
         colorView.setColor(mColor);
         colorView.addOnColorSelectedListener(this);
         builder.setTitle(mTitle);
diff --git a/app/src/main/java/om/sstvencoder/CropView.java b/app/src/main/java/om/sstvencoder/CropView.java
index d6c43a7..1396002 100644
--- a/app/src/main/java/om/sstvencoder/CropView.java
+++ b/app/src/main/java/om/sstvencoder/CropView.java
@@ -26,11 +26,11 @@ import android.graphics.Rect;
 import android.graphics.RectF;
 import android.support.annotation.NonNull;
 import android.support.v4.view.GestureDetectorCompat;
+import android.support.v7.widget.AppCompatImageView;
 import android.util.AttributeSet;
 import android.view.GestureDetector;
 import android.view.MotionEvent;
 import android.view.ScaleGestureDetector;
-import android.widget.ImageView;
 
 import java.io.BufferedInputStream;
 import java.io.IOException;
@@ -40,7 +40,7 @@ import om.sstvencoder.ModeInterfaces.ModeSize;
 import om.sstvencoder.TextOverlay.Label;
 import om.sstvencoder.TextOverlay.LabelCollection;
 
-public class CropView extends ImageView {
+public class CropView extends AppCompatImageView {
     private class GestureListener extends GestureDetector.SimpleOnGestureListener {
         @Override
         public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) {
diff --git a/app/src/main/java/om/sstvencoder/EditTextActivity.java b/app/src/main/java/om/sstvencoder/EditTextActivity.java
index 4a67384..c12c096 100644
--- a/app/src/main/java/om/sstvencoder/EditTextActivity.java
+++ b/app/src/main/java/om/sstvencoder/EditTextActivity.java
@@ -63,9 +63,9 @@ public class EditTextActivity extends AppCompatActivity
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_edit_text);
         mEditColor = EditColorMode.None;
-        mEditBold = (CheckBox) findViewById(R.id.edit_bold);
-        mEditItalic = (CheckBox) findViewById(R.id.edit_italic);
-        mEditOutline = (CheckBox) findViewById(R.id.edit_outline);
+        mEditBold = findViewById(R.id.edit_bold);
+        mEditItalic = findViewById(R.id.edit_italic);
+        mEditOutline = findViewById(R.id.edit_outline);
     }
 
     @Override
@@ -86,7 +86,7 @@ public class EditTextActivity extends AppCompatActivity
     }
 
     private void initText() {
-        EditText editText = (EditText) findViewById(R.id.edit_text);
+        EditText editText = findViewById(R.id.edit_text);
         int clearTextIcon = android.R.drawable.ic_menu_close_clear_cancel;
         Drawable drawable = ContextCompat.getDrawable(this, clearTextIcon);
         editText.setText(mLabel.getText());
@@ -146,7 +146,7 @@ public class EditTextActivity extends AppCompatActivity
     }
 
     private void initFontFamilySpinner(String familyName) {
-        Spinner spinner = (Spinner) findViewById(R.id.edit_font_family);
+        Spinner spinner = findViewById(R.id.edit_font_family);
         spinner.setOnItemSelectedListener(this);
         mFontFamilySet = new FontFamilySet();
         mSelectedFontFamily = mFontFamilySet.getFontFamily(familyName);
@@ -157,7 +157,7 @@ public class EditTextActivity extends AppCompatActivity
     }
 
     private void initTextSizeSpinner(float textSize) {
-        Spinner spinner = (Spinner) findViewById(R.id.edit_text_size);
+        Spinner spinner = findViewById(R.id.edit_text_size);
         spinner.setOnItemSelectedListener(this);
         String[] sizeList = new String[]{"Small", "Normal", "Large", "Huge"};
         spinner.setAdapter(new ArrayAdapter<>(this,
@@ -166,7 +166,7 @@ public class EditTextActivity extends AppCompatActivity
     }
 
     private void initOutlineSizeSpinner(float outlineSize) {
-        Spinner spinner = (Spinner) findViewById(R.id.edit_outline_size);
+        Spinner spinner = findViewById(R.id.edit_outline_size);
         spinner.setOnItemSelectedListener(this);
         String[] sizeList = new String[]{"Thin", "Normal", "Thick"};
         spinner.setAdapter(new ArrayAdapter<>(this,
diff --git a/app/src/main/java/om/sstvencoder/MainActivity.java b/app/src/main/java/om/sstvencoder/MainActivity.java
index 427584d..f774b19 100644
--- a/app/src/main/java/om/sstvencoder/MainActivity.java
+++ b/app/src/main/java/om/sstvencoder/MainActivity.java
@@ -24,7 +24,7 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.database.Cursor;
-import android.media.ExifInterface;
+import android.support.media.ExifInterface;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -65,7 +65,7 @@ public class MainActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-        mCropView = (CropView) findViewById(R.id.cropView);
+        mCropView = findViewById(R.id.cropView);
         mEncoder = new Encoder(new MainActivityMessenger(this), getProgressBar(), getProgressBar2());
 
         mSettings = new Settings(this);
@@ -79,14 +79,14 @@ public class MainActivity extends AppCompatActivity {
     }
 
     private ProgressBarWrapper getProgressBar() {
-        ProgressBar progressBar = (ProgressBar) findViewById(R.id.progressBar);
-        TextView progressBarText = (TextView) findViewById(R.id.progressBarText);
+        ProgressBar progressBar = findViewById(R.id.progressBar);
+        TextView progressBarText = findViewById(R.id.progressBarText);
         return new ProgressBarWrapper(progressBar, progressBarText);
     }
 
     private ProgressBarWrapper getProgressBar2() {
-        ProgressBar progressBar = (ProgressBar) findViewById(R.id.progressBar2);
-        TextView progressBarText = (TextView) findViewById(R.id.progressBarText2);
+        ProgressBar progressBar = findViewById(R.id.progressBar2);
+        TextView progressBarText = findViewById(R.id.progressBarText2);
         return new ProgressBarWrapper(progressBar, progressBarText);
     }
 
diff --git a/app/src/main/java/om/sstvencoder/Utility.java b/app/src/main/java/om/sstvencoder/Utility.java
index d02c61b..13097f1 100644
--- a/app/src/main/java/om/sstvencoder/Utility.java
+++ b/app/src/main/java/om/sstvencoder/Utility.java
@@ -19,7 +19,7 @@ import android.content.ContentValues;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Rect;
-import android.media.ExifInterface;
+import android.support.media.ExifInterface;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Environment;
diff --git a/app/src/main/res/layout/activity_edit_text.xml b/app/src/main/res/layout/activity_edit_text.xml
index 4e07742..d3e784c 100644
--- a/app/src/main/res/layout/activity_edit_text.xml
+++ b/app/src/main/res/layout/activity_edit_text.xml
@@ -71,6 +71,7 @@
                 style="?android:attr/listSeparatorTextViewStyle"
                 android:layout_span="2"
                 android:clickable="true"
+                android:focusable="true"
                 android:onClick="onOutlineClick"
                 android:text="@string/outline"/>
 
@@ -105,6 +106,7 @@
 
             <LinearLayout
                 android:clickable="true"
+                android:focusable="true"
                 android:onClick="onColorClick">
 
                 <View
@@ -114,6 +116,7 @@
                     android:layout_margin="6sp"
                     android:background="@android:color/white"
                     android:clickable="true"
+                    android:focusable="true"
                     android:onClick="onColorClick"/>
 
             </LinearLayout>
@@ -127,6 +130,7 @@
 
             <LinearLayout
                 android:clickable="true"
+                android:focusable="true"
                 android:onClick="onOutlineColorClick">
 
                 <View
@@ -136,6 +140,7 @@
                     android:layout_margin="6sp"
                     android:background="@android:color/white"
                     android:clickable="true"
+                    android:focusable="true"
                     android:onClick="onOutlineColorClick"/>
 
             </LinearLayout>
diff --git a/app/src/main/res/xml/paths.xml b/app/src/main/res/xml/paths.xml
index a29a846..782c760 100644
--- a/app/src/main/res/xml/paths.xml
+++ b/app/src/main/res/xml/paths.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<paths xmlns:android="http://schemas.android.com/apk/res/android">
+<paths>
     <external-path
         name="media"
         path="."/>
diff --git a/build.gradle b/build.gradle
index 74b2ab0..7e01a0a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,9 +3,10 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.android.tools.build:gradle:3.0.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -15,6 +16,7 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        google()
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 04e285f..f17b867 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Dec 28 10:00:20 PST 2015
+#Tue Feb 27 20:24:42 CET 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip