diff --git a/res/layout/dialog_file_name.xml b/res/layout/dialog_file_name.xml
index 0ebd936d0a40ed741ec917cab9045de80b32b143..b62480a67cca4c72e2dd22dc1f091d1a7873bd54 100644
--- a/res/layout/dialog_file_name.xml
+++ b/res/layout/dialog_file_name.xml
@@ -29,12 +29,15 @@
         android:layout_marginTop="@dimen/dialog_content_padding_top"
         android:layout_marginBottom="@dimen/dialog_content_padding_bottom"
         android:layout_centerInParent="true"
-        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
-
+        android:textColorHint="@color/hairline"
+       >
+        <!--style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"-->
         <com.google.android.material.textfield.TextInputEditText
             android:id="@android:id/text1"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:textColorHint="@color/hairline"
+            android:hint="@string/input_hint_new_folder"
             android:inputType="textCapSentences"/>
 
     </com.google.android.material.textfield.TextInputLayout>
diff --git a/res/layout/fragment_pick.xml b/res/layout/fragment_pick.xml
index c18afa0b349fcd60f860c593b9d6a6b0ef090b8c..2e6b8d647f72a69587ebd8713bb55fd0dd99d9af 100644
--- a/res/layout/fragment_pick.xml
+++ b/res/layout/fragment_pick.xml
@@ -30,6 +30,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="4dp"
         android:layout_marginEnd="4dp"
+        android:textColor="@color/accent"
         android:text="@android:string/cancel"/>
 
     <com.google.android.material.button.MaterialButton
@@ -38,5 +39,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="4dp"
+        android:textColor="@color/accent"
         android:layout_marginEnd="4dp"/>
 </LinearLayout>
diff --git a/res/layout/fragment_save.xml b/res/layout/fragment_save.xml
index b3f3c0b4c1c74ac2d5d05cfa7e0ab7fe7d57bcbc..910dda536798df1b47123a906dfcbc9ab4838559 100644
--- a/res/layout/fragment_save.xml
+++ b/res/layout/fragment_save.xml
@@ -57,6 +57,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="4dp"
             android:layout_marginEnd="4dp"
+            android:textColor="@color/accent"
             android:text="@string/menu_save"/>
 
         <ProgressBar
diff --git a/res/values-night/themes.xml b/res/values-night/themes.xml
index af2d4b3688d9f9f7d2a87f10c2d81b01068f9f49..2af2ca9974ad37af390e41fa5ff0f33e9c6b2c13 100644
--- a/res/values-night/themes.xml
+++ b/res/values-night/themes.xml
@@ -22,7 +22,8 @@
         <item name="android:actionBarSize">@dimen/action_bar_size</item>
 
         <!-- Color section -->
-        <item name="android:colorAccent">@color/primary</item>
+        <item name="android:colorAccent">@color/color_default_blue1</item>
+        <item name="colorAccent">@color/color_default_blue1</item>
         <item name="android:colorBackground">@color/app_background_color</item>
         <item name="android:colorBackgroundFloating">@color/background_floating</item>
         <item name="android:colorControlHighlight">@color/ripple_material_dark</item>
diff --git a/res/values/styles_text.xml b/res/values/styles_text.xml
index 5e3d57c856421383fbbcd30d24c2ad53c340e58e..8d476f7002b0e05ab31ff0cb5ceca6c4d7826346 100644
--- a/res/values/styles_text.xml
+++ b/res/values/styles_text.xml
@@ -77,6 +77,7 @@
     <style name="MaterialButtonTextAppearance" parent="@style/TextAppearance.MaterialComponents.Button">
         <item name="android:textAllCaps">@bool/config_button_all_caps</item>
         <item name="fontFamily">@string/config_fontFamilyMedium</item>
+        <item name="android:textColor">@color/accent</item>
     </style>
 
 </resources>
\ No newline at end of file
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 51ef4a56f941b71ef302274be0e49ea0bd75da8e..d4366d316f9dc447a3d06af5e09c01cde030e2d0 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -23,6 +23,7 @@
 
         <!-- Color section -->
         <item name="android:colorAccent">@color/color_default_blue1</item>
