diff --git a/app/src/main/java/io/github/sspanak/tt9/ui/Vibration.java b/app/src/main/java/io/github/sspanak/tt9/ui/Vibration.java
index d0fa0c6e..efd3308f 100644
--- a/app/src/main/java/io/github/sspanak/tt9/ui/Vibration.java
+++ b/app/src/main/java/io/github/sspanak/tt9/ui/Vibration.java
@@ -8,7 +8,7 @@ import androidx.annotation.NonNull;
 
 import io.github.sspanak.tt9.preferences.settings.SettingsStore;
 import io.github.sspanak.tt9.ui.main.keys.SoftKey;
-import io.github.sspanak.tt9.ui.main.keys.SoftNumberKey;
+import io.github.sspanak.tt9.ui.main.keys.SoftKeyNumber;
 
 public class Vibration {
 	@NonNull private final SettingsStore settings;
@@ -24,7 +24,7 @@ public class Vibration {
 	}
 
 	public static int getPressVibration(SoftKey key) {
-		return key instanceof SoftNumberKey ? HapticFeedbackConstants.KEYBOARD_TAP : HapticFeedbackConstants.VIRTUAL_KEY;
+		return key instanceof SoftKeyNumber ? HapticFeedbackConstants.KEYBOARD_TAP : HapticFeedbackConstants.VIRTUAL_KEY;
 	}
 
 	public static int getHoldVibration() {
diff --git a/app/src/main/java/io/github/sspanak/tt9/ui/main/MainLayoutNumpad.java b/app/src/main/java/io/github/sspanak/tt9/ui/main/MainLayoutNumpad.java
index 2c6745da..391e595a 100644
--- a/app/src/main/java/io/github/sspanak/tt9/ui/main/MainLayoutNumpad.java
+++ b/app/src/main/java/io/github/sspanak/tt9/ui/main/MainLayoutNumpad.java
@@ -15,11 +15,11 @@ import java.util.Arrays;
 import io.github.sspanak.tt9.R;
 import io.github.sspanak.tt9.hacks.DeviceInfo;
 import io.github.sspanak.tt9.ime.TraditionalT9;
-import io.github.sspanak.tt9.ui.main.keys.SoftCommandKey;
 import io.github.sspanak.tt9.ui.main.keys.SoftKey;
+import io.github.sspanak.tt9.ui.main.keys.SoftKeyFn;
+import io.github.sspanak.tt9.ui.main.keys.SoftKeyNumber;
+import io.github.sspanak.tt9.ui.main.keys.SoftKeyPunctuation;
 import io.github.sspanak.tt9.ui.main.keys.SoftKeySettings;
-import io.github.sspanak.tt9.ui.main.keys.SoftNumberKey;
-import io.github.sspanak.tt9.ui.main.keys.SoftPunctuationKey;
 
 class MainLayoutNumpad extends BaseMainLayout {
 	private boolean isTextEditingShown = false;
@@ -95,15 +95,15 @@ class MainLayoutNumpad extends BaseMainLayout {
 
 			if (keyId == R.id.soft_key_0) {
 				key.setEnabled(tt9 != null && !tt9.isInputModeNumeric());
-			} else if (key.getClass().equals(SoftNumberKey.class)) {
+			} else if (key.getClass().equals(SoftKeyNumber.class)) {
 				key.setVisibility(View.GONE);
 			}
 
-			if (key.getClass().equals(SoftPunctuationKey.class)) {
+			if (key.getClass().equals(SoftKeyPunctuation.class)) {
 				key.setVisibility(View.INVISIBLE);
 			}
 
-			if (key.getClass().equals(SoftCommandKey.class)) {
+			if (key.getClass().equals(SoftKeyFn.class)) {
 				key.setVisibility(View.VISIBLE);
 			}
 
@@ -127,12 +127,12 @@ class MainLayoutNumpad extends BaseMainLayout {
 		isTextEditingShown = false;
 
 		for (SoftKey key : getKeys()) {
-			if (key.getClass().equals(SoftNumberKey.class) || key.getClass().equals(SoftPunctuationKey.class)) {
+			if (key.getClass().equals(SoftKeyNumber.class) || key.getClass().equals(SoftKeyPunctuation.class)) {
 				key.setVisibility(View.VISIBLE);
 				key.setEnabled(true);
 			}
 
-			if (key.getClass().equals(SoftCommandKey.class)) {
+			if (key.getClass().equals(SoftKeyFn.class)) {
 				key.setVisibility(View.GONE);
 			}
 
diff --git a/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftBackspaceKey.java b/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyBackspace.java
similarity index 87%
rename from app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftBackspaceKey.java
rename to app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyBackspace.java
index 733133c1..9f9989dc 100644
--- a/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftBackspaceKey.java
+++ b/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyBackspace.java
@@ -8,18 +8,18 @@ import io.github.sspanak.tt9.R;
 import io.github.sspanak.tt9.languages.LanguageKind;
 import io.github.sspanak.tt9.ui.Vibration;
 
-public class SoftBackspaceKey extends SoftKey {
+public class SoftKeyBackspace extends SoftKey {
 	private int repeat = 0;
 
-	public SoftBackspaceKey(Context context) {
+	public SoftKeyBackspace(Context context) {
 		super(context);
 	}
 
-	public SoftBackspaceKey(Context context, AttributeSet attrs) {
+	public SoftKeyBackspace(Context context, AttributeSet attrs) {
 		super(context, attrs);
 	}
 
-	public SoftBackspaceKey(Context context, AttributeSet attrs, int defStyleAttr) {
+	public SoftKeyBackspace(Context context, AttributeSet attrs, int defStyleAttr) {
 		super(context, attrs, defStyleAttr);
 	}
 
diff --git a/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyF3.java b/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyF3.java
index aafd4ca8..ba882ded 100644
--- a/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyF3.java
+++ b/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyF3.java
@@ -3,7 +3,7 @@ package io.github.sspanak.tt9.ui.main.keys;
 import android.content.Context;
 import android.util.AttributeSet;
 
-public class SoftKeyF3 extends SoftCommandKey {
+public class SoftKeyF3 extends SoftKeyFn {
 	public SoftKeyF3(Context context) {
 		super(context);
 	}
diff --git a/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyF5.java b/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyF5.java
index cb793f54..d4a698cd 100644
--- a/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyF5.java
+++ b/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyF5.java
@@ -6,7 +6,7 @@ import android.util.AttributeSet;
 import io.github.sspanak.tt9.R;
 import io.github.sspanak.tt9.util.Characters;
 
-public class SoftKeyF5 extends SoftCommandKey {
+public class SoftKeyF5 extends SoftKeyFn {
 	public SoftKeyF5(Context context) {
 		super(context);
 	}
diff --git a/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftFilterKey.java b/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyFilter.java
similarity index 83%
rename from app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftFilterKey.java
rename to app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyFilter.java
index ecaa0827..65a21a78 100644
--- a/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftFilterKey.java
+++ b/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyFilter.java
@@ -6,10 +6,10 @@ import android.util.AttributeSet;
 import io.github.sspanak.tt9.preferences.settings.SettingsStore;
 import io.github.sspanak.tt9.ui.Vibration;
 
-public class SoftFilterKey extends SoftKey {
-	public SoftFilterKey(Context context) { super(context); setFontSize(); }
-	public SoftFilterKey(Context context, AttributeSet attrs) { super(context, attrs); setFontSize(); }
-	public SoftFilterKey(Context context, AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); setFontSize(); }
+public class SoftKeyFilter extends SoftKey {
+	public SoftKeyFilter(Context context) { super(context); setFontSize(); }
+	public SoftKeyFilter(Context context, AttributeSet attrs) { super(context, attrs); setFontSize(); }
+	public SoftKeyFilter(Context context, AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); setFontSize(); }
 
 	private void setFontSize() {
 		complexLabelTitleSize = SettingsStore.SOFT_KEY_COMPLEX_LABEL_TITLE_RELATIVE_SIZE / 0.85f;
diff --git a/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftCommandKey.java b/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyFn.java
similarity index 88%
rename from app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftCommandKey.java
rename to app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyFn.java
index 0d0c7d9c..5d8d373f 100644
--- a/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftCommandKey.java
+++ b/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyFn.java
@@ -13,10 +13,10 @@ import io.github.sspanak.tt9.R;
 import io.github.sspanak.tt9.preferences.settings.SettingsStore;
 import io.github.sspanak.tt9.util.Characters;
 
-public class SoftCommandKey extends SoftNumberKey {
-	public SoftCommandKey(Context context) { super(context);}
-	public SoftCommandKey(Context context, AttributeSet attrs) { super(context, attrs);}
-	public SoftCommandKey(Context context, AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr);}
+public class SoftKeyFn extends SoftKeyNumber {
+	public SoftKeyFn(Context context) { super(context);}
+	public SoftKeyFn(Context context, AttributeSet attrs) { super(context, attrs);}
+	public SoftKeyFn(Context context, AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr);}
 
 
 	@Override protected void handleHold() {
diff --git a/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftInputModeKey.java b/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyInputMode.java
similarity index 78%
rename from app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftInputModeKey.java
rename to app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyInputMode.java
index 6630d5f9..66ba3e1c 100644
--- a/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftInputModeKey.java
+++ b/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyInputMode.java
@@ -6,16 +6,16 @@ import android.util.AttributeSet;
 import io.github.sspanak.tt9.R;
 import io.github.sspanak.tt9.ui.Vibration;
 
-public class SoftInputModeKey extends SoftKey {
-	public SoftInputModeKey(Context context) {
+public class SoftKeyInputMode extends SoftKey {
+	public SoftKeyInputMode(Context context) {
 		super(context);
 	}
 
-	public SoftInputModeKey(Context context, AttributeSet attrs) {
+	public SoftKeyInputMode(Context context, AttributeSet attrs) {
 		super(context, attrs);
 	}
 
-	public SoftInputModeKey(Context context, AttributeSet attrs, int defStyleAttr) {
+	public SoftKeyInputMode(Context context, AttributeSet attrs, int defStyleAttr) {
 		super(context, attrs, defStyleAttr);
 	}
 
diff --git a/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftNumberKey.java b/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyNumber.java
similarity index 93%
rename from app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftNumberKey.java
rename to app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyNumber.java
index ac6206ad..1225e256 100644
--- a/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftNumberKey.java
+++ b/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyNumber.java
@@ -15,16 +15,16 @@ import io.github.sspanak.tt9.preferences.settings.SettingsStore;
 import io.github.sspanak.tt9.ui.Vibration;
 import io.github.sspanak.tt9.util.Logger;
 
-public class SoftNumberKey extends SoftKey {
-	public SoftNumberKey(Context context) {
+public class SoftKeyNumber extends SoftKey {
+	public SoftKeyNumber(Context context) {
 		super(context);
 	}
 
-	public SoftNumberKey(Context context, AttributeSet attrs) {
+	public SoftKeyNumber(Context context, AttributeSet attrs) {
 		super(context, attrs);
 	}
 
-	public SoftNumberKey(Context context, AttributeSet attrs, int defStyleAttr) {
+	public SoftKeyNumber(Context context, AttributeSet attrs, int defStyleAttr) {
 		super(context, attrs, defStyleAttr);
 	}
 
@@ -103,7 +103,7 @@ public class SoftNumberKey extends SoftKey {
 		// 2-9
 		Language language = tt9.getLanguage();
 		if (language == null) {
-			Logger.d("SoftNumberKey.getLabel", "Cannot generate a label when the language is NULL.");
+			Logger.d("SoftKeyNumber.getLabel", "Cannot generate a label when the language is NULL.");
 			return "";
 		}
 
diff --git a/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftOkKey.java b/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyOk.java
similarity index 77%
rename from app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftOkKey.java
rename to app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyOk.java
index abb3f10b..5513ab67 100644
--- a/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftOkKey.java
+++ b/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyOk.java
@@ -4,17 +4,17 @@ import android.content.Context;
 import android.util.AttributeSet;
 import android.view.KeyEvent;
 
-public class SoftOkKey extends SoftKey {
+public class SoftKeyOk extends SoftKey {
 
-	public SoftOkKey(Context context) {
+	public SoftKeyOk(Context context) {
 		super(context);
 	}
 
-	public SoftOkKey(Context context, AttributeSet attrs) {
+	public SoftKeyOk(Context context, AttributeSet attrs) {
 		super(context, attrs);
 	}
 
-	public SoftOkKey(Context context, AttributeSet attrs, int defStyleAttr) {
+	public SoftKeyOk(Context context, AttributeSet attrs, int defStyleAttr) {
 		super(context, attrs, defStyleAttr);
 	}
 
diff --git a/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftPunctuationKey.java b/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyPunctuation.java
similarity index 84%
rename from app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftPunctuationKey.java
rename to app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyPunctuation.java
index 684fb60f..2ef904bb 100644
--- a/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftPunctuationKey.java
+++ b/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyPunctuation.java
@@ -6,16 +6,16 @@ import android.util.AttributeSet;
 import io.github.sspanak.tt9.R;
 import io.github.sspanak.tt9.languages.LanguageKind;
 
-public class SoftPunctuationKey extends SoftKey {
-	public SoftPunctuationKey(Context context) {
+public class SoftKeyPunctuation extends SoftKey {
+	public SoftKeyPunctuation(Context context) {
 		super(context);
 	}
 
-	public SoftPunctuationKey(Context context, AttributeSet attrs) {
+	public SoftKeyPunctuation(Context context, AttributeSet attrs) {
 		super(context, attrs);
 	}
 
-	public SoftPunctuationKey(Context context, AttributeSet attrs, int defStyleAttr) {
+	public SoftKeyPunctuation(Context context, AttributeSet attrs, int defStyleAttr) {
 		super(context, attrs, defStyleAttr);
 	}
 
diff --git a/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyTextEdit.java b/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyTextEdit.java
deleted file mode 100644
index 4c0c7e38..00000000
--- a/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyTextEdit.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package io.github.sspanak.tt9.ui.main.keys;
-
-import android.content.Context;
-import android.content.res.ColorStateList;
-import android.graphics.drawable.Drawable;
-import android.os.Build;
-import android.util.AttributeSet;
-
-import androidx.core.graphics.drawable.DrawableCompat;
-import androidx.core.widget.TextViewCompat;
-
-import io.github.sspanak.tt9.R;
-
-public class SoftKeyTextEdit extends SoftNumberKey {
-	public SoftKeyTextEdit(Context context) {
-		super(context);
-	}
-
-	public SoftKeyTextEdit(Context context, AttributeSet attrs) {
-		super(context, attrs);
-	}
-
-	public SoftKeyTextEdit(Context context, AttributeSet attrs, int defStyleAttr) {
-		super(context, attrs, defStyleAttr);
-	}
-
-	@Override
-	public void setDarkTheme(boolean darkEnabled) {
-		super.setDarkTheme(darkEnabled);
-
-		final int color = darkEnabled ? R.color.dark_button_text : R.color.button_text;
-
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-			TextViewCompat.setCompoundDrawableTintList(this, ColorStateList.valueOf(getContext().getColor(color)));
-		} else {
-			setDarkThemeLegacy(color);
-		}
-	}
-
-
-	private void setDarkThemeLegacy(int color) {
-		Drawable[] icons = getCompoundDrawables();
-
-		if (icons.length >= 4 && icons[3] != null) {
-			Drawable icon = DrawableCompat.wrap(icons[3]);
-			DrawableCompat.setTint(icon, getResources().getColor(color));
-			setCompoundDrawables(null, null, null, icon);
-		}
-	}
-}
diff --git a/app/src/main/res/layout/panel_command_palette.xml b/app/src/main/res/layout/panel_command_palette.xml
index 1e05fce6..c98b7bcb 100644
--- a/app/src/main/res/layout/panel_command_palette.xml
+++ b/app/src/main/res/layout/panel_command_palette.xml
@@ -7,7 +7,7 @@
 	android:layout_height="wrap_content"
 	android:orientation="horizontal">
 
-	<io.github.sspanak.tt9.ui.main.keys.SoftCommandKey
+	<io.github.sspanak.tt9.ui.main.keys.SoftKeyFn
 		android:id="@+id/soft_key_1"
 		style="@android:style/Widget.Holo.Button.Borderless"
 		android:layout_width="0dp"
@@ -19,7 +19,7 @@
 		android:id="@+id/separator_1_1"
 		style="@style/numSeparator" />
 
-	<io.github.sspanak.tt9.ui.main.keys.SoftCommandKey
+	<io.github.sspanak.tt9.ui.main.keys.SoftKeyFn
 		android:id="@+id/soft_key_2"
 		style="@android:style/Widget.Holo.Button.Borderless"
 		android:layout_width="0dp"
@@ -55,7 +55,7 @@
 		android:id="@+id/separator_2_2"
 		style="@style/numSeparator" />
 
-	<io.github.sspanak.tt9.ui.main.keys.SoftCommandKey
+	<io.github.sspanak.tt9.ui.main.keys.SoftKeyFn
 		android:id="@+id/soft_key_8"
 		style="@android:style/Widget.Holo.Button.Borderless"
 		android:layout_width="0dp"
diff --git a/app/src/main/res/layout/panel_numpad.xml b/app/src/main/res/layout/panel_numpad.xml
index 12624fd1..77fe6684 100644
--- a/app/src/main/res/layout/panel_numpad.xml
+++ b/app/src/main/res/layout/panel_numpad.xml
@@ -40,7 +40,7 @@
 			android:id="@+id/separator_1_2"
 			style="@style/numSeparator" />
 
-		<io.github.sspanak.tt9.ui.main.keys.SoftBackspaceKey
+		<io.github.sspanak.tt9.ui.main.keys.SoftKeyBackspace
 			android:id="@+id/soft_key_backspace"
 			style="@android:style/Widget.Holo.Button.Borderless"
 			android:layout_width="0dp"
@@ -81,7 +81,7 @@
 			android:id="@+id/separator_2_2"
 			style="@style/numSeparator" />
 
-		<io.github.sspanak.tt9.ui.main.keys.SoftFilterKey
+		<io.github.sspanak.tt9.ui.main.keys.SoftKeyFilter
 			android:id="@+id/soft_key_filter_suggestions"
 			style="@android:style/Widget.Holo.Button.Borderless"
 			android:layout_width="0dp"
@@ -97,7 +97,7 @@
 		android:layout_height="@dimen/numpad_key_height"
 		android:layoutDirection="ltr">
 
-		<io.github.sspanak.tt9.ui.main.keys.SoftInputModeKey
+		<io.github.sspanak.tt9.ui.main.keys.SoftKeyInputMode
 			android:id="@+id/soft_key_input_mode"
 			style="@android:style/Widget.Holo.Button.Borderless"
 			android:layout_width="0dp"
@@ -160,7 +160,7 @@
 			android:id="@+id/separator_4_2"
 			style="@style/numSeparator" />
 
-		<io.github.sspanak.tt9.ui.main.keys.SoftOkKey
+		<io.github.sspanak.tt9.ui.main.keys.SoftKeyOk
 			android:id="@+id/soft_key_ok"
 			style="@android:style/Widget.Holo.Button.Borderless"
 			tools:ignore="ButtonOrder"
diff --git a/app/src/main/res/layout/panel_numpad_row_1.xml b/app/src/main/res/layout/panel_numpad_row_1.xml
index b50a2d8d..f1e0d1ea 100644
--- a/app/src/main/res/layout/panel_numpad_row_1.xml
+++ b/app/src/main/res/layout/panel_numpad_row_1.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
-	<io.github.sspanak.tt9.ui.main.keys.SoftNumberKey
+	<io.github.sspanak.tt9.ui.main.keys.SoftKeyNumber
 		android:id="@+id/soft_key_1"
 		style="@android:style/Widget.Holo.Button.Borderless"
 		android:layout_width="0dp"
@@ -8,7 +8,7 @@
 		android:layout_weight="1"
 		android:textAppearance="@style/TextAppearance.AppCompat.Large" />
 
-	<io.github.sspanak.tt9.ui.main.keys.SoftNumberKey
+	<io.github.sspanak.tt9.ui.main.keys.SoftKeyNumber
 		android:id="@+id/soft_key_2"
 		style="@android:style/Widget.Holo.Button.Borderless"
 		android:layout_width="0dp"
@@ -16,7 +16,7 @@
 		android:layout_weight="1"
 		android:textAppearance="@style/TextAppearance.AppCompat.Large" />
 
-	<io.github.sspanak.tt9.ui.main.keys.SoftNumberKey
+	<io.github.sspanak.tt9.ui.main.keys.SoftKeyNumber
 		android:id="@+id/soft_key_3"
 		style="@android:style/Widget.Holo.Button.Borderless"
 		android:layout_width="0dp"
diff --git a/app/src/main/res/layout/panel_numpad_row_2.xml b/app/src/main/res/layout/panel_numpad_row_2.xml
index bb98248c..4f8aaeed 100644
--- a/app/src/main/res/layout/panel_numpad_row_2.xml
+++ b/app/src/main/res/layout/panel_numpad_row_2.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
-	<io.github.sspanak.tt9.ui.main.keys.SoftNumberKey
+	<io.github.sspanak.tt9.ui.main.keys.SoftKeyNumber
 		android:id="@+id/soft_key_4"
 		style="@android:style/Widget.Holo.Button.Borderless"
 		android:layout_width="0dp"
@@ -8,7 +8,7 @@
 		android:layout_weight="1"
 		android:textAppearance="@style/TextAppearance.AppCompat.Large" />
 
-	<io.github.sspanak.tt9.ui.main.keys.SoftNumberKey
+	<io.github.sspanak.tt9.ui.main.keys.SoftKeyNumber
 		android:id="@+id/soft_key_5"
 		style="@android:style/Widget.Holo.Button.Borderless"
 		android:layout_width="0dp"
@@ -16,7 +16,7 @@
 		android:layout_weight="1"
 		android:textAppearance="@style/TextAppearance.AppCompat.Large" />
 
-	<io.github.sspanak.tt9.ui.main.keys.SoftNumberKey
+	<io.github.sspanak.tt9.ui.main.keys.SoftKeyNumber
 		android:id="@+id/soft_key_6"
 		style="@android:style/Widget.Holo.Button.Borderless"
 		android:layout_width="0dp"
diff --git a/app/src/main/res/layout/panel_numpad_row_3.xml b/app/src/main/res/layout/panel_numpad_row_3.xml
index 4f7e23e8..be6bfaa6 100644
--- a/app/src/main/res/layout/panel_numpad_row_3.xml
+++ b/app/src/main/res/layout/panel_numpad_row_3.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
-	<io.github.sspanak.tt9.ui.main.keys.SoftNumberKey
+	<io.github.sspanak.tt9.ui.main.keys.SoftKeyNumber
 		android:id="@+id/soft_key_7"
 		style="@android:style/Widget.Holo.Button.Borderless"
 		android:layout_width="0dp"
@@ -8,7 +8,7 @@
 		android:layout_weight="1"
 		android:textAppearance="@style/TextAppearance.AppCompat.Large" />
 
-	<io.github.sspanak.tt9.ui.main.keys.SoftNumberKey
+	<io.github.sspanak.tt9.ui.main.keys.SoftKeyNumber
 		android:id="@+id/soft_key_8"
 		style="@android:style/Widget.Holo.Button.Borderless"
 		android:layout_width="0dp"
@@ -16,7 +16,7 @@
 		android:layout_weight="1"
 		android:textAppearance="@style/TextAppearance.AppCompat.Large" />
 
-	<io.github.sspanak.tt9.ui.main.keys.SoftNumberKey
+	<io.github.sspanak.tt9.ui.main.keys.SoftKeyNumber
 		android:id="@+id/soft_key_9"
 		style="@android:style/Widget.Holo.Button.Borderless"
 		android:layout_width="0dp"
diff --git a/app/src/main/res/layout/panel_numpad_row_4.xml b/app/src/main/res/layout/panel_numpad_row_4.xml
index d1360a18..b3abc37c 100644
--- a/app/src/main/res/layout/panel_numpad_row_4.xml
+++ b/app/src/main/res/layout/panel_numpad_row_4.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
-	<io.github.sspanak.tt9.ui.main.keys.SoftPunctuationKey
+	<io.github.sspanak.tt9.ui.main.keys.SoftKeyPunctuation
 		android:id="@+id/soft_key_punctuation_1"
 		style="@android:style/Widget.Holo.Button.Borderless"
 		android:layout_width="0dp"
@@ -8,7 +8,7 @@
 		android:layout_weight="1"
 		android:textAppearance="@style/TextAppearance.AppCompat.Large" />
 
-	<io.github.sspanak.tt9.ui.main.keys.SoftNumberKey
+	<io.github.sspanak.tt9.ui.main.keys.SoftKeyNumber
 		android:id="@+id/soft_key_0"
 		style="@android:style/Widget.Holo.Button.Borderless"
 		android:layout_width="0dp"
@@ -16,7 +16,7 @@
 		android:layout_weight="1"
 		android:textAppearance="@style/TextAppearance.AppCompat.Large" />
 
-	<io.github.sspanak.tt9.ui.main.keys.SoftPunctuationKey
+	<io.github.sspanak.tt9.ui.main.keys.SoftKeyPunctuation
 		android:id="@+id/soft_key_punctuation_2"
 		style="@android:style/Widget.Holo.Button.Borderless"
 		android:layout_width="0dp"
diff --git a/app/src/main/res/layout/panel_numpad_text_editing_row_1.xml b/app/src/main/res/layout/panel_numpad_text_editing_row_1.xml
index 4a95fcf9..5bad1b07 100644
--- a/app/src/main/res/layout/panel_numpad_text_editing_row_1.xml
+++ b/app/src/main/res/layout/panel_numpad_text_editing_row_1.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
-	<io.github.sspanak.tt9.ui.main.keys.SoftCommandKey
+	<io.github.sspanak.tt9.ui.main.keys.SoftKeyFn
 		android:id="@+id/soft_key_101"
 		style="@android:style/Widget.Holo.Button.Borderless"
 		android:layout_width="0dp"
@@ -11,7 +11,7 @@
 		android:textSize="@dimen/soft_key_drawable_title_size"
 		android:visibility="gone" />
 
-	<io.github.sspanak.tt9.ui.main.keys.SoftCommandKey
+	<io.github.sspanak.tt9.ui.main.keys.SoftKeyFn
 		android:id="@+id/soft_key_102"
 		style="@android:style/Widget.Holo.Button.Borderless"
 		android:layout_width="0dp"
@@ -22,7 +22,7 @@
 		android:textSize="@dimen/soft_key_drawable_title_size"
 		android:visibility="gone" />
 
-	<io.github.sspanak.tt9.ui.main.keys.SoftCommandKey
+	<io.github.sspanak.tt9.ui.main.keys.SoftKeyFn
 		android:id="@+id/soft_key_103"
 		style="@android:style/Widget.Holo.Button.Borderless"
 		android:layout_width="0dp"
diff --git a/app/src/main/res/layout/panel_numpad_text_editing_row_2.xml b/app/src/main/res/layout/panel_numpad_text_editing_row_2.xml
index 898d905d..92ad2847 100644
--- a/app/src/main/res/layout/panel_numpad_text_editing_row_2.xml
+++ b/app/src/main/res/layout/panel_numpad_text_editing_row_2.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
-	<io.github.sspanak.tt9.ui.main.keys.SoftCommandKey
+	<io.github.sspanak.tt9.ui.main.keys.SoftKeyFn
 		android:id="@+id/soft_key_104"
 		style="@android:style/Widget.Holo.Button.Borderless"
 		android:layout_width="0dp"
@@ -11,7 +11,7 @@
 		android:textSize="@dimen/soft_key_drawable_title_size"
 		android:visibility="gone" />
 
-	<io.github.sspanak.tt9.ui.main.keys.SoftCommandKey
+	<io.github.sspanak.tt9.ui.main.keys.SoftKeyFn
 		android:id="@+id/soft_key_105"
 		style="@android:style/Widget.Holo.Button.Borderless"
 		android:layout_width="0dp"
@@ -22,7 +22,7 @@
 		android:textSize="@dimen/soft_key_drawable_title_size"
 		android:visibility="gone" />
 
-	<io.github.sspanak.tt9.ui.main.keys.SoftCommandKey
+	<io.github.sspanak.tt9.ui.main.keys.SoftKeyFn
 		android:id="@+id/soft_key_106"
 		style="@android:style/Widget.Holo.Button.Borderless"
 		android:layout_width="0dp"
diff --git a/app/src/main/res/layout/panel_numpad_text_editing_row_3.xml b/app/src/main/res/layout/panel_numpad_text_editing_row_3.xml
index bf8c38a1..eee0f966 100644
--- a/app/src/main/res/layout/panel_numpad_text_editing_row_3.xml
+++ b/app/src/main/res/layout/panel_numpad_text_editing_row_3.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
-	<io.github.sspanak.tt9.ui.main.keys.SoftCommandKey
+	<io.github.sspanak.tt9.ui.main.keys.SoftKeyFn
 		android:id="@+id/soft_key_107"
 		style="@android:style/Widget.Holo.Button.Borderless"
 		android:layout_width="0dp"
@@ -11,7 +11,7 @@
 		android:textSize="@dimen/soft_key_drawable_title_size"
 		android:visibility="gone" />
 
-	<io.github.sspanak.tt9.ui.main.keys.SoftCommandKey
+	<io.github.sspanak.tt9.ui.main.keys.SoftKeyFn
 		android:id="@+id/soft_key_108"
 		style="@android:style/Widget.Holo.Button.Borderless"
 		android:layout_width="0dp"
@@ -23,7 +23,7 @@
 		android:visibility="gone" />
 
 
-	<io.github.sspanak.tt9.ui.main.keys.SoftCommandKey
+	<io.github.sspanak.tt9.ui.main.keys.SoftKeyFn
 		android:id="@+id/soft_key_109"
 		style="@android:style/Widget.Holo.Button.Borderless"
 		android:layout_width="0dp"
diff --git a/app/src/main/res/layout/panel_small_function_keys.xml b/app/src/main/res/layout/panel_small_function_keys.xml
index 84a50fee..a5772f20 100644
--- a/app/src/main/res/layout/panel_small_function_keys.xml
+++ b/app/src/main/res/layout/panel_small_function_keys.xml
@@ -24,7 +24,7 @@
 		style="@style/hSeparator"
 		android:background="@drawable/button_separator_dark" />
 
-	<io.github.sspanak.tt9.ui.main.keys.SoftOkKey
+	<io.github.sspanak.tt9.ui.main.keys.SoftKeyOk
 		android:id="@+id/soft_key_ok"
 		style="@android:style/Widget.Holo.Button.Borderless"
 		android:layout_width="0dp"
@@ -38,7 +38,7 @@
 		style="@style/hSeparator"
 		android:background="@drawable/button_separator_dark" />
 
-	<io.github.sspanak.tt9.ui.main.keys.SoftBackspaceKey
+	<io.github.sspanak.tt9.ui.main.keys.SoftKeyBackspace
 		android:id="@+id/soft_key_backspace"
 		style="@android:style/Widget.Holo.Button.Borderless"
 		android:layout_width="0dp"
diff --git a/app/src/main/res/layout/panel_small_text_editing.xml b/app/src/main/res/layout/panel_small_text_editing.xml
index 4e371050..8edece53 100644
--- a/app/src/main/res/layout/panel_small_text_editing.xml
+++ b/app/src/main/res/layout/panel_small_text_editing.xml
@@ -7,7 +7,7 @@
 	android:layout_height="@dimen/numpad_key_height"
 	tools:showIn="@layout/main_small">
 
-	<io.github.sspanak.tt9.ui.main.keys.SoftCommandKey
+	<io.github.sspanak.tt9.ui.main.keys.SoftKeyFn
 		android:id="@+id/soft_key_101"
 		style="@android:style/Widget.Holo.Button.Borderless"
 		android:layout_width="0dp"
@@ -21,7 +21,7 @@
 		android:id="@+id/separator_10_1"
 		style="@style/numSeparator" />
 
-	<io.github.sspanak.tt9.ui.main.keys.SoftCommandKey
+	<io.github.sspanak.tt9.ui.main.keys.SoftKeyFn
 		android:id="@+id/soft_key_102"
 		style="@android:style/Widget.Holo.Button.Borderless"
 		android:layout_width="0dp"
@@ -35,7 +35,7 @@
 		android:id="@+id/separator_10_2"
 		style="@style/numSeparator" />
 
-	<io.github.sspanak.tt9.ui.main.keys.SoftCommandKey
+	<io.github.sspanak.tt9.ui.main.keys.SoftKeyFn
 		android:id="@+id/soft_key_103"
 		style="@android:style/Widget.Holo.Button.Borderless"
 		android:layout_width="0dp"
@@ -49,7 +49,7 @@
 		android:id="@+id/separator_10_3"
 		style="@style/numSeparator" />
 
-	<io.github.sspanak.tt9.ui.main.keys.SoftCommandKey
+	<io.github.sspanak.tt9.ui.main.keys.SoftKeyFn
 		android:id="@+id/soft_key_104"
 		style="@android:style/Widget.Holo.Button.Borderless"
 		android:layout_width="0dp"
@@ -63,7 +63,7 @@
 		android:id="@+id/separator_10_4"
 		style="@style/numSeparator" />
 
-	<io.github.sspanak.tt9.ui.main.keys.SoftCommandKey
+	<io.github.sspanak.tt9.ui.main.keys.SoftKeyFn
 		android:id="@+id/soft_key_105"
 		style="@android:style/Widget.Holo.Button.Borderless"
 		android:layout_width="0dp"
@@ -77,7 +77,7 @@
 		android:id="@+id/separator_10_5"
 		style="@style/numSeparator" />
 
-	<io.github.sspanak.tt9.ui.main.keys.SoftCommandKey
+	<io.github.sspanak.tt9.ui.main.keys.SoftKeyFn
 		android:id="@+id/soft_key_106"
 		style="@android:style/Widget.Holo.Button.Borderless"
 		android:layout_width="0dp"
@@ -91,7 +91,7 @@
 		android:id="@+id/separator_10_6"
 		style="@style/numSeparator" />
 
-	<io.github.sspanak.tt9.ui.main.keys.SoftCommandKey
+	<io.github.sspanak.tt9.ui.main.keys.SoftKeyFn
 		android:id="@+id/soft_key_107"
 		style="@android:style/Widget.Holo.Button.Borderless"
 		android:layout_width="0dp"
@@ -105,7 +105,7 @@
 		android:id="@+id/separator_10_7"
 		style="@style/numSeparator" />
 
-	<io.github.sspanak.tt9.ui.main.keys.SoftCommandKey
+	<io.github.sspanak.tt9.ui.main.keys.SoftKeyFn
 		android:id="@+id/soft_key_108"
 		style="@android:style/Widget.Holo.Button.Borderless"
 		android:layout_width="0dp"
@@ -119,7 +119,7 @@
 		android:id="@+id/separator_10_8"
 		style="@style/numSeparator" />
 
-	<io.github.sspanak.tt9.ui.main.keys.SoftCommandKey
+	<io.github.sspanak.tt9.ui.main.keys.SoftKeyFn
 		android:id="@+id/soft_key_109"
 		style="@android:style/Widget.Holo.Button.Borderless"
 		android:layout_width="0dp"