diff --git a/app/src/main/res/layout-land/content_24h_grid_item.xml b/app/src/main/res/layout-land/content_24h_grid_item.xml
deleted file mode 100644
index a3450a3..0000000
--- a/app/src/main/res/layout-land/content_24h_grid_item.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2016 Phillip Hsu
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <!-- TODO: Define styles -->
-
-    <TextView
-        android:id="@+id/primary"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:fontFamily="sans-serif-light"
-        android:textSize="@dimen/number_grid_24_hour_item_primary_text_size"
-        android:includeFontPadding="false"
-        style="@style/TextAppearance.AppCompat"
-        android:layout_marginEnd="6dp"/>
-
-    <TextView
-        android:id="@+id/secondary"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:includeFontPadding="false"/>
-
-</merge>
\ No newline at end of file
diff --git a/app/src/main/res/layout-v21/content_numpad_time_picker.xml b/app/src/main/res/layout-v21/content_numpad_time_picker.xml
deleted file mode 100644
index 3fb0228..0000000
--- a/app/src/main/res/layout-v21/content_numpad_time_picker.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2016 Phillip Hsu
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-       xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <include layout="@layout/content_grid_layout_numpad"/>
-
-    <Button
-        android:id="@+id/leftAlt"
-        style="@style/GridLayoutNumpadButton"
-        app:layout_column="0"/>
-
-    <Button
-        android:id="@+id/rightAlt"
-        style="@style/GridLayoutNumpadButton"
-        app:layout_column="2"/>
-
-    <android.support.design.widget.FloatingActionButton
-        android:id="@+id/fab"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_gravity="center"
-        app:layout_column="1"
-        app:srcCompat="@drawable/ic_done_24dp"
-        app:borderWidth="0dp"
-        android:layout_marginBottom="@dimen/numeric_keypad_fab_bottom_margin"/>
-
-    <ImageButton
-        android:id="@+id/backspace"
-        app:srcCompat="@drawable/ic_backspace_24dp"
-        android:layout_height="@dimen/numeric_keypad_backspace_height"
-        style="@style/GridLayoutNumpadElement"
-        app:layout_column="2"/>
-
-</merge>
\ No newline at end of file
diff --git a/app/src/main/res/layout/bar_bottom_navigation.xml b/app/src/main/res/layout/bar_bottom_navigation.xml
deleted file mode 100644
index 3dcb419..0000000
--- a/app/src/main/res/layout/bar_bottom_navigation.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2016 Phillip Hsu
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="horizontal"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content">
-
-    <!-- TODO: Use ColorStateLists for both the text and drawable resource to indicate checked state -->
-
-    <ToggleButton
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:drawableTop="@android:drawable/ic_delete"
-        android:drawablePadding="4dp"
-        android:background="?android:attr/selectableItemBackground"
-        android:textOff="World Clock"
-        android:textOn="World Clock"
-        android:textAllCaps="false"
-        android:checked="true"/>
-
-    <ToggleButton
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:drawableTop="@android:drawable/ic_delete"
-        android:drawablePadding="4dp"
-        android:background="?android:attr/selectableItemBackground"
-        android:textOff="Alarms"
-        android:textOn="Alarms"
-        android:textAllCaps="false"
-        android:checked="true"/>
-
-    <ToggleButton
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:drawableTop="@android:drawable/ic_delete"
-        android:drawablePadding="4dp"
-        android:background="?android:attr/selectableItemBackground"
-        android:textOff="Timers"
-        android:textOn="Timers"
-        android:textAllCaps="false"
-        android:checked="true"/>
-
-    <ToggleButton
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:drawableTop="@android:drawable/ic_delete"
-        android:drawablePadding="4dp"
-        android:background="?android:attr/selectableItemBackground"
-        android:textOff="Stopwatch"
-        android:textOn="Stopwatch"
-        android:textAllCaps="false"
-        android:checked="true"/>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/content_24h_grid_item.xml b/app/src/main/res/layout/content_24h_grid_item.xml
deleted file mode 100644
index b4e71d8..0000000
--- a/app/src/main/res/layout/content_24h_grid_item.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2016 Phillip Hsu
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <!-- TODO: Define styles -->
-
-    <TextView
-        android:id="@+id/primary"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:fontFamily="sans-serif-light"
-        android:textSize="@dimen/number_grid_24_hour_item_primary_text_size"
-        android:includeFontPadding="false"
-        style="@style/TextAppearance.AppCompat"/>
-
-    <TextView
-        android:id="@+id/secondary"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:includeFontPadding="false"/>
-
-</merge>
\ No newline at end of file
diff --git a/app/src/main/res/layout/content_24h_number_grid.xml b/app/src/main/res/layout/content_24h_number_grid.xml
deleted file mode 100644
index 0de27c9..0000000
--- a/app/src/main/res/layout/content_24h_number_grid.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2016 Phillip Hsu
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<merge xmlns:app="http://schemas.android.com/apk/res-auto">
-    <!-- Although the style defines a textSize attribute, it will not be
-    applied because this is just a LinearLayout. -->
-    <com.philliphsu.clock2.timepickers.TwentyFourHourGridItem
-        style="@style/NumberGridButton.Hour"
-        app:primaryText="00"
-        app:secondaryText="12"/>
-    <com.philliphsu.clock2.timepickers.TwentyFourHourGridItem
-        style="@style/NumberGridButton.Hour"
-        app:primaryText="01"
-        app:secondaryText="13"/>
-    <com.philliphsu.clock2.timepickers.TwentyFourHourGridItem
-        style="@style/NumberGridButton.Hour"
-        app:primaryText="02"
-        app:secondaryText="14"/>
-    <com.philliphsu.clock2.timepickers.TwentyFourHourGridItem
-        style="@style/NumberGridButton.Hour"
-        app:primaryText="03"
-        app:secondaryText="15"/>
-    <com.philliphsu.clock2.timepickers.TwentyFourHourGridItem
-        style="@style/NumberGridButton.Hour"
-        app:primaryText="04"
-        app:secondaryText="16"/>
-    <com.philliphsu.clock2.timepickers.TwentyFourHourGridItem
-        style="@style/NumberGridButton.Hour"
-        app:primaryText="05"
-        app:secondaryText="17"/>
-    <com.philliphsu.clock2.timepickers.TwentyFourHourGridItem
-        style="@style/NumberGridButton.Hour"
-        app:primaryText="06"
-        app:secondaryText="18"/>
-    <com.philliphsu.clock2.timepickers.TwentyFourHourGridItem
-        style="@style/NumberGridButton.Hour"
-        app:primaryText="07"
-        app:secondaryText="19"/>
-    <com.philliphsu.clock2.timepickers.TwentyFourHourGridItem
-        style="@style/NumberGridButton.Hour"
-        app:primaryText="08"
-        app:secondaryText="20"/>
-    <com.philliphsu.clock2.timepickers.TwentyFourHourGridItem
-        style="@style/NumberGridButton.Hour"
-        app:primaryText="09"
-        app:secondaryText="21"/>
-    <com.philliphsu.clock2.timepickers.TwentyFourHourGridItem
-        style="@style/NumberGridButton.Hour"
-        app:primaryText="10"
-        app:secondaryText="22"/>
-    <com.philliphsu.clock2.timepickers.TwentyFourHourGridItem
-        style="@style/NumberGridButton.Hour"
-        app:primaryText="11"
-        app:secondaryText="23"/>
-</merge>
\ No newline at end of file
diff --git a/app/src/main/res/layout/content_hours_grid.xml b/app/src/main/res/layout/content_hours_grid.xml
deleted file mode 100644
index 419ec29..0000000
--- a/app/src/main/res/layout/content_hours_grid.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2016 Phillip Hsu
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-    <TextView style="@style/NumberGridButton.Hour"
-              android:text="1"/>
-    <TextView style="@style/NumberGridButton.Hour"
-              android:text="2"/>
-    <TextView style="@style/NumberGridButton.Hour"
-              android:text="3"/>
-    <TextView style="@style/NumberGridButton.Hour"
-              android:text="4"/>
-    <TextView style="@style/NumberGridButton.Hour"
-              android:text="5"/>
-    <TextView style="@style/NumberGridButton.Hour"
-              android:text="6"/>
-    <TextView style="@style/NumberGridButton.Hour"
-              android:text="7"/>
-    <TextView style="@style/NumberGridButton.Hour"
-              android:text="8"/>
-    <TextView style="@style/NumberGridButton.Hour"
-              android:text="9"/>
-    <TextView style="@style/NumberGridButton.Hour"
-              android:text="10"/>
-    <TextView style="@style/NumberGridButton.Hour"
-              android:text="11"/>
-    <TextView style="@style/NumberGridButton.Hour"
-              android:text="12"/>
-</merge>
\ No newline at end of file
diff --git a/app/src/main/res/layout/content_minutes_grid.xml b/app/src/main/res/layout/content_minutes_grid.xml
deleted file mode 100644
index 9f25263..0000000
--- a/app/src/main/res/layout/content_minutes_grid.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2016 Phillip Hsu
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-       xmlns:app="http://schemas.android.com/apk/res-auto">
-    <TextView style="@style/NumberGridButton.Minute"
-              android:text="00"/>
-    <TextView style="@style/NumberGridButton.Minute"
-              android:text="05"/>
-    <TextView style="@style/NumberGridButton.Minute"
-              android:text="10"/>
-    <TextView style="@style/NumberGridButton.Minute"
-              android:text="15"/>
-    <TextView style="@style/NumberGridButton.Minute"
-              android:text="20"/>
-    <TextView style="@style/NumberGridButton.Minute"
-              android:text="25"/>
-    <TextView style="@style/NumberGridButton.Minute"
-              android:text="30"/>
-    <TextView style="@style/NumberGridButton.Minute"
-              android:text="35"/>
-    <TextView style="@style/NumberGridButton.Minute"
-              android:text="40"/>
-    <TextView style="@style/NumberGridButton.Minute"
-              android:text="45"/>
-    <TextView style="@style/NumberGridButton.Minute"
-              android:text="50"/>
-    <TextView style="@style/NumberGridButton.Minute"
-              android:text="55"/>
-    <ImageButton
-        style="@style/NumberGridButton.Minute"
-        android:src="@drawable/ic_minus_circle_24dp"
-        app:layout_column="0"/>
-    <ImageButton
-        style="@style/NumberGridButton.Minute"
-        android:src="@drawable/ic_add_circle_24dp"
-        app:layout_column="2"/>
-</merge>
\ No newline at end of file
diff --git a/app/src/main/res/layout/content_numpad_time_picker.xml b/app/src/main/res/layout/content_numpad_time_picker.xml
deleted file mode 100644
index f3fb5dc..0000000
--- a/app/src/main/res/layout/content_numpad_time_picker.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2016 Phillip Hsu
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-       xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <include layout="@layout/content_grid_layout_numpad"/>
-
-    <Button
-        android:id="@+id/leftAlt"
-        style="@style/GridLayoutNumpadButton"
-        app:layout_column="0"/>
-
-    <Button
-        android:id="@+id/rightAlt"
-        style="@style/GridLayoutNumpadButton"
-        app:layout_column="2"/>
-
-    <android.support.design.widget.FloatingActionButton
-        android:id="@+id/fab"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_gravity="center"
-        app:layout_column="1"
-        app:srcCompat="@drawable/ic_done_24dp"
-        app:borderWidth="0dp"
-        app:elevation="0dp"
-        android:layout_marginBottom="@dimen/numeric_keypad_fab_bottom_margin"/>
-
-    <ImageButton
-        android:id="@+id/backspace"
-        app:srcCompat="@drawable/ic_backspace_24dp"
-        android:layout_height="@dimen/numeric_keypad_backspace_height"
-        style="@style/GridLayoutNumpadElement"
-        app:layout_column="2"/>
-
-</merge>
\ No newline at end of file
diff --git a/app/src/main/res/layout/content_numpad_time_picker_dark.xml b/app/src/main/res/layout/content_numpad_time_picker_dark.xml
deleted file mode 100644
index bc1aea4..0000000
--- a/app/src/main/res/layout/content_numpad_time_picker_dark.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2016 Phillip Hsu
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-       xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <include layout="@layout/content_grid_layout_numpad_dark"/>
-
-    <Button
-        android:id="@+id/leftAlt"
-        style="@style/GridLayoutNumpadButton.Inverse"
-        app:layout_column="0"/>
-
-    <Button
-        android:id="@+id/rightAlt"
-        style="@style/GridLayoutNumpadButton.Inverse"
-        app:layout_column="2"/>
-
-    <android.support.design.widget.FloatingActionButton
-        android:id="@+id/fab"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_gravity="center"
-        app:layout_column="1"
-        android:src="@drawable/ic_done_24dp"
-        android:layout_marginBottom="@dimen/numeric_keypad_fab_bottom_margin"/>
-
-    <ImageButton
-        android:id="@+id/backspace"
-        android:src="@drawable/ic_backspace_24dp"
-        android:layout_height="@dimen/numeric_keypad_backspace_height"
-        style="@style/GridLayoutNumpadElement"
-        app:layout_column="2"/>
-
-</merge>
\ No newline at end of file