+        <item name="colorAccent">@color/color_default_blue1</item>
         <item name="android:colorBackground">@android:color/white</item>
         <item name="android:colorBackgroundFloating">@color/background_floating</item>
         <item name="android:colorControlHighlight">@color/ripple_material_light</item>
diff --git a/src/com/android/documentsui/CreateDirectoryFragment.java b/src/com/android/documentsui/CreateDirectoryFragment.java
index dcaa87a103388297b993daf6267f629966467318..deb6fb799fb0d82b3a63aa1faa93d7a4e56de7f7 100644
--- a/src/com/android/documentsui/CreateDirectoryFragment.java
+++ b/src/com/android/documentsui/CreateDirectoryFragment.java
@@ -113,6 +113,14 @@ public class CreateDirectoryFragment extends DialogFragment {
                 });
         editText.requestFocus();
 
+        dialog.setOnShowListener(new DialogInterface.OnShowListener() {
+            @Override
+            public void onShow(DialogInterface dialogInterface) {
+                dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(context.getResources().getColor(R.color.accent));
+                dialog.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(context.getResources().getColor(R.color.accent));
+            }
+        });
+
         return dialog;
     }
 
diff --git a/src/com/android/documentsui/DocumentsApplication.java b/src/com/android/documentsui/DocumentsApplication.java
index 65204b7e65bd7e3a7166020c910bd0b62f010f74..9289bd321e6fb05322a8fc18aaad9ea853d61178 100644
--- a/src/com/android/documentsui/DocumentsApplication.java
+++ b/src/com/android/documentsui/DocumentsApplication.java
@@ -38,6 +38,7 @@ import com.android.documentsui.prefs.ScopedAccessLocalPreferences;
 import com.android.documentsui.queries.SearchHistoryManager;
 import com.android.documentsui.roots.ProvidersCache;
 import com.android.documentsui.theme.ThemeOverlayManager;
+//import android.support.v7.app.AppCompatDelegate;
 
 public class DocumentsApplication extends Application {
     private static final String TAG = "DocumentsApplication";
@@ -93,7 +94,7 @@ public class DocumentsApplication extends Application {
     @Override
     public void onCreate() {
         super.onCreate();
-
+      //  AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
         final ActivityManager am = (ActivityManager) getSystemService(Context.ACTIVITY_SERVICE);
         final OverlayManager om = getSystemService(OverlayManager.class);
         final int memoryClassBytes = am.getMemoryClass() * 1024 * 1024;
diff --git a/src/com/android/documentsui/OperationDialogFragment.java b/src/com/android/documentsui/OperationDialogFragment.java
index bc98662dce441b2d1e7818ddc5a01320bfac41d9..03038ccc45cbf09d877c731d9f7b4204a68ac3a5 100644
--- a/src/com/android/documentsui/OperationDialogFragment.java
+++ b/src/com/android/documentsui/OperationDialogFragment.java
@@ -26,7 +26,7 @@ import androidx.annotation.IntDef;
 import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
-
+import android.text.Html;
 import com.android.documentsui.base.DocumentInfo;
 import com.android.documentsui.base.DocumentStack;
 import com.android.documentsui.services.FileOperationService;
@@ -39,6 +39,8 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
 
+import android.app.AlertDialog;
+
 /**
  * Alert dialog for operation dialogs.
  */
@@ -100,7 +102,7 @@ public class OperationDialogFragment extends DialogFragment {
 
         builder.setMessage(Html.fromHtml(message));
         builder.setPositiveButton(
-                R.string.close,
+                Html.fromHtml("<font color='#007FFF'>Close</font>"),
                 new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int id) {
@@ -108,6 +110,17 @@ public class OperationDialogFragment extends DialogFragment {
                     }
                 });
 
-        return builder.create();
+
+//        builder.setOnShowListener(new DialogInterface.OnShowListener() {
+//            @Override
+//            public void onShow(DialogInterface dialogInterface) {
+//                dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(getActivity().getResources().getColor(R.color.accent));
+//                dialog.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(getActivity().getResources().getColor(R.color.accent));
+//            }
+//        });
+//
+
+
+        return  builder.create();
     }
 }
diff --git a/src/com/android/documentsui/dirlist/RenameDocumentFragment.java b/src/com/android/documentsui/dirlist/RenameDocumentFragment.java
index d78f10a74acab6d3b70f155104765c560a06bb02..57ebc15cac4d75849a21173a4a0f512822d07c37 100644
--- a/src/com/android/documentsui/dirlist/RenameDocumentFragment.java
+++ b/src/com/android/documentsui/dirlist/RenameDocumentFragment.java
@@ -106,6 +106,15 @@ public class RenameDocumentFragment extends DialogFragment {
                     }
                 });
         mEditText.requestFocus();
