diff --git a/lib/src/date_picker.dart b/lib/src/date_picker.dart
index 3bd8f5b..410528e 100644
--- a/lib/src/date_picker.dart
+++ b/lib/src/date_picker.dart
@@ -100,7 +100,7 @@ class DatePicker {
         onCancel: onCancel,
         onChange: onChange,
         onConfirm: onConfirm,
-        theme: Theme.of(context, shadowThemeOnly: true),
+        theme: Theme.of(context),
         barrierLabel:
             MaterialLocalizations.of(context).modalBarrierDismissLabel,
         minuteDivider: minuteDivider,
diff --git a/lib/src/date_picker_theme.dart b/lib/src/date_picker_theme.dart
index 08bfffc..19b963f 100644
--- a/lib/src/date_picker_theme.dart
+++ b/lib/src/date_picker_theme.dart
@@ -20,7 +20,7 @@ const double DATETIME_PICKER_ITEM_HEIGHT = 36.0;
 const TextStyle DATETIME_PICKER_ITEM_TEXT_STYLE =
     const TextStyle(color: Color(0xFF000046), fontSize: 16.0);
 
-class DateTimePickerTheme with DiagnosticableMixin {
+class DateTimePickerTheme with Diagnosticable {
   final cancelDefault = const Text('OK');
 
   /// DateTimePicker theme.
diff --git a/lib/src/widget/date_picker_title_widget.dart b/lib/src/widget/date_picker_title_widget.dart
index b8cb096..73f545a 100644
--- a/lib/src/widget/date_picker_title_widget.dart
+++ b/lib/src/widget/date_picker_title_widget.dart
@@ -63,8 +63,7 @@ class DatePickerTitleWidget extends StatelessWidget {
 
     return Container(
       height: pickerTheme.titleHeight,
-      child: FlatButton(
-        shape: RoundedRectangleBorder(borderRadius: BorderRadius.zero),
+      child: TextButton(
         child: cancelWidget,
         onPressed: () => this.onCancel(),
       ),
@@ -95,8 +94,7 @@ class DatePickerTitleWidget extends StatelessWidget {
 
     return Container(
       height: pickerTheme.titleHeight,
-      child: FlatButton(
-        shape: RoundedRectangleBorder(borderRadius: BorderRadius.zero),
+      child: TextButton(
         child: confirmWidget,
         onPressed: () => this.onConfirm(),
       ),