diff --git a/app/app.iml b/app/app.iml
deleted file mode 100644
index d031a27..0000000
--- a/app/app.iml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="EnigmAndroid" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="android-gradle" name="Android-Gradle">
-      <configuration>
-        <option name="GRADLE_PROJECT_PATH" value=":app" />
-      </configuration>
-    </facet>
-    <facet type="android" name="Android">
-      <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
-        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <afterSyncTasks>
-          <task>generateDebugSources</task>
-        </afterSyncTasks>
-        <option name="ALLOW_USER_CONFIGURATION" value="false" />
-        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
-        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
-        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
-      <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
-    </content>
-    <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="support-v4-23.1.1" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-23.1.1" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index e186f94..58882d6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,15 +1,15 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.2"
+    compileSdkVersion 25
+    buildToolsVersion "25.0.3"
 
     defaultConfig {
         applicationId "de.vanitasvitae.enigmandroid"
-        minSdkVersion 10
-        targetSdkVersion 23
-        versionCode 15
-        versionName "0.1.9-09.10.2015-beta"
+        minSdkVersion 11
+        targetSdkVersion 25
+        versionCode 16
+        versionName "1.0.0-05.05.2017"
     }
     buildTypes {
         release {
@@ -19,5 +19,5 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:support-v4:23.1.1'
+    compile 'com.android.support:support-v4:25.3.1'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9a0a91b..be4ee4b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -7,7 +7,7 @@
         android:fullBackupContent="false"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
+        android:theme="@style/AppTheme">
         <activity
             android:name=".MainActivity"
             android:label="@string/app_name" >
diff --git a/app/src/main/java/de/vanitasvitae/enigmandroid/layout/LayoutContainer.java b/app/src/main/java/de/vanitasvitae/enigmandroid/layout/LayoutContainer.java
index 37a8083..795e08c 100644
--- a/app/src/main/java/de/vanitasvitae/enigmandroid/layout/LayoutContainer.java
+++ b/app/src/main/java/de/vanitasvitae/enigmandroid/layout/LayoutContainer.java
@@ -139,10 +139,13 @@ public abstract class LayoutContainer
 	void prepareSpinnerAdapter(Spinner view, int resourceID) {
 		MainActivity main = (MainActivity) MainActivity.ActivitySingleton.getInstance().getActivity();
 
-		ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(main, resourceID,
-																			 android.R.layout.simple_spinner_item);
-		adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-		view.setAdapter(adapter);
+		ArrayAdapter<CharSequence> ad = new ArrayAdapter<CharSequence>(main,
+				android.R.layout.simple_spinner_item,
+				main.getResources().getTextArray(resourceID));
+
+		ad.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+		ad.setDropDownViewTheme(main.getTheme());
+		view.setAdapter(ad);
 	}
 
 	/**
@@ -153,10 +156,11 @@ public abstract class LayoutContainer
 	void prepareSpinnerAdapter(Spinner view, Character[] array)
 	{
 		MainActivity main = (MainActivity) MainActivity.ActivitySingleton.getInstance().getActivity();
-		ArrayAdapter<Character> adapter = new ArrayAdapter<>(main.getApplicationContext(),
+		ArrayAdapter<Character> adapter = new ArrayAdapter<>(main,
 															 android.R.layout.simple_spinner_item, array);
 		adapter.setDropDownViewResource(
 				android.R.layout.simple_spinner_dropdown_item);
+		adapter.setDropDownViewTheme(main.getTheme());
 		view.setAdapter(adapter);
 	}
 
diff --git a/app/src/main/res/layout-land/activity_main_d.xml b/app/src/main/res/layout-land/activity_main_d.xml
index d46e755..27e8f09 100644
--- a/app/src/main/res/layout-land/activity_main_d.xml
+++ b/app/src/main/res/layout-land/activity_main_d.xml
@@ -103,14 +103,15 @@
         <Button
             android:layout_width="0dp"
             android:layout_weight="50"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:id="@+id/button_reflector"
             android:text="@string/hint_enigma_reflector_wiring"
+            android:background="@drawable/button_grey"
             tools:ignore="ButtonStyle"/>
         <Button
             android:layout_width="0dp"
             android:layout_weight="50"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:id="@+id/button_crypt"
             android:onClick="doCrypto"
             android:text="@string/button_crypt"
diff --git a/app/src/main/res/layout-land/activity_main_g_k_r_t.xml b/app/src/main/res/layout-land/activity_main_g_k_r_t.xml
index fe3a934..540e494 100644
--- a/app/src/main/res/layout-land/activity_main_g_k_r_t.xml
+++ b/app/src/main/res/layout-land/activity_main_g_k_r_t.xml
@@ -133,7 +133,7 @@
         android:layout_alignParentBottom="true">
         <Button
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:id="@+id/button_crypt"
             android:onClick="doCrypto"
             android:text="@string/button_crypt"
diff --git a/app/src/main/res/layout-land/activity_main_i_m3.xml b/app/src/main/res/layout-land/activity_main_i_m3.xml
index c29b1f9..ae0e078 100644
--- a/app/src/main/res/layout-land/activity_main_i_m3.xml
+++ b/app/src/main/res/layout-land/activity_main_i_m3.xml
@@ -156,16 +156,17 @@
         <Button
             android:layout_width="0dp"
             android:layout_weight="50"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:layout_gravity="bottom"
             android:text="@string/title_plugboard_dialog"
+            android:background="@drawable/button_grey"
             android:id="@+id/button_plugboard"
             tools:ignore="ButtonStyle"/>
 
         <Button
             android:layout_width="0dp"
             android:layout_weight="50"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:layout_gravity="bottom"
             android:id="@+id/button_crypt"
             android:onClick="doCrypto"
diff --git a/app/src/main/res/layout-land/activity_main_m4.xml b/app/src/main/res/layout-land/activity_main_m4.xml
index 9848851..cc10fa9 100644
--- a/app/src/main/res/layout-land/activity_main_m4.xml
+++ b/app/src/main/res/layout-land/activity_main_m4.xml
@@ -180,14 +180,15 @@
         <Button
             android:layout_width="0dp"
             android:layout_weight="50"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:id="@+id/button_plugboard"
             android:text="@string/title_plugboard_dialog"
+            android:background="@drawable/button_grey"
             tools:ignore="ButtonStyle"/>
         <Button
             android:layout_width="0dp"
             android:layout_weight="50"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:id="@+id/button_crypt"
             android:onClick="doCrypto"
             android:text="@string/button_crypt"
diff --git a/app/src/main/res/layout/activity_main_d.xml b/app/src/main/res/layout/activity_main_d.xml
index 935856e..c4435f3 100644
--- a/app/src/main/res/layout/activity_main_d.xml
+++ b/app/src/main/res/layout/activity_main_d.xml
@@ -104,14 +104,15 @@
         <Button
             android:layout_width="0dp"
             android:layout_weight="50"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:id="@+id/button_reflector"
             android:text="@string/hint_enigma_reflector_wiring"
+            android:background="@drawable/button_grey"
             tools:ignore="ButtonStyle"/>
         <Button
             android:layout_width="0dp"
             android:layout_weight="50"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:id="@+id/button_crypt"
             android:onClick="doCrypto"
             android:text="@string/button_crypt"
diff --git a/app/src/main/res/layout/activity_main_i_m3.xml b/app/src/main/res/layout/activity_main_i_m3.xml
index dccb8c2..1b6e717 100644
--- a/app/src/main/res/layout/activity_main_i_m3.xml
+++ b/app/src/main/res/layout/activity_main_i_m3.xml
@@ -174,12 +174,13 @@
             android:layout_weight="50"
             android:text="@string/title_plugboard_dialog"
             android:id="@+id/button_plugboard"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
+            android:background="@drawable/button_grey"
             tools:ignore="ButtonStyle"/>
         <Button
             android:layout_width="0dp"
             android:layout_weight="50"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:id="@+id/button_crypt"
             android:onClick="doCrypto"
             android:text="@string/button_crypt"
diff --git a/app/src/main/res/layout/activity_main_kd.xml b/app/src/main/res/layout/activity_main_kd.xml
index d2ecde5..8359358 100644
--- a/app/src/main/res/layout/activity_main_kd.xml
+++ b/app/src/main/res/layout/activity_main_kd.xml
@@ -152,14 +152,15 @@
         <Button
             android:layout_width="0dp"
             android:layout_weight="50"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:id="@+id/button_reflector"
             android:text="@string/hint_enigma_reflector_wiring"
+            android:background="@drawable/button_grey"
             tools:ignore="ButtonStyle"/>
         <Button
             android:layout_width="0dp"
             android:layout_weight="50"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:id="@+id/button_crypt"
             android:onClick="doCrypto"
             android:text="@string/button_crypt"
diff --git a/app/src/main/res/layout/activity_main_m4.xml b/app/src/main/res/layout/activity_main_m4.xml
index 4e53905..07936e5 100644
--- a/app/src/main/res/layout/activity_main_m4.xml
+++ b/app/src/main/res/layout/activity_main_m4.xml
@@ -178,14 +178,16 @@
         <Button
             android:layout_width="0dp"
             android:layout_weight="50"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:id="@+id/button_plugboard"
             android:text="@string/title_plugboard_dialog"
-            tools:ignore="ButtonStyle"/>
+            android:background="@drawable/button_grey"
+            tools:ignore="ButtonStyle"
+            />
         <Button
             android:layout_width="0dp"
             android:layout_weight="50"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:id="@+id/button_crypt"
             android:onClick="doCrypto"
             android:text="@string/button_crypt"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 224cfaa..a36306d 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,8 +1,4 @@
+
 <resources>
-
-    <!-- Base application theme. -->
-    <style name="AppTheme" parent="android:Theme.Black">
-        <!-- Customize your theme here. -->
-    </style>
-
+    <style name="AppTheme" parent="@android:style/Theme.Holo"/>
 </resources>
diff --git a/build.gradle b/build.gradle
index 54ba3cd..35171ac 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.3'
+        classpath 'com.android.tools.build:gradle:2.3.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 5623dff..75ea45c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Sep 09 18:16:07 CEST 2016
+#Fri May 05 17:06:52 CEST 2017
 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-3.3-all.zip