diff --git a/app/src/main/java/com/maxieds/chameleonminilivedebugger/LiveLoggerActivity.java b/app/src/main/java/com/maxieds/chameleonminilivedebugger/LiveLoggerActivity.java
index 4d2e801..c2e89f3 100644
--- a/app/src/main/java/com/maxieds/chameleonminilivedebugger/LiveLoggerActivity.java
+++ b/app/src/main/java/com/maxieds/chameleonminilivedebugger/LiveLoggerActivity.java
@@ -30,7 +30,6 @@
 import android.support.v7.app.NotificationCompat;
 import android.util.Log;
 import android.view.LayoutInflater;
-import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.WindowManager;
@@ -237,17 +236,6 @@ protected void onCreate(Bundle savedInstanceState) {
 
         Toolbar actionBar = (Toolbar) findViewById(R.id.toolbarActionBar);
         actionBar.setSubtitle("Portable logging interface v" + String.valueOf(BuildConfig.VERSION_NAME));
-        if (BuildConfig.PAID_APP_VERSION)
-            actionBar.inflateMenu(R.menu.paid_theme_menu);
-        else
-            actionBar.inflateMenu(R.menu.main_menu);
-        //actionBar.setOnMenuItemClickListener(new Toolbar.OnMenuItemClickListener() {
-        //    @Override
-        //    public boolean onMenuItemClick(MenuItem mitem) {
-        //        return onOptionsItemSelected(mitem);
-        //    }
-        //});
-        //setActionBar(actionBar);
         clearStatusIcon(R.id.statusIconUlDl);
         getWindow().setTitleColor(getThemeColorVariant(R.attr.actionBarBackgroundColor));
         getWindow().setStatusBarColor(getThemeColorVariant(R.attr.colorPrimaryDark));
@@ -365,21 +353,6 @@ public void onPageScrollStateChanged(int state) {
 
     }
 
-    /**
-     * Sets up the themes changer menu in the paid flavor of the app.
-     * @param overflowMenu
-     * @return
-     */
-    @Override
-    public boolean onCreateOptionsMenu(Menu overflowMenu) {
-        //super.onCreateOptionsMenu(overflowMenu);
-        if(BuildConfig.PAID_APP_VERSION)
-            getMenuInflater().inflate(R.menu.paid_theme_menu, overflowMenu);
-        else
-            getMenuInflater().inflate(R.menu.main_menu, overflowMenu);
-        return true;
-    }
-
     /**
      * Sets the local theme (before the ful UI updating to implement the theme change) based on
      * the passed theme text description.
@@ -480,6 +453,7 @@ public void onClick(DialogInterface dialog, int whichBtn) {
 
         });
         dialog.setNegativeButton( "Cancel", null);
+        dialog.setInverseBackgroundForced(true);
         dialog.show();
     }
 
@@ -487,37 +461,6 @@ public boolean onOptionsItemSelectedHelper(View view) {
         return onOptionsItemSelected((MenuItem) view);
     }
 
-    /**
-     * Handles the new theme selections in the paid flavor of the app.
-     * @param mitem
-     * @return
-     */
-    @Override
-    public boolean onOptionsItemSelected(MenuItem mitem) {
-        //super.onOptionsItemSelected(mitem);
-        String themeDesc = mitem.getTitle().toString().substring("Theme: ".length());
-        setLocalTheme(themeDesc);
-
-        // store the theme setting for when the app reopens:
-        SharedPreferences sharedPrefs = getSharedPreferences(LiveLoggerActivity.TAG, Context.MODE_PRIVATE);
-        SharedPreferences.Editor spEditor = sharedPrefs.edit();
-        spEditor.putString("ThemeUI", themeDesc);
-        spEditor.commit();
-
-        // finally, apply the theme settings by (essentially) restarting the activity UI:
-        onCreate(localSavedInstanceState);
-
-        if(selectedThemeMenuItem != null) {
-            selectedThemeMenuItem.setIcon(R.drawable.thememarker24);
-        }
-        mitem.setChecked(true);
-        mitem.setEnabled(true);
-        mitem.setIcon(R.drawable.themecheck24);
-
-        appendNewLog(LogEntryMetadataRecord.createDefaultEventRecord("THEME", "New theme installed: " + themeDesc));
-        return true;
-    }
-
     /**
      * Handles newly attached / detached USB devices.
      * @param intent
diff --git a/app/src/main/res/drawable/binaryfile2.png b/app/src/main/res/drawable/binaryfile2.png
new file mode 100644
index 0000000..c0d644e
Binary files /dev/null and b/app/src/main/res/drawable/binaryfile2.png differ
diff --git a/app/src/main/res/drawable/brainchip.png b/app/src/main/res/drawable/brainchip.png
new file mode 100644
index 0000000..5245f45
Binary files /dev/null and b/app/src/main/res/drawable/brainchip.png differ
diff --git a/app/src/main/res/drawable/bug.png b/app/src/main/res/drawable/bug.png
new file mode 100644
index 0000000..bbfe41c
Binary files /dev/null and b/app/src/main/res/drawable/bug.png differ
diff --git a/app/src/main/res/drawable/chameleonicon512_rainbow.png b/app/src/main/res/drawable/chameleonicon512_rainbow.png
new file mode 100644
index 0000000..4f2d63f
Binary files /dev/null and b/app/src/main/res/drawable/chameleonicon512_rainbow.png differ
diff --git a/app/src/main/res/drawable/chameleonicon64_green.png b/app/src/main/res/drawable/chameleonicon64_green.png
new file mode 100755
index 0000000..d095a68
Binary files /dev/null and b/app/src/main/res/drawable/chameleonicon64_green.png differ
diff --git a/app/src/main/res/drawable/chipbrain2.png b/app/src/main/res/drawable/chipbrain2.png
new file mode 100644
index 0000000..d1da460
Binary files /dev/null and b/app/src/main/res/drawable/chipbrain2.png differ
diff --git a/app/src/main/res/drawable/coding2.png b/app/src/main/res/drawable/coding2.png
new file mode 100644
index 0000000..d118f21
Binary files /dev/null and b/app/src/main/res/drawable/coding2.png differ
diff --git a/app/src/main/res/drawable/ellipsisbracket.png b/app/src/main/res/drawable/ellipsisbracket.png
new file mode 100644
index 0000000..e44ee8c
Binary files /dev/null and b/app/src/main/res/drawable/ellipsisbracket.png differ
diff --git a/app/src/main/res/drawable/programmer2.png b/app/src/main/res/drawable/programmer2.png
new file mode 100644
index 0000000..54f397c
Binary files /dev/null and b/app/src/main/res/drawable/programmer2.png differ
diff --git a/app/src/main/res/drawable/qr.png b/app/src/main/res/drawable/qr.png
new file mode 100644
index 0000000..360d4d9
Binary files /dev/null and b/app/src/main/res/drawable/qr.png differ
diff --git a/app/src/main/res/drawable/settingsgear24.png b/app/src/main/res/drawable/settingsgear24.png
new file mode 100644
index 0000000..845da45
Binary files /dev/null and b/app/src/main/res/drawable/settingsgear24.png differ
diff --git a/app/src/main/res/drawable/settingsgears24.png b/app/src/main/res/drawable/settingsgears24.png
new file mode 100644
index 0000000..9f21b61
Binary files /dev/null and b/app/src/main/res/drawable/settingsgears24.png differ
diff --git a/app/src/main/res/drawable/uploadbutton16.png b/app/src/main/res/drawable/uploadbutton16.png
new file mode 100644
index 0000000..8fac2c7
Binary files /dev/null and b/app/src/main/res/drawable/uploadbutton16.png differ
diff --git a/app/src/main/res/layout/theme_config.xml b/app/src/main/res/layout/theme_config.xml
new file mode 100644
index 0000000..30dfde1
--- /dev/null
+++ b/app/src/main/res/layout/theme_config.xml
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <RadioGroup
+        android:id="@+id/themeRadioGroup"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <RadioButton
+            android:id="@+id/themeRadioButtonAmber"
+            android:buttonTint="?colorPrimaryDark"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:checked="false"
+            android:drawableLeft="@drawable/thememarker24"
+            android:drawablePadding="5dp"
+            android:text="Theme: Amber" />
+
+        <RadioButton
+            android:id="@+id/themeRadioButtonAtlanta"
+            android:buttonTint="?colorPrimaryDark"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:checked="false"
+            android:drawableLeft="@drawable/thememarker24"
+            android:drawablePadding="5dp"
+            android:text="Theme: Atlanta" />
+
+        <RadioButton
+            android:id="@+id/themeRadioButtonBlack"
+            android:buttonTint="?colorPrimaryDark"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:checked="false"
+            android:drawableLeft="@drawable/thememarker24"
+            android:drawablePadding="5dp"
+            android:text="Theme: Black" />
+
+        <RadioButton
+            android:id="@+id/themeRadioButtonBlue"
+            android:buttonTint="?colorPrimaryDark"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:checked="false"
+            android:drawableLeft="@drawable/thememarker24"
+            android:drawablePadding="5dp"
+            android:text="Theme: Blue" />
+
+        <RadioButton
+            android:id="@+id/themeRadioButtonChicky"
+            android:buttonTint="?colorPrimaryDark"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:checked="false"
+            android:drawableLeft="@drawable/thememarker24"
+            android:drawablePadding="5dp"
+            android:text="Theme: Chicky" />
+
+        <RadioButton
+            android:id="@+id/themeRadioButtonChocolate"
+            android:buttonTint="?colorPrimaryDark"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:checked="false"
+            android:drawableLeft="@drawable/thememarker24"
+            android:drawablePadding="5dp"
+            android:text="Theme: Chocolate" />
+
+        <RadioButton
+            android:id="@+id/themeRadioButtonGoldenrod"
+            android:buttonTint="?colorPrimaryDark"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:checked="false"
+            android:drawableLeft="@drawable/thememarker24"
+            android:drawablePadding="5dp"
+            android:text="Theme: Goldenrod" />
+
+        <RadioButton
+            android:id="@+id/themeRadioButtonStdGreen"
+            android:buttonTint="?colorPrimaryDark"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:checked="false"
+            android:drawableLeft="@drawable/thememarker24"
+            android:drawablePadding="5dp"
+            android:text="Theme: Standard Green" />
+
+        <RadioButton
+            android:id="@+id/themeRadioButtonLightblue"
+            android:buttonTint="?colorPrimaryDark"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:checked="false"
+            android:drawableLeft="@drawable/thememarker24"
+            android:drawablePadding="5dp"
+            android:text="Theme: Lightblue" />
+
+        <RadioButton
+            android:id="@+id/themeRadioButtonLinuxGOB"
+            android:buttonTint="?colorPrimaryDark"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:checked="true"
+            android:drawableLeft="@drawable/thememarker24"
+            android:drawablePadding="5dp"
+            android:text="Theme: Linux Green On Black" />
+
+        <RadioButton
+            android:id="@+id/themeRadioButtonPurple"
+            android:buttonTint="?colorPrimaryDark"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:checked="false"
+            android:drawableLeft="@drawable/thememarker24"
+            android:drawablePadding="5dp"
+            android:text="Theme: Purple" />
+
+        <RadioButton
+            android:id="@+id/themeRadioButtonRed"
+            android:buttonTint="?colorPrimaryDark"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:checked="false"
+            android:drawableLeft="@drawable/thememarker24"
+            android:drawablePadding="5dp"
+            android:text="Theme: Red" />
+
+        <RadioButton
+            android:id="@+id/themeRadioButtonRedmond"
+            android:buttonTint="?colorPrimaryDark"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:checked="false"
+            android:drawableLeft="@drawable/thememarker24"
+            android:drawablePadding="5dp"
+            android:text="Theme: Redmond" />
+
+        <RadioButton
+            android:id="@+id/themeRadioButtonTeal"
+            android:buttonTint="?colorPrimaryDark"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:checked="false"
+            android:drawableLeft="@drawable/thememarker24"
+            android:drawablePadding="5dp"
+            android:text="Theme: Teal" />
+
+        <RadioButton
+            android:id="@+id/themeRadioButtonUrbanaDesfire"
+            android:buttonTint="?colorPrimaryDark"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:checked="false"
+            android:drawableLeft="@drawable/thememarker24"
+            android:drawablePadding="5dp"
+            android:text="Theme: Urbana Desfire" />
+
+        <RadioButton
+            android:id="@+id/themeRadioButtonWhite"
+            android:buttonTint="?colorPrimaryDark"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:checked="false"
+            android:drawableLeft="@drawable/thememarker24"
+            android:drawablePadding="5dp"
+            android:text="Theme: White" />
+
+        <RadioButton
+            android:id="@+id/themeRadioButtonWinter"
+            android:buttonTint="?colorPrimaryDark"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:checked="false"
+            android:drawableLeft="@drawable/thememarker24"
+            android:drawablePadding="5dp"
+            android:text="Theme: Winter" />
+
+    </RadioGroup>
+
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/main_menu.xml b/app/src/main/res/menu/main_menu.xml
deleted file mode 100644
index 7138ede..0000000
--- a/app/src/main/res/menu/main_menu.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <item
-        android:alphabeticShortcut="c"
-        android:checkable="false"
-        android:checked="false"
-        android:enabled="true"
-        android:tag="@style/AppThemeChicky"
-        android:title="Theme: Chicky"
-        app:showAsAction="never" />
-
-    <item
-        android:alphabeticShortcut="g"
-        android:checkable="false"
-        android:checked="false"
-        android:enabled="true"
-        android:tag="@style/AppThemeGreen"
-        android:title="Theme: Standard Green"
-        app:showAsAction="never" />
-
-    <item
-        android:checkable="false"
-        android:checked="false"
-        android:enabled="true"
-        android:tag="@style/AppThemeLinuxGreenOnBlack"
-        android:title="Theme: Linux Green On Black"
-        app:showAsAction="never" />
-
-    <item
-        android:checkable="false"
-        android:checked="false"
-        android:enabled="true"
-        android:tag="@style/AppThemeRed"
-        android:title="Theme: Red"
-        app:showAsAction="never" />
-
-    <item
-        android:alphabeticShortcut="w"
-        android:checkable="false"
-        android:checked="false"
-        android:enabled="true"
-        android:tag="@style/AppThemeRedmond"
-        android:title="Theme: Redmond"
-        app:showAsAction="never" />
-
-    <item
-        android:checkable="false"
-        android:checked="false"
-        android:enabled="true"
-        android:tag="@style/AppThemeWhite"
-        android:title="Theme: White"
-        app:showAsAction="never" />
-
-
-</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/paid_theme_menu.xml b/app/src/main/res/menu/paid_theme_menu.xml
deleted file mode 100644
index 9650051..0000000
--- a/app/src/main/res/menu/paid_theme_menu.xml
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-    <group android:checkableBehavior="single">
-        <item
-            android:checked="false"
-            android:checkable="false"
-            android:tag="@style/AppThemeAmber"
-            android:title="Theme: Amber"
-            android:enabled="true"
-            app:showAsAction="never" />
-
-        <item
-            android:checked="false"
-            android:checkable="false"
-            android:tag="@style/AppThemeAtlanta"
-            android:title="Theme: Atlanta"
-            android:enabled="true"
-            app:showAsAction="never" />
-
-        <item
-            android:alphabeticShortcut="b"
-            android:checked="false"
-            android:checkable="false"
-            android:tag="@style/AppThemeBlack"
-            android:title="Theme: Black"
-            android:enabled="true"
-            app:showAsAction="never" />
-
-        <item
-            android:alphabeticShortcut="b"
-            android:checked="false"
-            android:checkable="false"
-            android:tag="@style/AppThemeBlue"
-            android:title="Theme: Blue"
-            android:enabled="true"
-            app:showAsAction="never" />
-
-        <item
-            android:alphabeticShortcut="c"
-            android:checked="false"
-            android:checkable="false"
-            android:tag="@style/AppThemeChicky"
-            android:title="Theme: Chicky"
-            android:enabled="true"
-            app:showAsAction="never" />
-
-        <item
-            android:checked="false"
-            android:checkable="false"
-            android:tag="@style/AppThemeChocolate"
-            android:title="Theme: Chocolate"
-            android:enabled="true"
-            app:showAsAction="never" />
-
-
-        <item
-            android:alphabeticShortcut="y"
-            android:checked="false"
-            android:checkable="false"
-            android:tag="@style/AppThemeGoldenrod"
-            android:title="Theme: Goldenrod"
-            android:enabled="true"
-            app:showAsAction="never" />
-
-        <item
-            android:alphabeticShortcut="g"
-            android:checked="false"
-            android:checkable="false"
-            android:tag="@style/AppThemeGreen"
-            android:title="Theme: Standard Green"
-            android:enabled="true"
-            app:showAsAction="never" />
-
-        <item
-            android:checked="false"
-            android:checkable="false"
-            android:tag="@style/AppThemeLightblue"
-            android:title="Theme: Lightblue"
-            android:enabled="true"
-            app:showAsAction="never" />
-
-        <item
-            android:checked="false"
-            android:checkable="false"
-            android:tag="@style/AppThemeLinuxGreenOnBlack"
-            android:title="Theme: Linux Green On Black"
-            android:enabled="true"
-            app:showAsAction="never" />
-
-        <item
-            android:alphabeticShortcut="w"
-            android:checked="false"
-            android:checkable="false"
-            android:tag="@style/AppThemePurple"
-            android:title="Theme: Purple"
-            android:enabled="true"
-            app:showAsAction="never" />
-
-        <item
-            android:alphabeticShortcut="w"
-            android:checked="false"
-            android:checkable="false"
-            android:tag="@style/AppThemeRed"
-            android:title="Theme: Red"
-            android:enabled="true"
-            app:showAsAction="never" />
-
-        <item
-            android:alphabeticShortcut="w"
-            android:checked="false"
-            android:checkable="false"
-            android:tag="@style/AppThemeRedmond"
-            android:title="Theme: Redmond"
-            android:enabled="true"
-            app:showAsAction="never" />
-
-        <item
-            android:alphabeticShortcut="w"
-            android:checked="false"
-            android:checkable="false"
-            android:tag="@style/AppThemeTeal"
-            android:title="Theme: Teal"
-            android:enabled="true"
-            app:showAsAction="never" />
-
-        <item
-            android:alphabeticShortcut="w"
-            android:checked="false"
-            android:checkable="false"
-            android:tag="@style/AppThemeUrbanaDesfire"
-            android:title="Theme: Urbana Desfire"
-            android:enabled="true"
-            app:showAsAction="never" />
-
-        <item
-            android:alphabeticShortcut="w"
-            android:checked="false"
-            android:checkable="false"
-            android:tag="@style/AppThemeWhite"
-            android:title="Theme: White"
-            android:enabled="true"
-            app:showAsAction="never" />
-
-        <item
-            android:alphabeticShortcut="w"
-            android:checked="false"
-            android:checkable="false"
-            android:tag="@style/AppThemeWinter"
-            android:title="Theme: Winter"
-            android:enabled="true"
-            app:showAsAction="never" />
-    </group>
-
-</menu>
\ No newline at end of file
diff --git a/app/src/main/res/raw/mfc1k_random_content_fixed_keys b/app/src/main/res/raw/mfc1k_random_content_fixed_keys
new file mode 100644
index 0000000..49ac4e0
Binary files /dev/null and b/app/src/main/res/raw/mfc1k_random_content_fixed_keys differ
diff --git a/app/src/main/res/raw/mfc4k_random_content_fixed_keys b/app/src/main/res/raw/mfc4k_random_content_fixed_keys
new file mode 100644
index 0000000..6704d3b
Binary files /dev/null and b/app/src/main/res/raw/mfc4k_random_content_fixed_keys differ
diff --git a/app/src/main/res/raw/mifare_classic_1k b/app/src/main/res/raw/mifare_classic_1k
new file mode 100644
index 0000000..4e8cd3f
Binary files /dev/null and b/app/src/main/res/raw/mifare_classic_1k differ
diff --git a/app/src/main/res/raw/mifare_ultralight b/app/src/main/res/raw/mifare_ultralight
new file mode 100644
index 0000000..c2e3483
Binary files /dev/null and b/app/src/main/res/raw/mifare_ultralight differ