diff --git a/.gitignore b/.gitignore
index 1002795ec3e681dc8b3003e4c0e5cd6110d4a32a..ef62486157413314aa28a307d0d766de3aa1f0a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,40 +1,4 @@
-# Built application files
-*.apk
-*.ap_
-
-# Files for the Dalvik VM
-*.dex
-
-# Generated files
-bin/
-gen/
-out/
-
-# Gradle files
 .gradle/
-gradle/
-build/
-gradlew
-gradlew.bat
-
-# Local configuration file (sdk path, etc)
-local.properties
-
-# Proguard folder generated by Eclipse
-proguard/
-
-# Log Files
-*.log
-
-# Android Studio Navigation editor temp files
-.navigation/
-
-# Android Studio captures folder
-captures/
-
-# Intellij
-*.iml
 .idea/
-
-# Keystore files
-*.jks
\ No newline at end of file
+*.iml
+local.properties
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 65cb6a21fea0a9128f243df0ae3afcb1f4bcf2f5..66b37ff9a75467773d81b337eb67bb5998ae2880 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -34,7 +34,7 @@
 3. Add the activity of the app to [appfilter.xml](https://gitlab.com/xphnx/twelf_cm12_theme/blob/master/theme/src/main/assets/icons/res/xml/appfilter.xml) and add the icon's license to the [LICENSE](https://gitlab.com/xphnx/twelf_cm12_theme/blob/master/LICENSE.md) file.
 4. (Optional) Run the script proccess_wipsvg.sh. (It generates the proper pngs and move the svg from wip to depot folder.)
 
-**Breaf instructions**: A template file contains three layers (to see them, select Layer - Layers from the menu; to toggle layer visibility, use the eye-like icons near the layer names). The bottom layer contains the background of the icon. It has proper color, shadow, shade and tint. Do not modify those.
+**Brief instructions**: A template file contains three layers (to see them, select Layer - Layers from the menu; to toggle layer visibility, use the eye-like icons near the layer names). The bottom layer contains the background of the icon. It has proper color, shadow, shade and tint. Do not modify those.
 
 The top layer (hints) shows the keyline shapes, the regions that define the size of your icon. In short, a mostly square icon must fit into a square one (black lines). A horizontal rectangle, in the horizontal rectangle (blue lines). A vertical rectangle icon, into the vertical rectangle (green lines) and the mostly round one should mostly fit in the larger square-without-the-corners that they form. Most part of your icon should fit into one or several of those rectangles. Note that small items can extend beyond this area. For more information on this, please refer to the section ["Proportions"](https://gitlab.com/xphnx/twelf_cm12_theme/wikis/home#proportions) below and to the [Google's guide](http://www.google.com/design/spec/style/icons.html#icons-system-icons).
 
diff --git a/CREDITS.md b/CREDITS.md
index a639ca4e00b6a892fe97b0ac56368935da635deb..6d46a841a9498b592b84a35372738a7b3cb3d1c8 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -2,7 +2,6 @@ The code of this app is licensed under GPLv3, based on Icecons code (https://git
 
 The artwork is licensed under Creative Commons Attribution-ShareAlike 4.0 International except for the material released under another non-compatible licenses.
 
-
 Google (CC BY-SA 4.0 International): apps, alarm, browser, calendar, camera1, camera2, cellbroadcast, clock, connectbot, contacts, davdroid, downloads, fennec, firefox, filemanager, firewall, gallery, help, mail, lkeyboard, osmand, owncloud, phone, settings, sms, soundrecorder, xbmc, myownotes, owncloudnewsreader, otp, ebook, cipsimple, wppolice, satstat, adaway, opencamera, chatsecure, droidwall, kdeconnect, deskcon, linconnect, mythdroid, mythmote, keepassdroid, passandroid, pftpd, ppsspp, andstatus, mustard, impeller, diasporawebclient, friendica, twidere, mustardmod, systemappmover, orweb, tigase, conversations, beem, bombusmod, xabber, yaxim, amaze, fileexplorer, smsbackup, filemanagerpro, kerneladiutor, palemoon, icecat, andbible, ask, csipsimple, dictionaryformids, dsub, flym, ghostcommander, hackerskeyboard, justplayer, kerneladiutor, lkeyboard, myownnotes, netmbuddy, nlpconfig, orweb, osmonitor, owncloudnewsreader, owncloudsms, performancecontrol, pftpd, simplealarm, systemappmover, documents, xbmc, smssecure, textsecure, lightningbrowser, tintbrowser, ftpserver, androsens, vxconnectbot, irssiconnect, webopac, quickdic, gappsbrowser, otaupdate, bookmarkff, bookmarkbr, apktrack, getbackgps, wificamera, antennapod, podax, carcast, soundwaves, sendwithftp, gnucash, authenticator, navit, lumicall, linphone, fastergps, focal, rmaps, tabulae, simpletask, remotekeyboard, trickytripper, wifikeyboard, standalonecalendar, osmtracker, osmuploader, osmbugs, calendarwidget, osmtracker, firenightly, brouter, turboeditor, redphone, tasks, mitzuli, wifiwarning, yaaic, mybanq, schessclock, chesswatch, lcamera, xposed, vanillamusic, wallpaper, bluetooth, tags, cmupdater, callrecorder, acal, acaldav, caldavsync, networklog, autostarts, aard, jamendo, beamshare, cidrcalc, contactmerger, callerid, puma, applicationsinfo, disablemanager, oandbackup, slightbackup, batteryfu, minumanga, soundrecorder, wally, providersmedia, exchange, floatingstickies, overchan, materialplayer, movim, obscuracam, videoeditor, tacere, arij, birthday-adapter, myapplist, secdroid, antox, orfox, myposition, goblim, busybox, etarcalendar, jaws, mapsme, timber, icsdroid, omninotes, clipstack, notificationnotes, movecerts, sensorssandbox, ametro, andquote, androidvnc, apkextractor, ardroid, aurora, bipolalarm, bluemono, bvnc, calendarie, calendarnotifications, chromium, cmbrowser, coloring, counterme, crocodilenote, cupsprintservice, dimmer, driibo, dumbphoneassistant, dvfont, eddymalou, ensichat, enumbers, facebooknotifications, findmyphone, fortunes, freeshisen, gobandroid, hayai, heartobserve, imapnotes, impression, intentexplode, keepscore, libretasks, listmyapps, localcalendar, mahjonggbuilder, midisheetmusic, mifare, netguard, networkmapper, ocreader, offlinecalendar, opencvengine, openlinkwith, opennotescanner, owncloudnotes, packlist, paddletennis, passwdsafe, periodical, persiancalendar, pipepanic, prboom, qrstream, receipts, saveforoffline, scid, screennotifications, searchtool, , seriesguide, shadowsocks, sharetoclipboard, sieben, signal, simpleexplorer, slfms, smarterwifimanager, smartnavi, snooperstopper, snoopsnitch, steamgifts, superuser, terminightor, textfiction, textwarrior, togozip, trolly, tuxpaintconfig, weathernotification, whatsappbetaupdater, wifianalyzer, wifikeyshare, wifikeyview
 
 Cyanogenmod (Apache v2): audiofx, themes, onze, twelf, trebuchet
diff --git a/README.md b/README.md
index c11fcd728e7d06d173f2b1adf6b8ad5bc2bc4a68..d33ac2921b15e38e85e0877885fbaf78e9adc2e0 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-![CI bagde](https://gitlab.com/xphnx/ameixa/badges/master/build.svg)
+![CI badge](https://gitlab.com/xphnx/ameixa/badges/master/build.svg)
 
 Icon pack compatible with Trebuchet, Kiss Launcher, Lawnchair Launcher, OpenLauncher, Adw, and many more launchers. A Material Design inspired theme aiming to provide a consistent and minimalistic look to your device. Code forked from [Icecons icon pack](https://github.com/1C3/ICEcons). Only [F-Droid](https://f-droid.org/) hosted apps are supported.
 
diff --git a/app/build.gradle b/app/build.gradle
index affea4585b4887a35bb4a8712fbe0d7d588af6c5..2589f7f3d058e880f8956341de8afb1f0b292b4c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -3,7 +3,6 @@ apply plugin: 'com.android.application'
 android {
     compileSdkVersion 28
     buildToolsVersion '28.0.2'
-
     defaultConfig {
         applicationId "org.xphnx.ameixa"
         minSdkVersion 16
@@ -17,11 +16,10 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
-/*   lintOptions {
+/*    lintOptions {
         checkReleaseBuilds false
         abortOnError false
-    }
-*/
+    } */
 
     buildTypes {
         release {
diff --git a/gradle.properties b/gradle.properties
index 6cbe7a62221d58f23ea47acd9095edc271a2ea65..1d3591c8a4c9c29578c36c87f80c05a6aea3ee3f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -10,7 +10,7 @@
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 # Default value: -Xmx10248m -XX:MaxPermSize=256m
-org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index bbdfa368b91243528e05050b69127f9e457ebbda..286103dfed3d8cc0d4fa72d37d524736afacb8b9 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index bd24854fe8969a4bf28202879e89c1a5c46a3245..a47314560fb5cd98fea11359f29172e51bc72969 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-rc-1-all.zip
+distributionSha256Sum=8d9b8dda4efbb55978bd54899cc0eccb300d65af92022716b07f63385e832b7d
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip
diff --git a/gradlew.bat b/gradlew.bat
index 271685344a0cb32c189a04bbb297f0234dab4e36..f9553162f122c71b34635112e717c3e733b5b212 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -14,7 +14,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=-Xmx128m -Dfile.encoding=UTF-8
+set DEFAULT_JVM_OPTS=
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
@@ -81,4 +81,4 @@ exit /b 1
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
 
-:omega
\ No newline at end of file
+:omega