diff --git a/app/build.gradle b/app/build.gradle
index ee26b31e702bc837dcbc9eaaf836aeed054d2ae8..8f2595ddaf6aa2f8ba250a3314b13058d009a79e 100755
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'com.google.gms.google-services'
 android {
 
     compileSdkVersion 25
-    buildToolsVersion '25.0.2'
+    buildToolsVersion '25.0.3'
 
     defaultConfig {
         applicationId "ohi.andre.consolelauncher"
@@ -29,6 +29,17 @@ android {
         }
     }
 
+    productFlavors {
+        // includes proprietary libs
+        playstore {
+
+        }
+        // only foss
+        foss {
+
+        }
+    }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_7
         targetCompatibility JavaVersion.VERSION_1_7
@@ -50,6 +61,6 @@ android {
     }
 }
 dependencies {
-    compile files('libs/anrwatchdog-1.3.0.jar')
-    compile 'com.google.firebase:firebase-database:9.0.0'
+    playstoreCompile files('libs/anrwatchdog-1.3.0.jar')
+    playstoreCompile 'com.google.firebase:firebase-database:9.0.0'
 }
\ No newline at end of file
diff --git a/app/src/foss/java/ohi/andre/consolelauncher/FlavorUtils.java b/app/src/foss/java/ohi/andre/consolelauncher/FlavorUtils.java
new file mode 100755
index 0000000000000000000000000000000000000000..7bdcdc9d670caab4f8f7fda51dadf38bfe8fa143
--- /dev/null
+++ b/app/src/foss/java/ohi/andre/consolelauncher/FlavorUtils.java
@@ -0,0 +1,9 @@
+package ohi.andre.consolelauncher;
+
+public class FlavorUtils {
+
+    public static void startANR () {
+
+    }
+	
+}
diff --git a/app/src/main/java/ohi/andre/consolelauncher/LauncherActivity.java b/app/src/main/java/ohi/andre/consolelauncher/LauncherActivity.java
index 735bd325dec883bc6fea8ce281f12e941ebe9e8a..c7d3b22821b430d835573496a5a8eff415281914 100755
--- a/app/src/main/java/ohi/andre/consolelauncher/LauncherActivity.java
+++ b/app/src/main/java/ohi/andre/consolelauncher/LauncherActivity.java
@@ -22,9 +22,6 @@ import android.view.Window;
 import android.view.WindowManager;
 import android.widget.Toast;
 
-import com.github.anrwatchdog.ANRError;
-import com.github.anrwatchdog.ANRWatchDog;
-
 import java.util.LinkedList;
 import java.util.Queue;
 
@@ -219,17 +216,7 @@ public class LauncherActivity extends AppCompatActivity implements Reloadable {
     }
 
     private void finishOnCreate() {
-
-        new ANRWatchDog(5000)
-                .setANRListener(new ANRWatchDog.ANRListener() {
-                    @Override
-                    public void onAppNotResponding(ANRError anrError) {
-                        Tuils.log(anrError);
-                        Tuils.toFile(anrError);
-                    }
-                })
-                .setReportMainThreadOnly()
-                .start();
+        FlavorUtils.startANR();
 
         Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
             @Override
diff --git a/app/src/playstore/java/ohi/andre/consolelauncher/FlavorUtils.java b/app/src/playstore/java/ohi/andre/consolelauncher/FlavorUtils.java
new file mode 100755
index 0000000000000000000000000000000000000000..62100c6f03bac7d7e1a4530bfb72f49810fa7d26
--- /dev/null
+++ b/app/src/playstore/java/ohi/andre/consolelauncher/FlavorUtils.java
@@ -0,0 +1,22 @@
+package ohi.andre.consolelauncher;
+
+import com.github.anrwatchdog.ANRError;
+import com.github.anrwatchdog.ANRWatchDog;
+
+import ohi.andre.consolelauncher.tuils.Tuils;
+
+public class FlavorUtils {
+
+    public static void startANR () {
+        new ANRWatchDog(5000)
+                .setANRListener(new ANRWatchDog.ANRListener() {
+                    @Override
+                    public void onAppNotResponding(ANRError anrError) {
+                        Tuils.log(anrError);
+                        Tuils.toFile(anrError);
+                    }
+                })
+                .setReportMainThreadOnly()
+                .start();
+    }
+}
diff --git a/app/src/main/java/ohi/andre/consolelauncher/commands/main/raw/theme.java b/app/src/playstore/java/ohi/andre/consolelauncher/commands/main/raw/theme.java
similarity index 100%
rename from app/src/main/java/ohi/andre/consolelauncher/commands/main/raw/theme.java
rename to app/src/playstore/java/ohi/andre/consolelauncher/commands/main/raw/theme.java
diff --git a/app/src/main/java/ohi/andre/consolelauncher/managers/ThemesManager.java b/app/src/playstore/java/ohi/andre/consolelauncher/managers/ThemesManager.java
similarity index 100%
rename from app/src/main/java/ohi/andre/consolelauncher/managers/ThemesManager.java
rename to app/src/playstore/java/ohi/andre/consolelauncher/managers/ThemesManager.java
diff --git a/build.gradle b/build.gradle
index 5bbec01c658b6ec1a9dd2b0dc56780d887357eb8..3adf4a970bc6b8c9eb046b21947f753216c15fee 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.1'
+        classpath 'com.android.tools.build:gradle:2.3.3'
         classpath 'com.google.gms:google-services:3.1.0'
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 05ef575b0cd0173fc735f2857ce4bd594ce4f6bd..13372aef5e24af05341d49695ee84e5f9b594659 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