diff --git a/app/src/main/java/com/philliphsu/clock2/editalarm/NumberGridTimePickerDialog.java b/app/src/main/java/com/philliphsu/clock2/editalarm/NumberGridTimePickerDialog.java
index 12cfc97..4dddafa 100644
--- a/app/src/main/java/com/philliphsu/clock2/editalarm/NumberGridTimePickerDialog.java
+++ b/app/src/main/java/com/philliphsu/clock2/editalarm/NumberGridTimePickerDialog.java
@@ -241,7 +241,7 @@ public class NumberGridTimePickerDialog extends BaseTimePickerDialog implements
         mInitialMinute = minute;
         mIs24HourMode = is24HourMode;
         mInKbMode = false;
-        mThemeDark = true;
+        mThemeDark = false;
     }
 
     /**
@@ -453,18 +453,17 @@ public class NumberGridTimePickerDialog extends BaseTimePickerDialog implements
         int accentColor = Utils.getThemeAccentColor(getContext());
 
         // Set the colors for each view based on the theme.
+        view.setBackgroundColor(mThemeDark? darkGray : white);
         view.findViewById(R.id.time_display_background).setBackgroundColor(mThemeDark? lightGray : accentColor);
         view.findViewById(R.id.time_display).setBackgroundColor(mThemeDark? lightGray : accentColor);
         ((TextView) view.findViewById(R.id.separator)).setTextColor(/*mThemeDark? white : timeDisplay*/mUnselectedColor);
         ((TextView) view.findViewById(R.id.ampm_label)).setTextColor(/*mThemeDark? white : timeDisplay*/mUnselectedColor);
 //        view.findViewById(R.id.line).setBackgroundColor(mThemeDark? darkLine : line);
-        // TODO: darkLine is 12% white, but it shows up like 100% white. We have replaced
-        // darkLine with lightGray for now. Figure out why and come back to replace
-        // lightGray with darkLine.
-        view.findViewById(R.id.divider).setBackgroundColor(mThemeDark? lightGray : line);
+        view.findViewById(R.id.divider).setBackgroundColor(mThemeDark? darkLine : line);
 //        mDoneButton.setTextColor(mThemeDark? darkDoneTextColor : doneTextColor);
         // The AOSP timepicker originally uses these colors for the CircleView
-        mTimePicker.setBackgroundColor(mThemeDark? /*lightGray : circleBackground*/ darkGray : white);
+        // We already set the correct background color of the entire view tree.
+//        mTimePicker.setBackgroundColor(mThemeDark? /*lightGray : circleBackground*/ darkGray : white);
 //        mDoneButton.setBackgroundResource(mThemeDark? darkDoneBackground : doneBackground);
 
         // Set the color on the FAB
@@ -483,7 +482,8 @@ public class NumberGridTimePickerDialog extends BaseTimePickerDialog implements
 //        mDoneButton.setRippleColor(/*your color here*/);
 
         // Set the color on the half-day toggles
-        view.findViewById(R.id.half_day_toggles).setBackgroundColor(mThemeDark? /*lightGray : circleBackground*/ darkGray : white);
+        // We already set the correct background color of the entire view tree.
+//        view.findViewById(R.id.half_day_toggles).setBackgroundColor(mThemeDark? /*lightGray : circleBackground*/ darkGray : white);
         mHalfDayToggleSelectedColor = accentColor;
 //        mHalfDayToggleUnselectedColor = Utils.getTextColorFromThemeAttr(getContext(),
 //                // The colors are in the correct order, which happens to be the reverse of the order
diff --git a/app/src/main/res/layout/dialog_time_picker_number_grid.xml b/app/src/main/res/layout/dialog_time_picker_number_grid.xml
index cf15a8a..d1629ac 100644
--- a/app/src/main/res/layout/dialog_time_picker_number_grid.xml
+++ b/app/src/main/res/layout/dialog_time_picker_number_grid.xml
@@ -28,8 +28,8 @@
             android:layout_width="match_parent"
             android:layout_height="@dimen/number_grid_height"
             android:layout_below="@id/time_display_background"
-            android:paddingStart="@dimen/bottom_sheet_edge_margin"
-            android:paddingEnd="@dimen/bottom_sheet_edge_margin"
+            android:layout_marginStart="@dimen/bottom_sheet_edge_margin"
+            android:layout_marginEnd="@dimen/bottom_sheet_edge_margin"
             android:paddingBottom="@dimen/anchored_fab_vertical_space"/>
 
         <View
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index b269b96..c119598 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -85,6 +85,7 @@
         <item name="layout_gravity">center</item>
     </style>
 
+    <!-- TODO: Consider making a dark themed Divider too. -->
     <style name="Divider">
         <!-- Won't be visible in a bottom sheet dialog... -->
         <!--<item name="android:background">?android:attr/listDivider</item>-->