+
+        dialog.setOnShowListener(new DialogInterface.OnShowListener() {
+            @Override
+            public void onShow(DialogInterface dialogInterface) {
+                dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(context.getResources().getColor(R.color.accent));
+                dialog.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(context.getResources().getColor(R.color.accent));
+            }
+        });
+
         return dialog;
     }
 
diff --git a/src/com/android/documentsui/picker/ConfirmFragment.java b/src/com/android/documentsui/picker/ConfirmFragment.java
index f56434d108b5a132e24b8712ae4117b86cacd479..b924e8490cf4abb14cd45c29db6375fc217d272c 100644
--- a/src/com/android/documentsui/picker/ConfirmFragment.java
+++ b/src/com/android/documentsui/picker/ConfirmFragment.java
@@ -34,9 +34,11 @@ import com.android.documentsui.BaseActivity;
 import com.android.documentsui.R;
 import com.android.documentsui.base.DocumentInfo;
 import com.android.documentsui.base.Shared;
-
+import android.text.Html;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
+import android.app.AlertDialog;
+
 /**
  * Used to confirm with user that it's OK to overwrite an existing file.
  */
@@ -94,7 +96,7 @@ public class ConfirmFragment extends DialogFragment {
                 builder.setTitle(text);
                 builder.setMessage(message);
                 builder.setPositiveButton(
-                        R.string.allow,
+                        Html.fromHtml("<font color='#007FFF'>Allow</font>"),
                         (DialogInterface dialog, int id) -> {
                             pickResult.increaseActionCount();
                             mActions.finishPicking(uri);
@@ -102,9 +104,19 @@ public class ConfirmFragment extends DialogFragment {
                 break;
 
         }
-        builder.setNegativeButton(android.R.string.cancel,
+        builder.setNegativeButton(Html.fromHtml("<font color='#007FFF'>Close</font>"),
                 (DialogInterface dialog, int id) -> pickResult.increaseActionCount());
 
+
+//        final AlertDialog dialog = ;
+//
+//        dialog.setOnShowListener(new DialogInterface.OnShowListener() {
+//            @Override
+//            public void onShow(DialogInterface dialogInterface) {
+//                dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(context.getResources().getColor(R.color.accent));
+//                dialog.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(context.getResources().getColor(R.color.accent));
+//            }
+//        });
         return builder.create();
     }
 
diff --git a/src/com/android/documentsui/ui/DialogController.java b/src/com/android/documentsui/ui/DialogController.java
index 8e9673932675913db043030c0dca4592af942c2f..0bf5ffcd4a2954569add2f6fcfd519067c0d6575 100644
--- a/src/com/android/documentsui/ui/DialogController.java
+++ b/src/com/android/documentsui/ui/DialogController.java
@@ -102,6 +102,9 @@ public interface DialogController {
 
             alertDialog.setOnShowListener(
                     (DialogInterface) -> {
+                        alertDialog.getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(mActivity.getResources().getColor(R.color.accent));
+                        alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(mActivity.getResources().getColor(R.color.accent));
+
                         Button positive = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE);
                         positive.setFocusable(true);
                         positive.requestFocus();