diff --git a/app/build.gradle b/app/build.gradle
index e899c68..db070d8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -90,4 +90,5 @@ dependencies {
     compile 'com.android.support:gridlayout-v7:24.2.0'
     compile 'com.android.support:cardview-v7:24.2.0'
     compile 'com.jakewharton:butterknife:7.0.1'
+    compile project(":bottomsheetpickers-release")
 }
diff --git a/app/src/main/java/com/philliphsu/clock2/alarms/ui/AlarmsFragment.java b/app/src/main/java/com/philliphsu/clock2/alarms/ui/AlarmsFragment.java
index f7def9d..581ff0a 100644
--- a/app/src/main/java/com/philliphsu/clock2/alarms/ui/AlarmsFragment.java
+++ b/app/src/main/java/com/philliphsu/clock2/alarms/ui/AlarmsFragment.java
@@ -25,6 +25,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.philliphsu.bottomsheetpickers.time.BottomSheetTimePickerDialog;
 import com.philliphsu.clock2.R;
 import com.philliphsu.clock2.alarms.Alarm;
 import com.philliphsu.clock2.alarms.data.AlarmCursor;
@@ -33,13 +34,12 @@ import com.philliphsu.clock2.alarms.data.AsyncAlarmsTableUpdateHandler;
 import com.philliphsu.clock2.alarms.misc.AlarmController;
 import com.philliphsu.clock2.dialogs.TimePickerDialogController;
 import com.philliphsu.clock2.list.RecyclerViewFragment;
-import com.philliphsu.clock2.timepickers.BaseTimePickerDialog;
 import com.philliphsu.clock2.util.DelayedSnackbarHandler;
 
 import static com.philliphsu.clock2.util.FragmentTagUtils.makeTag;
 
 public class AlarmsFragment extends RecyclerViewFragment<Alarm, BaseAlarmViewHolder, AlarmCursor,
