diff --git a/build.gradle b/build.gradle
index 84ae88d73..05cecec63 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,7 +12,7 @@ repositories {
     mavenCentral()
 }
 dependencies {
-
+    compile 'me.drakeet.materialdialog:library:1.0.9'
     compile 'com.getbase:floatingactionbutton:1.1.0'
     compile 'com.pkmmte.view:circularimageview:1.1'
     compile fileTree(dir: 'libs', include: '*.jar')
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 9b5b927b9..1e26f35f3 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -40,8 +40,8 @@
     <string name="addbook">Add Bookmark</string>
     <string name="addtobook">Add to Bookmark</string>
     <string name="enterpath">Enter Path</string>
-    <string name="cancel">Cancel</string>
-    <string name="create">Create</string>
+    <string name="cancel">CANCEL</string>
+    <string name="create">CREATE</string>
     <string name="success">Success</string>
     <string name="filenotexists">File Not Exists</string>
     <string name="error">Error</string>
@@ -57,7 +57,7 @@
     <string name="fileexist">File with same name already exists </string>
     <string name="filecreated">File Created</string>
     <string name="searchpath">Search Path</string>
-    <string name="search">Search</string>
+    <string name="search">SEARCH</string>
     <string name="enterfile">Enter File Name</string>
     <string name="name">Name:</string>
     <string name="date">Date:</string>
diff --git a/src/com/amaze/filemanager/fragments/BookmarksManager.java b/src/com/amaze/filemanager/fragments/BookmarksManager.java
index 1d0a09b2f..6054ef759 100644
--- a/src/com/amaze/filemanager/fragments/BookmarksManager.java
+++ b/src/com/amaze/filemanager/fragments/BookmarksManager.java
@@ -51,6 +51,8 @@ import java.util.ArrayList;
 
 import javax.xml.parsers.ParserConfigurationException;
 
+import me.drakeet.materialdialog.MaterialDialog;
+
 public class BookmarksManager extends ListFragment {
     Futils utils = new Futils();
     Shortcuts s = new Shortcuts();
@@ -75,21 +77,21 @@ ListView vl;
             @Override
             public void onClick(View view) {
 
-                AlertDialog.Builder ba1 = new AlertDialog.Builder(getActivity());
+                final MaterialDialog ba1 = new MaterialDialog(getActivity());
                 ba1.setTitle(utils.getString(getActivity(), R.string.addbook));
                 View v = getActivity().getLayoutInflater().inflate(R.layout.dialog, null);
                 final EditText edir = (EditText) v.findViewById(R.id.newname);
                 edir.setHint(utils.getString(getActivity(), R.string.enterpath));
-                ba1.setView(v);
-                ba1.setNegativeButton(utils.getString(getActivity(), R.string.cancel), new DialogInterface.OnClickListener() {
+                ba1.setContentView(v);
+                ba1.setNegativeButton(utils.getString(getActivity(), R.string.cancel), new View.OnClickListener() {
 
-                    public void onClick(DialogInterface p1, int p2) {
-                        // TODO: Implement this method
+                    public void onClick(View p2) {
+                  ba1.dismiss();      // TODO: Implement this method
                     }
                 });
-                ba1.setPositiveButton(utils.getString(getActivity(), R.string.create), new DialogInterface.OnClickListener() {
+                ba1.setPositiveButton(utils.getString(getActivity(), R.string.create), new View.OnClickListener() {
 
-                    public void onClick(DialogInterface p1, int p2) {
+                    public void onClick(View p2) {
                         try {
                             File a = new File(edir.getText().toString());
                             if (a.exists()) {
diff --git a/src/com/amaze/filemanager/fragments/Main.java b/src/com/amaze/filemanager/fragments/Main.java
index b140dc8e6..e789395d7 100644
--- a/src/com/amaze/filemanager/fragments/Main.java
+++ b/src/com/amaze/filemanager/fragments/Main.java
@@ -95,6 +95,8 @@ import java.util.Calendar;
 import java.util.HashMap;
 import java.util.List;
 
+import me.drakeet.materialdialog.MaterialDialog;
+
 
 public class Main extends android.support.v4.app.Fragment {
     public File[] file;
@@ -399,16 +401,22 @@ if(listView!=null){
 
                     case 0:
                         final String path = ma.current;
-                        AlertDialog.Builder ba1 = new AlertDialog.Builder(getActivity());
-                        ba1.setTitle(utils.getString(getActivity(), R.string.newfolder));
+                        final MaterialDialog ba1 = new MaterialDialog(getActivity());
+                        ba1.setTitle(R.string.newfolder);
                         View v = getActivity().getLayoutInflater().inflate(R.layout.dialog, null);
                         final EditText edir = (EditText) v.findViewById(R.id.newname);
                         edir.setHint(utils.getString(getActivity(), R.string.entername));
-                        ba1.setView(v);
-                        ba1.setNegativeButton(utils.getString(getActivity(), R.string.cancel), null);
-                        ba1.setPositiveButton(utils.getString(getActivity(), R.string.create), new DialogInterface.OnClickListener() {
+                        ba1.setContentView(v);
+                        ba1.setNegativeButton(utils.getString(getActivity(), R.string.cancel), new View.OnClickListener() {
+                            @Override
+                            public void onClick(View view) {
+                                ba1.dismiss();
+                            }
+                        });
+                        ba1.setPositiveButton(utils.getString(getActivity(), R.string.create), new View.OnClickListener() {
 
-                            public void onClick(DialogInterface p1, int p2) {
+                            @Override
+                            public void onClick(View view) {
                                 String a = edir.getText().toString();
                                 File f = new File(path + "/" + a);
                                 if (!f.exists()) {
@@ -424,21 +432,21 @@ if(listView!=null){
                         break;
                     case 1:
                         final String path1 = ma.current;
-                        AlertDialog.Builder ba2 = new AlertDialog.Builder(getActivity());
-                        ba2.setTitle(res.getString(R.string.newfile));
+                        final MaterialDialog ba2 = new MaterialDialog(getActivity());
+                        ba2.setTitle((R.string.newfile));
                         View v1 = getActivity().getLayoutInflater().inflate(R.layout.dialog, null);
                         final EditText edir1 = (EditText) v1.findViewById(R.id.newname);
                         edir1.setHint(utils.getString(getActivity(), R.string.entername));
-                        ba2.setView(v1);
-                        ba2.setNegativeButton(utils.getString(getActivity(), R.string.cancel), new DialogInterface.OnClickListener() {
+                        ba2.setContentView(v1);
+                        ba2.setNegativeButton( R.string.cancel, new View.OnClickListener() {
 
-                            public void onClick(DialogInterface p1, int p2) {
-                                // TODO: Implement this method
+                            public void onClick(View v) {
+                              ba2.dismiss();
                             }
                         });
-                        ba2.setPositiveButton(utils.getString(getActivity(), R.string.create), new DialogInterface.OnClickListener() {
+                        ba2.setPositiveButton(R.string.create, new View.OnClickListener() {
 
-                            public void onClick(DialogInterface p1, int p2) {
+                            public void onClick(View p2) {
                                 String a = edir1.getText().toString();
                                 File f1 = new File(path1 + "/" + a);
                                 if (!f1.exists()) {
@@ -489,21 +497,21 @@ if(listView!=null){
         final String fpath = ma.current;
 
         //Toast.makeText(getActivity(), utils.getString(getActivity(), R.string.searchpath) + fpath, Toast.LENGTH_LONG).show();
-        AlertDialog.Builder a = new AlertDialog.Builder(getActivity());
-        a.setTitle(utils.getString(getActivity(), R.string.search));
+        final MaterialDialog a = new MaterialDialog(getActivity());
+        a.setTitle(R.string.search);
         View v = getActivity().getLayoutInflater().inflate(R.layout.dialog, null);
         final EditText e = (EditText) v.findViewById(R.id.newname);
         e.setHint(utils.getString(getActivity(), R.string.enterfile));
-        a.setView(v);
-        a.setNeutralButton(utils.getString(getActivity(), R.string.cancel), new DialogInterface.OnClickListener() {
+        a.setContentView(v);
+        a.setNegativeButton( R.string.cancel, new View.OnClickListener() {
             @Override
-            public void onClick(DialogInterface dialog, int which) {
-            }
+            public void onClick(View which) {
+            a.dismiss();}
         });
-        a.setPositiveButton(utils.getString(getActivity(), R.string.search), new DialogInterface.OnClickListener() {
+        a.setPositiveButton(R.string.search, new View.OnClickListener() {
 
             @Override
-            public void onClick(DialogInterface dialog, int which) {
+            public void onClick(View which) {
                 // TODO Auto-generated method stub
                 String a = e.getText().toString();
                 Bundle b = new Bundle();