diff --git a/app/build.gradle b/app/build.gradle
index 5476d1c9..fd45f04a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -32,18 +32,13 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:25.0.1'
-    compile 'com.github.yukuku:ambilwarna:2.0.1'
-    compile 'com.android.support:design:25.0.1'
+    compile 'com.simplemobiletools:commons:2.1.6'
     compile 'com.facebook.stetho:stetho:1.4.1'
-    compile 'com.github.bumptech.glide:glide:3.7.0'
-    compile 'com.simplemobiletools:filepicker:1.6.1@aar'
-
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }
 
 buildscript {
-    ext.kotlin_version = '1.0.5-2'
+    ext.kotlin_version = '1.0.3'
     repositories {
         mavenCentral()
     }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1a7371ac..5b47c3f8 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -6,7 +6,7 @@
     <application
         android:name=".App"
         android:allowBackup="true"
-        android:icon="@mipmap/launcher"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_launcher_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
@@ -45,7 +45,7 @@
 
         <receiver
             android:name=".MyWidgetProvider"
-            android:icon="@mipmap/widget_preview">
+            android:icon="@drawable/img_widget_preview">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
             </intent-filter>
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt
index fa5b5cd8..88e64a55 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt
@@ -8,9 +8,9 @@ import android.view.Gravity
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
-import com.simplemobiletools.filepicker.dialogs.ConfirmationDialog
-import com.simplemobiletools.filepicker.extensions.toast
-import com.simplemobiletools.filepicker.extensions.value
+import com.simplemobiletools.commons.dialogs.ConfirmationDialog
+import com.simplemobiletools.commons.extensions.toast
+import com.simplemobiletools.commons.extensions.value
 import com.simplemobiletools.notes.R
 import com.simplemobiletools.notes.TYPE_NOTE
 import com.simplemobiletools.notes.adapters.NotesPagerAdapter
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/NewNoteDialog.kt b/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/NewNoteDialog.kt
index 1bad82f5..7a85c1fa 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/NewNoteDialog.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/NewNoteDialog.kt
@@ -3,8 +3,8 @@ package com.simplemobiletools.notes.dialogs
 import android.app.Activity
 import android.app.AlertDialog
 import android.view.WindowManager
-import com.simplemobiletools.filepicker.extensions.toast
-import com.simplemobiletools.filepicker.extensions.value
+import com.simplemobiletools.commons.extensions.toast
+import com.simplemobiletools.commons.extensions.value
 import com.simplemobiletools.notes.R
 import com.simplemobiletools.notes.databases.DBHelper
 import kotlinx.android.synthetic.main.new_note.view.*
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/RenameNoteDialog.kt b/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/RenameNoteDialog.kt
index 069be3e8..73aeeff1 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/RenameNoteDialog.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/RenameNoteDialog.kt
@@ -4,8 +4,8 @@ import android.app.Activity
 import android.app.AlertDialog
 import android.view.LayoutInflater
 import android.view.WindowManager
-import com.simplemobiletools.filepicker.extensions.toast
-import com.simplemobiletools.filepicker.extensions.value
+import com.simplemobiletools.commons.extensions.toast
+import com.simplemobiletools.commons.extensions.value
 import com.simplemobiletools.notes.R
 import com.simplemobiletools.notes.databases.DBHelper
 import com.simplemobiletools.notes.models.Note
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/fragments/NoteFragment.kt b/app/src/main/kotlin/com/simplemobiletools/notes/fragments/NoteFragment.kt
index 4c405405..dbc7617f 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/fragments/NoteFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/notes/fragments/NoteFragment.kt
@@ -8,7 +8,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.inputmethod.InputMethodManager
-import com.simplemobiletools.filepicker.extensions.value
+import com.simplemobiletools.commons.extensions.value
 import com.simplemobiletools.notes.NOTE_ID
 import com.simplemobiletools.notes.R
 import com.simplemobiletools.notes.databases.DBHelper
@@ -18,7 +18,6 @@ import com.simplemobiletools.notes.extensions.updateWidget
 import com.simplemobiletools.notes.models.Note
 import kotlinx.android.synthetic.main.fragment_note.view.*
 
-
 class NoteFragment : Fragment() {
     var noteId = 0
     lateinit var view: ViewGroup
diff --git a/app/src/main/res/mipmap-hdpi/widget_preview.png b/app/src/main/res/drawable-hdpi/img_widget_preview.png
similarity index 100%
rename from app/src/main/res/mipmap-hdpi/widget_preview.png
rename to app/src/main/res/drawable-hdpi/img_widget_preview.png
diff --git a/app/src/main/res/mipmap-hdpi/open_note.png b/app/src/main/res/drawable-hdpi/open_note.png
similarity index 100%
rename from app/src/main/res/mipmap-hdpi/open_note.png
rename to app/src/main/res/drawable-hdpi/open_note.png
diff --git a/app/src/main/res/mipmap-mdpi/widget_preview.png b/app/src/main/res/drawable-mdpi/img_widget_preview.png
similarity index 100%
rename from app/src/main/res/mipmap-mdpi/widget_preview.png
rename to app/src/main/res/drawable-mdpi/img_widget_preview.png
diff --git a/app/src/main/res/mipmap-mdpi/open_note.png b/app/src/main/res/drawable-mdpi/open_note.png
similarity index 100%
rename from app/src/main/res/mipmap-mdpi/open_note.png
rename to app/src/main/res/drawable-mdpi/open_note.png
diff --git a/app/src/main/res/mipmap-xhdpi/widget_preview.png b/app/src/main/res/drawable-xhdpi/img_widget_preview.png
similarity index 100%
rename from app/src/main/res/mipmap-xhdpi/widget_preview.png
rename to app/src/main/res/drawable-xhdpi/img_widget_preview.png
diff --git a/app/src/main/res/mipmap-xhdpi/open_note.png b/app/src/main/res/drawable-xhdpi/open_note.png
similarity index 100%
rename from app/src/main/res/mipmap-xhdpi/open_note.png
rename to app/src/main/res/drawable-xhdpi/open_note.png
diff --git a/app/src/main/res/mipmap-xxhdpi/widget_preview.png b/app/src/main/res/drawable-xxhdpi/img_widget_preview.png
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/widget_preview.png
rename to app/src/main/res/drawable-xxhdpi/img_widget_preview.png
diff --git a/app/src/main/res/mipmap-xxhdpi/open_note.png b/app/src/main/res/drawable-xxhdpi/open_note.png
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/open_note.png
rename to app/src/main/res/drawable-xxhdpi/open_note.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/widget_preview.png b/app/src/main/res/drawable-xxxhdpi/img_widget_preview.png
similarity index 100%
rename from app/src/main/res/mipmap-xxxhdpi/widget_preview.png
rename to app/src/main/res/drawable-xxxhdpi/img_widget_preview.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/open_note.png b/app/src/main/res/drawable-xxxhdpi/open_note.png
similarity index 100%
rename from app/src/main/res/mipmap-xxxhdpi/open_note.png
rename to app/src/main/res/drawable-xxxhdpi/open_note.png
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index c8c3c607..eedd5a17 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -99,7 +99,7 @@
             android:layout_width="@dimen/social_logo"
             android:layout_height="@dimen/social_logo"
             android:layout_below="@+id/about_follow_us"
-            android:src="@mipmap/facebook"/>
+            android:src="@drawable/ic_facebook"/>
 
         <ImageView
             android:id="@+id/about_gplus"
@@ -110,7 +110,7 @@
             android:layout_marginRight="@dimen/social_padding"
             android:layout_toEndOf="@+id/about_facebook"
             android:layout_toRightOf="@+id/about_facebook"
-            android:src="@mipmap/gplus"/>
+            android:src="@drawable/ic_gplus"/>
 
         <TextView
             android:id="@+id/about_copyright"
diff --git a/app/src/main/res/menu/menu.xml b/app/src/main/res/menu/menu.xml
index 100782b7..71937b5d 100644
--- a/app/src/main/res/menu/menu.xml
+++ b/app/src/main/res/menu/menu.xml
@@ -3,27 +3,27 @@
       xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/open_note"
-        android:icon="@mipmap/open_note"
+        android:icon="@drawable/open_note"
         android:title="@string/open_note"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/new_note"
-        android:icon="@mipmap/plus"
+        android:icon="@drawable/ic_plus"
         android:title="@string/new_note"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/rename_note"
-        android:icon="@mipmap/rename"
+        android:icon="@drawable/ic_rename"
         android:title="@string/rename"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/share"
-        android:icon="@mipmap/share"
+        android:icon="@drawable/ic_share"
         android:title="@string/share"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/delete_note"
-        android:icon="@mipmap/delete"
+        android:icon="@drawable/ic_delete"
         android:title="@string/delete_note"
         app:showAsAction="never"/>
     <item
diff --git a/app/src/main/res/mipmap-hdpi/delete.png b/app/src/main/res/mipmap-hdpi/delete.png
deleted file mode 100644
index 4a9f7694..00000000
Binary files a/app/src/main/res/mipmap-hdpi/delete.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/facebook.png b/app/src/main/res/mipmap-hdpi/facebook.png
deleted file mode 100644
index 6cfa1da4..00000000
Binary files a/app/src/main/res/mipmap-hdpi/facebook.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/gplus.png b/app/src/main/res/mipmap-hdpi/gplus.png
deleted file mode 100644
index 897f103c..00000000
Binary files a/app/src/main/res/mipmap-hdpi/gplus.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/mipmap-hdpi/launcher.png
rename to app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-hdpi/plus.png b/app/src/main/res/mipmap-hdpi/plus.png
deleted file mode 100644
index 76f27e6e..00000000
Binary files a/app/src/main/res/mipmap-hdpi/plus.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/rename.png b/app/src/main/res/mipmap-hdpi/rename.png
deleted file mode 100644
index d3ff58dc..00000000
Binary files a/app/src/main/res/mipmap-hdpi/rename.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/share.png b/app/src/main/res/mipmap-hdpi/share.png
deleted file mode 100644
index b09a6926..00000000
Binary files a/app/src/main/res/mipmap-hdpi/share.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/delete.png b/app/src/main/res/mipmap-mdpi/delete.png
deleted file mode 100644
index e2f5f355..00000000
Binary files a/app/src/main/res/mipmap-mdpi/delete.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/facebook.png b/app/src/main/res/mipmap-mdpi/facebook.png
deleted file mode 100644
index 4fa29a30..00000000
Binary files a/app/src/main/res/mipmap-mdpi/facebook.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/gplus.png b/app/src/main/res/mipmap-mdpi/gplus.png
deleted file mode 100644
index 54f1b83e..00000000
Binary files a/app/src/main/res/mipmap-mdpi/gplus.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/mipmap-mdpi/launcher.png
rename to app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-mdpi/plus.png b/app/src/main/res/mipmap-mdpi/plus.png
deleted file mode 100644
index 193383a1..00000000
Binary files a/app/src/main/res/mipmap-mdpi/plus.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/rename.png b/app/src/main/res/mipmap-mdpi/rename.png
deleted file mode 100644
index 12b09f1d..00000000
Binary files a/app/src/main/res/mipmap-mdpi/rename.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/share.png b/app/src/main/res/mipmap-mdpi/share.png
deleted file mode 100644
index e944fd70..00000000
Binary files a/app/src/main/res/mipmap-mdpi/share.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/delete.png b/app/src/main/res/mipmap-xhdpi/delete.png
deleted file mode 100644
index 388b5b06..00000000
Binary files a/app/src/main/res/mipmap-xhdpi/delete.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/facebook.png b/app/src/main/res/mipmap-xhdpi/facebook.png
deleted file mode 100644
index 6a605585..00000000
Binary files a/app/src/main/res/mipmap-xhdpi/facebook.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/gplus.png b/app/src/main/res/mipmap-xhdpi/gplus.png
deleted file mode 100644
index 47bd6ef3..00000000
Binary files a/app/src/main/res/mipmap-xhdpi/gplus.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/mipmap-xhdpi/launcher.png
rename to app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xhdpi/plus.png b/app/src/main/res/mipmap-xhdpi/plus.png
deleted file mode 100644
index d8ef0f45..00000000
Binary files a/app/src/main/res/mipmap-xhdpi/plus.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/rename.png b/app/src/main/res/mipmap-xhdpi/rename.png
deleted file mode 100644
index 5a06bff5..00000000
Binary files a/app/src/main/res/mipmap-xhdpi/rename.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/share.png b/app/src/main/res/mipmap-xhdpi/share.png
deleted file mode 100644
index 22a8783e..00000000
Binary files a/app/src/main/res/mipmap-xhdpi/share.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/delete.png b/app/src/main/res/mipmap-xxhdpi/delete.png
deleted file mode 100644
index 3fcdfdb5..00000000
Binary files a/app/src/main/res/mipmap-xxhdpi/delete.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/facebook.png b/app/src/main/res/mipmap-xxhdpi/facebook.png
deleted file mode 100644
index 6b35ed6a..00000000
Binary files a/app/src/main/res/mipmap-xxhdpi/facebook.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gplus.png b/app/src/main/res/mipmap-xxhdpi/gplus.png
deleted file mode 100644
index d580cd5f..00000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gplus.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/launcher.png
rename to app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xxhdpi/plus.png b/app/src/main/res/mipmap-xxhdpi/plus.png
deleted file mode 100644
index b97c0e28..00000000
Binary files a/app/src/main/res/mipmap-xxhdpi/plus.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/rename.png b/app/src/main/res/mipmap-xxhdpi/rename.png
deleted file mode 100644
index 02e19d04..00000000
Binary files a/app/src/main/res/mipmap-xxhdpi/rename.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/share.png b/app/src/main/res/mipmap-xxhdpi/share.png
deleted file mode 100644
index a35b3cd1..00000000
Binary files a/app/src/main/res/mipmap-xxhdpi/share.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/delete.png b/app/src/main/res/mipmap-xxxhdpi/delete.png
deleted file mode 100644
index 8d322aa9..00000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/delete.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/facebook.png b/app/src/main/res/mipmap-xxxhdpi/facebook.png
deleted file mode 100644
index 4d24332a..00000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/facebook.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/gplus.png b/app/src/main/res/mipmap-xxxhdpi/gplus.png
deleted file mode 100644
index 932c51ae..00000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/gplus.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/mipmap-xxxhdpi/launcher.png
rename to app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/plus.png b/app/src/main/res/mipmap-xxxhdpi/plus.png
deleted file mode 100644
index 2bef0595..00000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/plus.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/rename.png b/app/src/main/res/mipmap-xxxhdpi/rename.png
deleted file mode 100644
index d6668a05..00000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/rename.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/share.png b/app/src/main/res/mipmap-xxxhdpi/share.png
deleted file mode 100644
index e351c7be..00000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/share.png and /dev/null differ
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 289812d8..f9d3757d 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -68,7 +68,7 @@
 
         Ne contient pas de publicités ou d\'autorisations inutiles. Complèetement opensource, fournit un thème sombre également.
 
-        Cette application est juste une pièce d\'une plus grande série d'applications. Vous pouvez trouver le reste de celles-ci à http://www.simplemobiletools.com
+        Cette application est juste une pièce d\'une plus grande série d\'applications. Vous pouvez trouver le reste de celles-ci à http://www.simplemobiletools.com
     </string>
 
     <!--
diff --git a/app/src/main/res/xml/widget_info.xml b/app/src/main/res/xml/widget_info.xml
index a1ed7cd2..95c08e25 100644
--- a/app/src/main/res/xml/widget_info.xml
+++ b/app/src/main/res/xml/widget_info.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
-                    android:configure="com.simplemobiletools.notes.activities.WidgetConfigureActivity"
-                    android:initialLayout="@layout/widget"
-                    android:minHeight="110dp"
-                    android:minResizeHeight="40dp"
-                    android:minResizeWidth="40dp"
-                    android:minWidth="110dp"
-                    android:previewImage="@mipmap/widget_preview"
-                    android:resizeMode="horizontal|vertical"/>
+<appwidget-provider
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:configure="com.simplemobiletools.notes.activities.WidgetConfigureActivity"
+    android:initialLayout="@layout/widget"
+    android:minHeight="110dp"
+    android:minResizeHeight="40dp"
+    android:minResizeWidth="40dp"
+    android:minWidth="110dp"
+    android:previewImage="@drawable/img_widget_preview"
+    android:resizeMode="horizontal|vertical"/>