-        AlarmsCursorAdapter> implements BaseTimePickerDialog.OnTimeSetListener {
+        AlarmsCursorAdapter> implements BottomSheetTimePickerDialog.OnTimeSetListener {
     private static final String TAG = "AlarmsFragment";
     private static final String KEY_EXPANDED_POSITION = "expanded_position";
     public static final String EXTRA_SCROLL_TO_ALARM_ID = "com.philliphsu.clock2.alarms.extra.SCROLL_TO_ALARM_ID";
diff --git a/app/src/main/java/com/philliphsu/clock2/alarms/ui/BaseAlarmViewHolder.java b/app/src/main/java/com/philliphsu/clock2/alarms/ui/BaseAlarmViewHolder.java
index 3f7e088..4e3c8b5 100644
--- a/app/src/main/java/com/philliphsu/clock2/alarms/ui/BaseAlarmViewHolder.java
+++ b/app/src/main/java/com/philliphsu/clock2/alarms/ui/BaseAlarmViewHolder.java
@@ -32,19 +32,19 @@ import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.TextView;
 
+import com.philliphsu.clock2.R;
 import com.philliphsu.clock2.alarms.Alarm;
 import com.philliphsu.clock2.alarms.misc.AlarmController;
 import com.philliphsu.clock2.alarms.misc.AlarmPreferences;
 import com.philliphsu.clock2.dialogs.AddLabelDialog;
 import com.philliphsu.clock2.dialogs.AddLabelDialogController;
+import com.philliphsu.clock2.dialogs.TimePickerDialogController;
 import com.philliphsu.clock2.list.BaseViewHolder;
 import com.philliphsu.clock2.list.OnListItemInteractionListener;
-import com.philliphsu.clock2.R;
-import com.philliphsu.clock2.dialogs.TimePickerDialogController;
+import com.philliphsu.bottomsheetpickers.time.BottomSheetTimePickerDialog.OnTimeSetListener;
 import com.philliphsu.clock2.timepickers.Utils;
-import com.philliphsu.clock2.timepickers.BaseTimePickerDialog.OnTimeSetListener;
-import com.philliphsu.clock2.util.TimeTextUtils;
 import com.philliphsu.clock2.util.FragmentTagUtils;
+import com.philliphsu.clock2.util.TimeTextUtils;
 
 import java.util.Date;
 
diff --git a/app/src/main/java/com/philliphsu/clock2/dialogs/SystemTimePickerDialog.java b/app/src/main/java/com/philliphsu/clock2/dialogs/SystemTimePickerDialog.java
index 110da90..9342e2f 100644
--- a/app/src/main/java/com/philliphsu/clock2/dialogs/SystemTimePickerDialog.java
+++ b/app/src/main/java/com/philliphsu/clock2/dialogs/SystemTimePickerDialog.java
@@ -23,19 +23,19 @@ import android.support.annotation.NonNull;
 import android.support.v4.app.DialogFragment;
 import android.widget.TimePicker;
 
-import com.philliphsu.clock2.timepickers.BaseTimePickerDialog;
+import com.philliphsu.bottomsheetpickers.time.BottomSheetTimePickerDialog;
 
 /**
  * Created by Phillip Hsu on 9/28/2016.
  */
 public class SystemTimePickerDialog extends DialogFragment implements TimePickerDialog.OnTimeSetListener {
 
-    private BaseTimePickerDialog.OnTimeSetListener mListener;
+    private BottomSheetTimePickerDialog.OnTimeSetListener mListener;
     private int mInitialHourOfDay;
     private int mInitialMinute;
     private boolean mIs24HourMode;
 
-    public static SystemTimePickerDialog newInstance(BaseTimePickerDialog.OnTimeSetListener l,
+    public static SystemTimePickerDialog newInstance(BottomSheetTimePickerDialog.OnTimeSetListener l,
                                                      int hourOfDay, int minute, boolean is24HourMode) {
         SystemTimePickerDialog dialog = new SystemTimePickerDialog();
         dialog.mListener = l;
@@ -45,7 +45,7 @@ public class SystemTimePickerDialog extends DialogFragment implements TimePicker
         return dialog;
     }
 
-    public void setOnTimeSetListener(BaseTimePickerDialog.OnTimeSetListener listener) {
+    public void setOnTimeSetListener(BottomSheetTimePickerDialog.OnTimeSetListener listener) {
         mListener = listener;
     }
 
diff --git a/app/src/main/java/com/philliphsu/clock2/dialogs/TimePickerDialogController.java b/app/src/main/java/com/philliphsu/clock2/dialogs/TimePickerDialogController.java
index 7da3ce2..c7660db 100644
--- a/app/src/main/java/com/philliphsu/clock2/dialogs/TimePickerDialogController.java
+++ b/app/src/main/java/com/philliphsu/clock2/dialogs/TimePickerDialogController.java
@@ -22,18 +22,18 @@ import android.support.v4.app.DialogFragment;
 import android.support.v4.app.FragmentManager;
 import android.text.format.DateFormat;
 
+import com.philliphsu.bottomsheetpickers.time.BottomSheetTimePickerDialog;
+import com.philliphsu.bottomsheetpickers.time.grid.GridTimePickerDialog;
+import com.philliphsu.bottomsheetpickers.time.numberpad.NumberPadTimePickerDialog;
 import com.philliphsu.clock2.R;
-import com.philliphsu.clock2.timepickers.BaseTimePickerDialog;
-import com.philliphsu.clock2.timepickers.NumberGridTimePickerDialog;
-import com.philliphsu.clock2.timepickers.NumpadTimePickerDialog;
 
 /**
  * Created by Phillip Hsu on 9/6/2016.
  */
-public final class TimePickerDialogController extends DialogFragmentController<BaseTimePickerDialog> {
+public final class TimePickerDialogController extends DialogFragmentController<BottomSheetTimePickerDialog> {
     private static final String TAG = "TimePickerController";
 
-    private final BaseTimePickerDialog.OnTimeSetListener mListener;
+    private final BottomSheetTimePickerDialog.OnTimeSetListener mListener;
     private final Context mContext;
     private final FragmentManager mFragmentManager;
 
@@ -41,7 +41,7 @@ public final class TimePickerDialogController extends DialogFragmentController<B
      * @param context Used to read the user's preference for the style of the time picker dialog to show.
      */
     public TimePickerDialogController(FragmentManager fragmentManager, Context context,
-                                      BaseTimePickerDialog.OnTimeSetListener listener) {
+                                      BottomSheetTimePickerDialog.OnTimeSetListener listener) {
         super(fragmentManager);
         mFragmentManager = fragmentManager;
         mContext = context;
@@ -49,15 +49,15 @@ public final class TimePickerDialogController extends DialogFragmentController<B
     }
 
     public void show(int initialHourOfDay, int initialMinute, String tag) {
-        BaseTimePickerDialog dialog = null;
+        BottomSheetTimePickerDialog dialog = null;
         final String numpadStyle = mContext.getString(R.string.number_pad);
         final String gridStyle = mContext.getString(R.string.grid_selector);
         String prefTimePickerStyle = PreferenceManager.getDefaultSharedPreferences(mContext)
                 .getString(mContext.getString(R.string.key_time_picker_style), numpadStyle);
         if (prefTimePickerStyle.equals(numpadStyle)) {
-            dialog = NumpadTimePickerDialog.newInstance(mListener);
+            dialog = NumberPadTimePickerDialog.newInstance(mListener);
         } else if (prefTimePickerStyle.equals(gridStyle)) {
-            dialog = NumberGridTimePickerDialog.newInstance(
+            dialog = GridTimePickerDialog.newInstance(
                     mListener,
                     initialHourOfDay,
                     initialMinute,
@@ -75,8 +75,8 @@ public final class TimePickerDialogController extends DialogFragmentController<B
     public void tryRestoreCallback(String tag) {
         // Can't use #findDialog()!
         DialogFragment picker = (DialogFragment) mFragmentManager.findFragmentByTag(tag);
-        if (picker instanceof BaseTimePickerDialog) {
-            ((BaseTimePickerDialog) picker).setOnTimeSetListener(mListener);
+        if (picker instanceof BottomSheetTimePickerDialog) {
+            ((BottomSheetTimePickerDialog) picker).setOnTimeSetListener(mListener);
         } else if (picker instanceof SystemTimePickerDialog) {
             ((SystemTimePickerDialog) picker).setOnTimeSetListener(mListener);
         }
diff --git a/bottomsheetpickers-debug/bottomsheetpickers-debug.aar b/bottomsheetpickers-debug/bottomsheetpickers-debug.aar
new file mode 100644
index 0000000..86b3da4
Binary files /dev/null and b/bottomsheetpickers-debug/bottomsheetpickers-debug.aar differ
diff --git a/bottomsheetpickers-debug/build.gradle b/bottomsheetpickers-debug/build.gradle
new file mode 100644
index 0000000..0d8815b
--- /dev/null
+++ b/bottomsheetpickers-debug/build.gradle
@@ -0,0 +1,2 @@
+configurations.maybeCreate("default")
+artifacts.add("default", file('bottomsheetpickers-debug.aar'))
\ No newline at end of file
diff --git a/bottomsheetpickers-release/bottomsheetpickers-release.aar b/bottomsheetpickers-release/bottomsheetpickers-release.aar
new file mode 100644
index 0000000..0296cb0
Binary files /dev/null and b/bottomsheetpickers-release/bottomsheetpickers-release.aar differ
diff --git a/bottomsheetpickers-release/build.gradle b/bottomsheetpickers-release/build.gradle
new file mode 100644
index 0000000..98403e4
--- /dev/null
+++ b/bottomsheetpickers-release/build.gradle
@@ -0,0 +1,2 @@
+configurations.maybeCreate("default")
+artifacts.add("default", file('bottomsheetpickers-release.aar'))
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 075b744..6652f06 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-include ':app'
+include ':app', ':bottomsheetpickers-release', ':bottomsheetpickers-debug'