diff --git a/app/src/main/res/layout-w900dp/logentry_list.xml b/app/src/main/res/layout-w900dp/logentry_list.xml
deleted file mode 100644
index ec9accc..0000000
--- a/app/src/main/res/layout-w900dp/logentry_list.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_marginLeft="16dp"
-    android:layout_marginRight="16dp"
-    android:baselineAligned="false"
-    android:divider="?android:attr/dividerHorizontal"
-    android:orientation="horizontal"
-    android:showDividers="middle"
-    tools:context="org.mercury_im.messenger.ui.log.LogEntryListActivity">
-
-    <!--
-    This layout is a two-pane layout for the LogEntries
-    master/detail flow.
-    
-    -->
-
-    <androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:id="@+id/logentry_list"
-        android:name="org.mercury_im.messenger.ui.log.LogEntryListFragment"
-        android:layout_width="@dimen/item_width"
-        android:layout_height="match_parent"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"
-        app:layoutManager="LinearLayoutManager"
-        tools:context="org.mercury_im.messenger.ui.log.LogEntryListActivity"
-        tools:listitem="@layout/logentry_list_content" />
-
-    <FrameLayout
-        android:id="@+id/logentry_detail_container"
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_weight="3" />
-
-</LinearLayout>
diff --git a/app/src/main/res/values-v21/themes.xml b/app/src/main/res/values-v21/themes.xml
new file mode 100644
index 0000000..1c88783
--- /dev/null
+++ b/app/src/main/res/values-v21/themes.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- API v21 specific theme attributes -->
+    <style name="Platform.V21.Theme.Mercury"
+        parent="Platform.V19.Theme.Mercury" />
+
+    <!-- Don't change this -->
+    <style name="Platform.Theme.Mercury"
+        parent="Platform.V21.Theme.Mercury" />
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
new file mode 100644
index 0000000..dc9d874
--- /dev/null
+++ b/app/src/main/res/values/themes.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Light Theme -->
+    <style name="Theme.Mercury"
+        parent="Base.Theme.Mercury">
+
+    </style>
+
+    <!-- Dark Theme -->
+    <style name="Theme.Mercury.Dark"
+        parent="Base.Theme.Mercury">
+
+    </style>
+
+    <!-- Base Theme. Insert common theme attributes here -->
+    <style name="Base.Theme.Mercury"
+        parent="Platform.Theme.Mercury">
+
+    </style>
+
+    <!-- API v19 specific theme attributes -->
+    <style name="Platform.V19.Theme.Mercury"
+        parent="Theme.MaterialComponents" />
+
+    <!-- Don't change this -->
+    <style name="Platform.Theme.Mercury"
+        parent="Platform.V19.Theme.Mercury" />
+
+</resources>
\ No newline at end of file