diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..d12f141
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,47 @@
+language: android
+dist: trusty
+jdk: openjdk11
+
+env:
+  global:
+
+    - SLAVE_AAPT_TIMEOUT=31
+    - TERM=dumb
+    - GRADLE_OPTS="-XX:MaxPermSize=1024m -XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx2048m  -Dfile.encoding=UTF-8"
+
+matrix:
+  fast_finish: true
+
+android:
+  components:
+
+    - platform-tools
+    - tools
+    - build-tools-33.0.0
+    - android-33
+    - extra-google-m2repository
+    - extra-android-m2repository
+
+  # https://docs.travis-ci.com/user/languages/android/
+  licenses:
+    - 'android-sdk-preview-license-.+'
+    - 'android-sdk-license-.+'
+    - 'google-gdk-license-.+'
+
+before_install:
+  - git submodule update --init --recursive
+  - chmod u+x gradlew
+  - sdkmanager --update
+  - android list sdk --no-ui --all --extended
+  - android list targets
+  - yes | sdkmanager "platforms;android-33"
+
+install: true
+
+script:
+  - ./gradlew clean build --stacktrace
+
+after_failure: true
+
+notifications:
+  email: false
diff --git a/app/build.gradle b/app/build.gradle
index 7984033..6ead975 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,18 +1,15 @@
 apply plugin: 'com.android.application'
-
-repositories {
-    jcenter()
-    mavenCentral()
-}
+apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    compileSdkVersion COMPILE_SDK_VERSION
+    buildToolsVersion BUILD_TOOLS_VERSION
 
     defaultConfig {
+        minSdkVersion MIN_SDK_VERSION
+        targetSdkVersion TARGET_SDK_VERSION
         applicationId "io.palaima.debugdrawer.app"
-        minSdkVersion rootProject.ext.minSdkVersion
-        targetSdkVersion rootProject.ext.targetSdkVersion
+        namespace 'io.palaima.debugdrawer.app'
         versionCode 1
         versionName "1.0"
         multiDexEnabled true
@@ -30,63 +27,53 @@ android {
         // more targeted fashion...
         warning 'InvalidPackage'
     }
+
+    // region java compiler flags
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+
+    // endregion
+
+    // region compile options
+
+    kotlinOptions {
+        jvmTarget = "11"
+    }
+
+    // endregion
 }
 
+apply from: "../buildSrc/module_dependencies.gradle"
+
 dependencies {
-    implementation "com.android.support:appcompat-v7:$rootProject.ext.supportVersion"
-    implementation "com.android.support:support-v4:$rootProject.ext.supportVersion"
-    implementation "com.squareup.picasso:picasso:$rootProject.ext.picassoVersion"
-    implementation "com.jakewharton.picasso:picasso2-okhttp3-downloader:$rootProject.ext.picasso2Okhttp3Downloader"
-    implementation "com.squareup.okhttp3:okhttp:$rootProject.ext.okhttpVersion"
-    implementation "jp.wasabeef:takt:$rootProject.ext.taktVersion"
-    implementation "com.jakewharton.timber:timber:$rootProject.ext.timberVersion"
-    implementation "com.jakewharton.scalpel:scalpel:$rootProject.ext.scalpelVersion"
-    implementation "com.google.android.gms:play-services-location:$rootProject.ext.playServiceVersion"
-    implementation "com.github.bumptech.glide:glide:$rootProject.ext.glideVersion"
-    implementation "com.github.pedrovgs:lynx:$rootProject.ext.lynxVersion"
-    debugImplementation "com.readystatesoftware.chuck:library:$rootProject.ext.chukVersion"
-    releaseImplementation "com.readystatesoftware.chuck:library-no-op:$rootProject.ext.chukVersion"
-
-    /*
-    debugImplementation 'io.palaima.debugdrawer:debugdrawer:0.7.3'
-    debugImplementation 'io.palaima.debugdrawer:debugdrawer-view:0.7.3'
-    releaseImplementation 'io.palaima.debugdrawer:debugdrawer-no-op:0.7.3'
-    releaseImplementation 'io.palaima.debugdrawer:debugdrawer-view-no-op:0.7.3'
-    //implementation 'io.palaima.debugdrawer:debugdrawer-okhttp:0.7.3'
-    implementation 'io.palaima.debugdrawer:debugdrawer-okhttp3:0.7.3'
-    implementation 'io.palaima.debugdrawer:debugdrawer-scalpel:0.7.3'
-    implementation 'io.palaima.debugdrawer:debugdrawer-picasso:0.7.3'
-    implementation 'io.palaima.debugdrawer:debugdrawer-glide:0.7.3'
-    implementation 'io.palaima.debugdrawer:debugdrawer-location:0.7.3'
-    implementation 'io.palaima.debugdrawer:debugdrawer-timber:0.7.3'
-    implementation 'io.palaima.debugdrawer:debugdrawer-fps:0.7.3'
-    implementation 'io.palaima.debugdrawer:debugdrawer-actions:0.7.3'
-    implementation 'io.palaima.debugdrawer:debugdrawer-commons:0.7.3'
-    implementation 'io.palaima.debugdrawer:debugdrawer-logs:0.7.3'
-    implementation 'io.palaima.debugdrawer:debugdrawer-network-quality:0.7.3'
-    implementation 'io.palaima.debugdrawer:debugdrawer-base:0.7.3'
-    */
-
-    /*debugImplementation 'io.palaima.debugdrawer:debugdrawer:0.7.1-SNAPSHOT'
-    debugImplementation 'io.palaima.debugdrawer:debugdrawer-view:0.7.1-SNAPSHOT'
-    releaseImplementation 'io.palaima.debugdrawer:debugdrawer-no-op:0.7.1-SNAPSHOT'
-    releaseImplementation 'io.palaima.debugdrawer:debugdrawer-view-no-op:0.7.1-SNAPSHOT'
-    //implementation 'io.palaima.debugdrawer:debugdrawer-okhttp:0.7.1-SNAPSHOT'
-    implementation 'io.palaima.debugdrawer:debugdrawer-okhttp3:0.7.1-SNAPSHOT'
-    implementation 'io.palaima.debugdrawer:debugdrawer-scalpel:0.7.1-SNAPSHOT'
-    implementation 'io.palaima.debugdrawer:debugdrawer-picasso:0.7.1-SNAPSHOT'
-    implementation 'io.palaima.debugdrawer:debugdrawer-glide:0.7.1-SNAPSHOT'
-    implementation 'io.palaima.debugdrawer:debugdrawer-location:0.7.1-SNAPSHOT'
-    implementation 'io.palaima.debugdrawer:debugdrawer-timber:0.7.1-SNAPSHOT'
-    implementation 'io.palaima.debugdrawer:debugdrawer-fps:0.7.1-SNAPSHOT'
-    implementation 'io.palaima.debugdrawer:debugdrawer-actions:0.7.1-SNAPSHOT'
-    implementation 'io.palaima.debugdrawer:debugdrawer-commons:0.7.1-SNAPSHOT'
-    implementation 'io.palaima.debugdrawer:debugdrawer-base:0.7.1-SNAPSHOT'*/
 
-    releaseImplementation project(':debugdrawer-no-op')
+//    debugImplementation getLibrary("com.squareup.leakcanary:leakcanary-android")
+
+    debugImplementation getLibrary("com.readystatesoftware.chuck:library")
+    releaseImplementation getLibrary("com.readystatesoftware.chuck:library-no-op")
+
+    implementation getLibrary("com.google.android.material:material")
+    implementation getLibrary("androidx.appcompat:appcompat")
+    implementation getLibrary("androidx.annotation:annotation")
+    implementation getLibrary("com.squareup.picasso:picasso")
+    implementation getLibrary("com.squareup.okhttp3:okhttp")
+    implementation getLibrary("com.jakewharton.timber:timber")
+    implementation getLibrary("com.jakewharton.scalpel:scalpel")
+    implementation getLibrary("com.google.android.gms:play-services-location")
+    implementation getLibrary("com.github.bumptech.glide:glide")
+    implementation getLibrary("com.github.pedrovgs:lynx")
+//    implementation "com.jakewharton.picasso:picasso2-okhttp3-downloader:$rootProject.ext.picasso2Okhttp3Downloader"
+//    implementation "jp.wasabeef:takt:$rootProject.ext.taktVersion"
+
+    debugImplementation project(':debugdrawer-view')
     releaseImplementation project(':debugdrawer-view-no-op')
+
     debugImplementation project(':debugdrawer')
-    debugImplementation project(':debugdrawer-view')
+    releaseImplementation project(':debugdrawer-no-op')
+
     implementation project(':debugdrawer-base')
     implementation project(':debugdrawer-commons')
     implementation project(':debugdrawer-actions')
@@ -96,11 +83,8 @@ dependencies {
     implementation project(':debugdrawer-scalpel')
     implementation project(':debugdrawer-location')
     implementation project(':debugdrawer-timber')
-    implementation project(':debugdrawer-fps')
+//    implementation project(':debugdrawer-fps')
     implementation project(':debugdrawer-glide')
     implementation project(':debugdrawer-logs')
     implementation project(':debugdrawer-network-quality')
-
-    debugImplementation "com.squareup.leakcanary:leakcanary-android:$rootProject.ext.leakCanaryVersion"
-    releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$rootProject.ext.leakCanaryVersion"
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5399a85..c0e7e04 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,25 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.palaima.debugdrawer.app" >
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
-    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"/>
-    <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.BLUETOOTH"/>
-    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
 
     <application
+        android:name=".DebugDrawerApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme"
-        android:name=".DebugDrawerApplication">
+        android:theme="@style/AppTheme">
         <activity
             android:name=".MainActivity"
-            android:label="@string/app_name" >
+            android:exported="true"
+            android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -27,7 +28,9 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".DebugViewActivity"/>
+        <activity
+            android:name=".DebugViewActivity"
+            android:exported="false" />
 
     </application>
 
diff --git a/app/src/main/java/io/palaima/debugdrawer/app/DebugDrawerApplication.java b/app/src/main/java/io/palaima/debugdrawer/app/DebugDrawerApplication.java
index f59b2d2..e4076e7 100644
--- a/app/src/main/java/io/palaima/debugdrawer/app/DebugDrawerApplication.java
+++ b/app/src/main/java/io/palaima/debugdrawer/app/DebugDrawerApplication.java
@@ -1,9 +1,7 @@
 package io.palaima.debugdrawer.app;
 
 import android.app.Application;
-import android.support.multidex.MultiDex;
 
-import com.squareup.leakcanary.LeakCanary;
 
 import io.palaima.debugdrawer.timber.data.LumberYard;
 import timber.log.Timber;
@@ -13,8 +11,6 @@ public class DebugDrawerApplication extends Application {
     @Override
     public void onCreate() {
         super.onCreate();
-        MultiDex.install(this);
-        LeakCanary.install(this);
 
         LumberYard lumberYard = LumberYard.getInstance(this);
         lumberYard.cleanUp();
diff --git a/app/src/main/java/io/palaima/debugdrawer/app/DebugViewActivity.java b/app/src/main/java/io/palaima/debugdrawer/app/DebugViewActivity.java
index b9f2cdf..71d183b 100644
--- a/app/src/main/java/io/palaima/debugdrawer/app/DebugViewActivity.java
+++ b/app/src/main/java/io/palaima/debugdrawer/app/DebugViewActivity.java
@@ -3,12 +3,13 @@
 import android.app.Application;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
 import android.util.Log;
 import android.widget.Toast;
 
-import com.jakewharton.picasso.OkHttp3Downloader;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+
+import com.squareup.picasso.OkHttp3Downloader;
 import com.squareup.picasso.Picasso;
 
 import java.io.File;
@@ -23,16 +24,14 @@
 import io.palaima.debugdrawer.commons.DeviceModule;
 import io.palaima.debugdrawer.commons.NetworkModule;
 import io.palaima.debugdrawer.commons.SettingsModule;
-import io.palaima.debugdrawer.fps.FpsModule;
 import io.palaima.debugdrawer.location.LocationModule;
 import io.palaima.debugdrawer.logs.LogsModule;
 import io.palaima.debugdrawer.network.quality.NetworkQualityModule;
 import io.palaima.debugdrawer.okhttp3.OkHttp3Module;
 import io.palaima.debugdrawer.picasso.PicassoModule;
-import io.palaima.debugdrawer.scalpel.ScalpelModule;
+//import io.palaima.debugdrawer.scalpel.ScalpelModule;
 import io.palaima.debugdrawer.timber.TimberModule;
 import io.palaima.debugdrawer.view.DebugView;
-import jp.wasabeef.takt.Takt;
 import okhttp3.Cache;
 import okhttp3.OkHttpClient;
 import timber.log.Timber;
@@ -90,11 +89,11 @@ public void onItemSelected(String value) {
 
         debugView.modules(
             new ActionsModule(switchAction, buttonAction, spinnerAction),
-            new FpsModule(Takt.stock(getApplication())),
+//            new FpsModule(Takt.stock(getApplication())),
             new PicassoModule(picasso),
             new LocationModule(),
             new LogsModule(),
-            new ScalpelModule(this),
+//            new ScalpelModule(this),
             new TimberModule(),
             new OkHttp3Module(okHttpClient),
             new NetworkQualityModule(this),
diff --git a/app/src/main/java/io/palaima/debugdrawer/app/ImageAdapter.java b/app/src/main/java/io/palaima/debugdrawer/app/ImageAdapter.java
index 8e79116..39c94cd 100644
--- a/app/src/main/java/io/palaima/debugdrawer/app/ImageAdapter.java
+++ b/app/src/main/java/io/palaima/debugdrawer/app/ImageAdapter.java
@@ -1,7 +1,7 @@
 package io.palaima.debugdrawer.app;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/io/palaima/debugdrawer/app/MainActivity.java b/app/src/main/java/io/palaima/debugdrawer/app/MainActivity.java
index 27100be..397b77e 100644
--- a/app/src/main/java/io/palaima/debugdrawer/app/MainActivity.java
+++ b/app/src/main/java/io/palaima/debugdrawer/app/MainActivity.java
@@ -3,13 +3,14 @@
 import android.app.Application;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.ListView;
 import android.widget.Toast;
 
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+
 import com.bumptech.glide.Glide;
 
 import java.io.File;
@@ -27,15 +28,13 @@
 import io.palaima.debugdrawer.commons.DeviceModule;
 import io.palaima.debugdrawer.commons.NetworkModule;
 import io.palaima.debugdrawer.commons.SettingsModule;
-import io.palaima.debugdrawer.fps.FpsModule;
 import io.palaima.debugdrawer.glide.GlideModule;
 import io.palaima.debugdrawer.location.LocationModule;
 import io.palaima.debugdrawer.logs.LogsModule;
 import io.palaima.debugdrawer.network.quality.NetworkQualityModule;
 import io.palaima.debugdrawer.okhttp3.OkHttp3Module;
-import io.palaima.debugdrawer.scalpel.ScalpelModule;
+//import io.palaima.debugdrawer.scalpel.ScalpelModule;
 import io.palaima.debugdrawer.timber.TimberModule;
-import jp.wasabeef.takt.Takt;
 import okhttp3.Cache;
 import okhttp3.OkHttpClient;
 import timber.log.Timber;
@@ -82,10 +81,10 @@ public void onItemSelected(String value) {
         new DebugDrawer.Builder(this).modules(
             new GlideModule(Glide.get(this)),
             new ActionsModule(switchAction, buttonAction, spinnerAction),
-            new FpsModule(Takt.stock(getApplication())),
+//            new FpsModule(Takt.stock(getApplication())),
             new LocationModule(),
             new LogsModule(),
-            new ScalpelModule(this),
+//            new ScalpelModule(this),
             new TimberModule(),
             new OkHttp3Module(okHttpClient),
             new NetworkQualityModule(this),
@@ -93,7 +92,7 @@ public void onItemSelected(String value) {
             new BuildModule(),
             new NetworkModule(),
             new SettingsModule()
-        ).withTheme(R.style.Theme_AppCompat).build();
+        ).withTheme(R.style.AppTheme).build();
 
         showDummyLog();
 
diff --git a/app/src/main/res/layout/activity_debugview.xml b/app/src/main/res/layout/activity_debugview.xml
index 1b0974c..e900372 100644
--- a/app/src/main/res/layout/activity_debugview.xml
+++ b/app/src/main/res/layout/activity_debugview.xml
@@ -1,12 +1,11 @@
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
     tools:context=".DebugViewActivity">
 
-    <include layout="@layout/toolbar"/>
+    <include layout="@layout/toolbar" />
 
     <ScrollView
         android:layout_width="match_parent"
@@ -17,7 +16,7 @@
             android:id="@+id/debug_view"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="#ee212121"/>
+            android:background="#ee212121" />
 
     </ScrollView>
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index fd37bef..c0f331f 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,16 +1,15 @@
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
     tools:context=".MainActivity">
 
-    <include layout="@layout/toolbar"/>
+    <include layout="@layout/toolbar" />
 
     <ListView
         android:id="@+id/image_list"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
+        android:layout_height="match_parent" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/image_item.xml b/app/src/main/res/layout/image_item.xml
index 8f49e03..b20be89 100644
--- a/app/src/main/res/layout/image_item.xml
+++ b/app/src/main/res/layout/image_item.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
     <ImageView
         android:id="@+id/image"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
+        android:layout_height="wrap_content" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/toolbar.xml b/app/src/main/res/layout/toolbar.xml
index d5233ce..e1ba323 100644
--- a/app/src/main/res/layout/toolbar.xml
+++ b/app/src/main/res/layout/toolbar.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             android:layout_width="match_parent"
-             android:layout_height="wrap_content">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
 
-    <android.support.v7.widget.Toolbar xmlns:app="http://schemas.android.com/apk/res-auto"
-                                       android:layout_width="match_parent"
-                                       android:layout_height="?attr/actionBarSize"
-                                       android:background="?attr/colorPrimary"
-                                       app:theme="@style/ToolbarStyle"
-                                       app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
-                                       android:id="@+id/mainToolbar"/>
+    <androidx.appcompat.widget.Toolbar
+        android:id="@+id/mainToolbar"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:background="?attr/colorPrimary"
+        app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
+        app:theme="@style/ToolbarStyle" />
 
 </FrameLayout>
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index 282ff47..46c9038 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -1,9 +1,10 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-      xmlns:app="http://schemas.android.com/apk/res-auto"
-      xmlns:tools="http://schemas.android.com/tools"
-      tools:context=".MainActivity">
-    <item android:id="@+id/action_debug_view_activity"
-          android:title="@string/action_debug_view_activity"
-          android:orderInCategory="100"
-          app:showAsAction="ifRoom"/>
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context=".MainActivity">
+    <item
+        android:id="@+id/action_debug_view_activity"
+        android:orderInCategory="100"
+        android:title="@string/action_debug_view_activity"
+        app:showAsAction="ifRoom" />
 </menu>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 83b032f..36f95c9 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,6 +1,6 @@
 <resources>
 
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="AppTheme" parent="Theme.Material3.Light.NoActionBar">
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
diff --git a/build.gradle b/build.gradle
index 095959e..1fc3b28 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,107 +1,24 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
+apply from: "buildSrc/sdk_versions.gradle"
 
 buildscript {
     repositories {
-        jcenter()
+        mavenCentral()
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
+        classpath 'com.android.tools.build:gradle:7.3.0'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10"
     }
 }
 
 allprojects {
 
     repositories {
-        jcenter()
+        mavenCentral()
         google()
     }
-
-    configurations.all {
-        resolutionStrategy.force "com.android.support:support-compat:$supportVersion"
-        resolutionStrategy.force "com.android.support:support-core-ui:$supportVersion"
-        resolutionStrategy.force "com.android.support:support-core-utils:$supportVersion"
-        resolutionStrategy.force "com.android.support:support-annotations:$supportVersion"
-        resolutionStrategy.force "com.android.support:support-v4:$supportVersion"
-        resolutionStrategy.force "com.android.support:appcompat-v7:$supportVersion"
-        resolutionStrategy.force "com.android.support:support-v13:$supportVersion"
-        resolutionStrategy.force "com.android.support:cardview-v7:$supportVersion"
-        resolutionStrategy.force "com.android.support:design:$supportVersion"
-        resolutionStrategy.force "com.android.support:percent:$supportVersion"
-        resolutionStrategy.force "com.android.support:palette-v7:$supportVersion"
-        resolutionStrategy.force "com.android.support:recyclerview-v7:$supportVersion"
-        resolutionStrategy.force "com.android.support:customtabs:$supportVersion"
-        resolutionStrategy.force "com.android.support:animated-vector-drawable:$supportVersion"
-    }
 }
 
-
-allprojects {
-    def properties = new Properties()
-    properties.load(new FileInputStream(new File(rootDir, "version.properties")))
-    def major = properties['version.major'] as int
-    def minor = properties['version.minor'] as int
-    def patch = properties['version.patch'] as int
-    def suffix = properties['version.suffix']?.toString()?.trim() ?: ""
-    def snapshot = properties['version.snapshot'].toBoolean()
-
-    ext.libraryVersion = "$major.$minor.$patch" + (suffix.isAllWhitespace() ? '' : "-$suffix") + (snapshot ? '-RC' : '')
-    ext.group = 'io.palaima.debugdrawer'
-    ext.override = snapshot
-
-    ext.dryRun = properties['version.dryRun'].toBoolean()
-    ext.publish = properties['version.publish'].toBoolean()
-
-    ext.minSdkVersion = 16
-    ext.compileSdkVersion = 27
-    ext.targetSdkVersion = 27
-    ext.buildToolsVersion = '27.0.1'
-
-    ext.supportVersion = '27.0.2'
-    ext.butterknifeVersion = '8.4.0'
-    ext.glideVersion = '3.7.0'
-    ext.picassoVersion = '2.5.2'
-    ext.picasso2Okhttp3Downloader = '1.0.2'
-    ext.playServiceVersion = '11.8.0'
-    ext.timberVersion = '4.6.0'
-    ext.okhttpVersion = '3.4.1'
-    ext.okhttp2Version = '2.7.0'
-    ext.scalpelVersion = '1.1.2'
-    ext.taktVersion = '1.0.2'
-    ext.leakCanaryVersion = '1.5.4'
-    ext.lynxVersion = '1.1.0'
-    ext.chukVersion = '1.1.0'
-
-    ext.bintrayRepo = snapshot ? 'snapshots' : 'maven'
-    ext.orgName = 'palaima'
-
-    ext.publishedGroupId = 'io.palaima.debugdrawer'
-
-    ext.siteUrl = 'https://github.com/palaima/DebugDrawer'
-    ext.gitUrl = 'https://github.com/palaima/DebugDrawer.git'
-
-    ext.developerId = 'palaima'
-    ext.developerName = 'Mantas Palaima'
-    ext.developerEmail = 'palaima.mantas@gmail.com'
-
-    ext.licenseName = 'The Apache Software License, Version 2.0'
-    ext.licenseUrl = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-    ext.allLicenses = ["Apache-2.0"]
-
-    ext.githubRepo = 'palaima/DebugDrawer'
-    ext.githubReleaseNotesFile = 'README.md'
+task clean(type: Delete) {
+    delete rootProject.buildDir
 }
-
-if (JavaVersion.current().isJava8Compatible()) {
-    allprojects {
-        tasks.withType(Javadoc) {
-            options.addStringOption('Xdoclint:none', '-quiet')
-        }
-    }
-}
-
diff --git a/buildSrc/install-publish.gradle b/buildSrc/install-publish.gradle
new file mode 100644
index 0000000..38392f9
--- /dev/null
+++ b/buildSrc/install-publish.gradle
@@ -0,0 +1,27 @@
+apply plugin: 'maven-publish'
+
+group = "com.github.kibotu"
+version = VERSIONNAME
+
+android {
+
+    publishing {
+        singleVariant('release') {
+            withSourcesJar()
+            withJavadocJar()
+        }
+    }
+}
+publishing {
+    publications {
+        release(MavenPublication) {
+            groupId = "com.github.kibotu"
+            artifactId = artifact
+            version = VERSIONNAME
+
+            afterEvaluate {
+                from components.release
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/buildSrc/module_dependencies.gradle b/buildSrc/module_dependencies.gradle
new file mode 100644
index 0000000..a17fafc
--- /dev/null
+++ b/buildSrc/module_dependencies.gradle
@@ -0,0 +1,74 @@
+ext {
+
+    libraries = [
+            // https://mvnrepository.com/artifact/androidx.appcompat/appcompat
+            "androidx.appcompat:appcompat"                   : "1.5.1",
+
+            // https://mvnrepository.com/artifact/androidx.cardview/cardview
+            "androidx.cardview:cardview"                     : "1.0.0",
+
+            // https://mvnrepository.com/artifact/com.google.android.material/material
+            // https://www.material.io/develop/android/docs/getting-started/
+            "com.google.android.material:material"           : "1.6.1",
+
+            // https://mvnrepository.com/artifact/androidx.percentlayout/percentlayout
+            "androidx.percentlayout:percentlayout"           : "1.0.0",
+
+            // https://mvnrepository.com/artifact/androidx.palette/palette-ktx
+            "androidx.palette:palette-ktx"                   : "1.0.0",
+
+            // https://mvnrepository.com/artifact/androidx.recyclerview/recyclerview
+            "androidx.recyclerview:recyclerview"             : "1.2.1",
+
+            // https://mvnrepository.com/artifact/androidx.browser/browser
+            "androidx.browser:browser"                       : "1.4.0",
+
+            // https://mvnrepository.com/artifact/androidx.vectordrawable/vectordrawable-animated?repo=google
+            "androidx.vectordrawable:vectordrawable-animated": "1.1.0",
+
+            // https://mvnrepository.com/artifact/androidx.annotation/annotation
+            "androidx.annotation:annotation"                 : "1.4.0",
+
+            // https://mvnrepository.com/artifact/com.github.bumptech.glide/glide
+            "com.github.bumptech.glide:glide"                : "4.13.2",
+
+            // https://mvnrepository.com/artifact/com.google.android.gms/play-services-location?repo=google
+            "com.google.android.gms:play-services-location"  : "20.0.0",
+
+            // Lynx - for DebugDrawer
+            // NOTE: 1.1.0 is newer than 1.6, because the developer messed up the versions
+            // https://mvnrepository.com/artifact/com.github.pedrovgs/lynx
+            "com.github.pedrovgs:lynx"                       : "1.1.0",
+
+            // https://mvnrepository.com/artifact/com.readystatesoftware.chuck/library
+            "com.readystatesoftware.chuck:library"           : "1.1.0",
+            "com.readystatesoftware.chuck:library-no-op"     : "1.1.0",
+
+            // https://mvnrepository.com/artifact/com.squareup.okhttp3/okhttp
+            "com.squareup.okhttp3:okhttp"                    : "4.10.0",
+
+            // https://mvnrepository.com/artifact/com.squareup.picasso/picasso
+            "com.squareup.picasso:picasso"                   : "2.8",
+
+            // https://mvnrepository.com/artifact/com.jakewharton.scalpel/scalpel
+            "com.jakewharton.scalpel:scalpel"                : "1.1.2",
+
+            // https://mvnrepository.com/artifact/com.jakewharton.timber/timber
+            "com.jakewharton.timber:timber"                  : "5.0.1",
+
+            // https://mvnrepository.com/artifact/com.squareup.leakcanary/leakcanary-android
+            "com.squareup.leakcanary:leakcanary-android"     : " 2.9.1",
+    ]
+
+    getLibrary = { String lib ->
+        result = libraries.find { Map.Entry<String, String> entry -> entry["key"] == lib }
+        "${result["key"]}:${result["value"]}"
+    }
+
+    configurations.all {
+
+        (libraries).each {
+            resolutionStrategy.force "$it:${it.value}"
+        }
+    }
+}
diff --git a/buildSrc/sdk_versions.gradle b/buildSrc/sdk_versions.gradle
new file mode 100644
index 0000000..08327f0
--- /dev/null
+++ b/buildSrc/sdk_versions.gradle
@@ -0,0 +1,39 @@
+ext {
+    BUILD_TOOLS_VERSION = "33.0.0"
+    COMPILE_SDK_VERSION = 33
+    TARGET_SDK_VERSION = 33
+    MIN_SDK_VERSION = 21
+    KOTLIN_VERSION = "1.7.10"
+
+    isLocal = project.rootProject.file('local.properties').exists()
+    isCi = !isLocal
+
+    println()
+    println "Injected variables - SDK"
+    println "Build Tools: $BUILD_TOOLS_VERSION"
+    println "Compile SDK: $COMPILE_SDK_VERSION"
+    println "Target SDK: $TARGET_SDK_VERSION"
+    println "Min SDK: $MIN_SDK_VERSION"
+    println "Kotlin: $KOTLIN_VERSION"
+    println()
+
+    MAJOR_VERSION = project.hasProperty("major") ? Integer.parseInt(major) : 1
+    MINOR_VERSION = project.hasProperty("minor") ? Integer.parseInt(minor) : 0
+    HOTFIX_VERSION = project.hasProperty("hotfix") ? Integer.parseInt(hotfix) : 0
+    BUILD_NUMBER = project.hasProperty("build") ? Integer.parseInt(build) % 1000 : 0
+
+    VERSIONCODE = MAJOR_VERSION * 10000000 + MINOR_VERSION * 100000 + HOTFIX_VERSION * 1000 + BUILD_NUMBER
+    VERSIONNAME = "1.0.0"
+
+    println "Injected variables - App"
+
+    v = System.getProperty("version")
+    if (v != null) {
+        println "BUILD_VERSION: ${v}"
+        VERSIONNAME = v
+    }
+
+    println "VERSIONCODE: $VERSIONCODE"
+    println "VERSION: $VERSIONNAME"
+    println()
+}
diff --git a/debugdrawer-actions/build.gradle b/debugdrawer-actions/build.gradle
index 0ace5dd..ae31235 100644
--- a/debugdrawer-actions/build.gradle
+++ b/debugdrawer-actions/build.gradle
@@ -1,14 +1,20 @@
 apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+
+ext {
+    artifact = 'debugdrawer-actions'
+}
+
+apply from: "../buildSrc/install-publish.gradle"
 
 android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    compileSdkVersion COMPILE_SDK_VERSION
+    buildToolsVersion BUILD_TOOLS_VERSION
 
     defaultConfig {
-        minSdkVersion rootProject.ext.minSdkVersion
-        targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 1
-        versionName "1.0"
+        minSdkVersion MIN_SDK_VERSION
+        targetSdkVersion TARGET_SDK_VERSION
+        namespace "io.palaima.debugdrawer.actions"
     }
     buildTypes {
         release {
@@ -18,16 +24,9 @@ android {
     }
 }
 
+apply from: "../buildSrc/module_dependencies.gradle"
+
 dependencies {
-    implementation "com.android.support:support-annotations:$rootProject.ext.supportVersion"
+    implementation getLibrary("androidx.annotation:annotation" )
     implementation project(':debugdrawer-base')
 }
-
-ext {
-    libraryName = 'Debug Drawer Actions Module'
-    artifact = 'debugdrawer-actions'
-    libraryDescription = 'Android Debug Drawer Actions Module'
-}
-
-apply from: rootProject.file('gradle/install-v1.gradle')
-apply from: rootProject.file('gradle/bintray-android-v1.gradle')
\ No newline at end of file
diff --git a/debugdrawer-actions/src/main/AndroidManifest.xml b/debugdrawer-actions/src/main/AndroidManifest.xml
index 66d7cf5..15e7c2a 100644
--- a/debugdrawer-actions/src/main/AndroidManifest.xml
+++ b/debugdrawer-actions/src/main/AndroidManifest.xml
@@ -1,6 +1 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.palaima.debugdrawer.actions">
-
-    <application />
-
-</manifest>
+<manifest/>
\ No newline at end of file
diff --git a/debugdrawer-actions/src/main/java/io/palaima/debugdrawer/actions/Action.java b/debugdrawer-actions/src/main/java/io/palaima/debugdrawer/actions/Action.java
index d1b9545..76efb2b 100644
--- a/debugdrawer-actions/src/main/java/io/palaima/debugdrawer/actions/Action.java
+++ b/debugdrawer-actions/src/main/java/io/palaima/debugdrawer/actions/Action.java
@@ -1,6 +1,6 @@
 package io.palaima.debugdrawer.actions;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.LinearLayout;
diff --git a/debugdrawer-actions/src/main/java/io/palaima/debugdrawer/actions/ActionsModule.java b/debugdrawer-actions/src/main/java/io/palaima/debugdrawer/actions/ActionsModule.java
index b9ec6ca..8b719bd 100644
--- a/debugdrawer-actions/src/main/java/io/palaima/debugdrawer/actions/ActionsModule.java
+++ b/debugdrawer-actions/src/main/java/io/palaima/debugdrawer/actions/ActionsModule.java
@@ -1,6 +1,6 @@
 package io.palaima.debugdrawer.actions;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/debugdrawer-actions/src/main/java/io/palaima/debugdrawer/actions/ButtonAction.java b/debugdrawer-actions/src/main/java/io/palaima/debugdrawer/actions/ButtonAction.java
index 43cc9b2..324a165 100644
--- a/debugdrawer-actions/src/main/java/io/palaima/debugdrawer/actions/ButtonAction.java
+++ b/debugdrawer-actions/src/main/java/io/palaima/debugdrawer/actions/ButtonAction.java
@@ -1,6 +1,6 @@
 package io.palaima.debugdrawer.actions;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.Button;
diff --git a/debugdrawer-actions/src/main/java/io/palaima/debugdrawer/actions/SpinnerAction.java b/debugdrawer-actions/src/main/java/io/palaima/debugdrawer/actions/SpinnerAction.java
index e5227a5..edf80bc 100644
--- a/debugdrawer-actions/src/main/java/io/palaima/debugdrawer/actions/SpinnerAction.java
+++ b/debugdrawer-actions/src/main/java/io/palaima/debugdrawer/actions/SpinnerAction.java
@@ -1,7 +1,7 @@
 package io.palaima.debugdrawer.actions;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.AdapterView;
diff --git a/debugdrawer-actions/src/main/java/io/palaima/debugdrawer/actions/SwitchAction.java b/debugdrawer-actions/src/main/java/io/palaima/debugdrawer/actions/SwitchAction.java
index 19829f9..9ff3d14 100644
--- a/debugdrawer-actions/src/main/java/io/palaima/debugdrawer/actions/SwitchAction.java
+++ b/debugdrawer-actions/src/main/java/io/palaima/debugdrawer/actions/SwitchAction.java
@@ -2,8 +2,8 @@
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.CompoundButton;
diff --git a/debugdrawer-actions/src/main/res/layout/dd_debug_drawer_module_actions.xml b/debugdrawer-actions/src/main/res/layout/dd_debug_drawer_module_actions.xml
index 8ec0cd0..a9fa400 100644
--- a/debugdrawer-actions/src/main/res/layout/dd_debug_drawer_module_actions.xml
+++ b/debugdrawer-actions/src/main/res/layout/dd_debug_drawer_module_actions.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -13,7 +12,6 @@
         style="@style/Widget.DebugDrawer.Base.Header"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        tools:text="Actions"
-        />
+        tools:text="Actions" />
 
 </LinearLayout>
diff --git a/debugdrawer-actions/src/main/res/layout/dd_debug_drawer_module_actions_button.xml b/debugdrawer-actions/src/main/res/layout/dd_debug_drawer_module_actions_button.xml
index c1df8d2..2e0d9d1 100644
--- a/debugdrawer-actions/src/main/res/layout/dd_debug_drawer_module_actions_button.xml
+++ b/debugdrawer-actions/src/main/res/layout/dd_debug_drawer_module_actions_button.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Button
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<Button xmlns:android="http://schemas.android.com/apk/res/android"
     style="@style/Widget.DebugDrawer.Base.RowWidget"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"/>
\ No newline at end of file
+    android:layout_height="wrap_content" />
\ No newline at end of file
diff --git a/debugdrawer-actions/src/main/res/layout/dd_debug_drawer_module_actions_spinner.xml b/debugdrawer-actions/src/main/res/layout/dd_debug_drawer_module_actions_spinner.xml
index 31ed009..233dda8 100644
--- a/debugdrawer-actions/src/main/res/layout/dd_debug_drawer_module_actions_spinner.xml
+++ b/debugdrawer-actions/src/main/res/layout/dd_debug_drawer_module_actions_spinner.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Spinner
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<Spinner xmlns:android="http://schemas.android.com/apk/res/android"
     style="@style/Widget.DebugDrawer.Base.RowTitle"
     android:layout_width="wrap_content"
-    android:layout_height="wrap_content"/>
\ No newline at end of file
+    android:layout_height="wrap_content" />
\ No newline at end of file
diff --git a/debugdrawer-actions/src/main/res/layout/dd_debug_drawer_module_actions_switch.xml b/debugdrawer-actions/src/main/res/layout/dd_debug_drawer_module_actions_switch.xml
index 1710ef2..d38c558 100644
--- a/debugdrawer-actions/src/main/res/layout/dd_debug_drawer_module_actions_switch.xml
+++ b/debugdrawer-actions/src/main/res/layout/dd_debug_drawer_module_actions_switch.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     style="@style/Widget.DebugDrawer.Base.RowWidget"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -10,11 +9,11 @@
         android:id="@+id/action_switch_name"
         style="@style/Widget.DebugDrawer.Base.RowTitle"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
+        android:layout_height="wrap_content" />
 
     <Switch
         android:id="@+id/action_switch_switch"
         style="@style/Widget.DebugDrawer.Base.RowValue"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
+        android:layout_height="wrap_content" />
 </LinearLayout>
\ No newline at end of file
diff --git a/debugdrawer-base/build.gradle b/debugdrawer-base/build.gradle
index 2e3c680..c9593ae 100644
--- a/debugdrawer-base/build.gradle
+++ b/debugdrawer-base/build.gradle
@@ -1,14 +1,20 @@
 apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+
+ext {
+    artifact = 'debugdrawer-base'
+}
+
+apply from: "../buildSrc/install-publish.gradle"
 
 android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    compileSdkVersion COMPILE_SDK_VERSION
+    buildToolsVersion BUILD_TOOLS_VERSION
 
     defaultConfig {
-        minSdkVersion rootProject.ext.minSdkVersion
-        targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 1
-        versionName "1.0"
+        minSdkVersion MIN_SDK_VERSION
+        targetSdkVersion TARGET_SDK_VERSION
+        namespace "io.palaima.debugdrawer.base"
     }
     buildTypes {
         release {
@@ -18,16 +24,8 @@ android {
     }
 }
 
-dependencies {
-    implementation "com.android.support:support-annotations:$rootProject.ext.supportVersion"
-    implementation "com.android.support:appcompat-v7:$rootProject.ext.supportVersion"
-}
+apply from: "../buildSrc/module_dependencies.gradle"
 
-ext {
-    libraryName = 'Debug Drawer Base Module'
-    artifact = 'debugdrawer-base'
-    libraryDescription = 'Android Debug Drawer Base Module'
+dependencies {
+    implementation getLibrary("androidx.appcompat:appcompat")
 }
-
-apply from: rootProject.file('gradle/install-v1.gradle')
-apply from: rootProject.file('gradle/bintray-android-v1.gradle')
\ No newline at end of file
diff --git a/debugdrawer-base/src/main/AndroidManifest.xml b/debugdrawer-base/src/main/AndroidManifest.xml
index 00dad75..227314e 100644
--- a/debugdrawer-base/src/main/AndroidManifest.xml
+++ b/debugdrawer-base/src/main/AndroidManifest.xml
@@ -1,6 +1 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.palaima.debugdrawer.base">
-
-    <application />
-
-</manifest>
+<manifest />
\ No newline at end of file
diff --git a/debugdrawer-base/src/main/java/io/palaima/debugdrawer/base/DebugModule.java b/debugdrawer-base/src/main/java/io/palaima/debugdrawer/base/DebugModule.java
index dd52937..88c22c2 100644
--- a/debugdrawer-base/src/main/java/io/palaima/debugdrawer/base/DebugModule.java
+++ b/debugdrawer-base/src/main/java/io/palaima/debugdrawer/base/DebugModule.java
@@ -16,11 +16,12 @@
 
 package io.palaima.debugdrawer.base;
 
-import android.support.annotation.NonNull;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.NonNull;
+
 public interface DebugModule {
 
     /**
diff --git a/debugdrawer-commons/build.gradle b/debugdrawer-commons/build.gradle
index cd116a9..09ecd32 100644
--- a/debugdrawer-commons/build.gradle
+++ b/debugdrawer-commons/build.gradle
@@ -1,15 +1,22 @@
 apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+
+ext {
+    artifact = 'debugdrawer-commons'
+}
+
+apply from: "../buildSrc/install-publish.gradle"
 
 android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    compileSdkVersion COMPILE_SDK_VERSION
+    buildToolsVersion BUILD_TOOLS_VERSION
 
     defaultConfig {
-        minSdkVersion rootProject.ext.minSdkVersion
-        targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 1
-        versionName "1.0"
+        minSdkVersion MIN_SDK_VERSION
+        targetSdkVersion TARGET_SDK_VERSION
+        namespace "io.palaima.debugdrawer.commons"
     }
+
     buildTypes {
         release {
             minifyEnabled false
@@ -21,16 +28,9 @@ android {
     }
 }
 
+apply from: "../buildSrc/module_dependencies.gradle"
+
 dependencies {
-    implementation "com.android.support:support-annotations:$rootProject.ext.supportVersion"
+    implementation getLibrary("androidx.annotation:annotation")
     implementation project(':debugdrawer-base')
 }
-
-ext {
-    libraryName = 'Debug Drawer Commons Module'
-    artifact = 'debugdrawer-commons'
-    libraryDescription = 'Android Debug Drawer Commons Module'
-}
-
-apply from: rootProject.file('gradle/install-v1.gradle')
-apply from: rootProject.file('gradle/bintray-android-v1.gradle')
\ No newline at end of file
diff --git a/debugdrawer-commons/src/main/AndroidManifest.xml b/debugdrawer-commons/src/main/AndroidManifest.xml
index adec233..227314e 100644
--- a/debugdrawer-commons/src/main/AndroidManifest.xml
+++ b/debugdrawer-commons/src/main/AndroidManifest.xml
@@ -1,6 +1 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.palaima.debugdrawer.commons">
-
-    <application />
-
-</manifest>
+<manifest />
\ No newline at end of file
diff --git a/debugdrawer-commons/src/main/java/io/palaima/debugdrawer/commons/BuildModule.java b/debugdrawer-commons/src/main/java/io/palaima/debugdrawer/commons/BuildModule.java
index 89b0070..481b1ef 100644
--- a/debugdrawer-commons/src/main/java/io/palaima/debugdrawer/commons/BuildModule.java
+++ b/debugdrawer-commons/src/main/java/io/palaima/debugdrawer/commons/BuildModule.java
@@ -20,12 +20,13 @@
 import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
-import android.support.annotation.NonNull;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+
 import java.lang.ref.WeakReference;
 
 import io.palaima.debugdrawer.base.DebugModuleAdapter;
diff --git a/debugdrawer-commons/src/main/java/io/palaima/debugdrawer/commons/DeviceModule.java b/debugdrawer-commons/src/main/java/io/palaima/debugdrawer/commons/DeviceModule.java
index 29b4a50..2f6579b 100644
--- a/debugdrawer-commons/src/main/java/io/palaima/debugdrawer/commons/DeviceModule.java
+++ b/debugdrawer-commons/src/main/java/io/palaima/debugdrawer/commons/DeviceModule.java
@@ -18,13 +18,14 @@
 package io.palaima.debugdrawer.commons;
 
 import android.os.Build;
-import android.support.annotation.NonNull;
 import android.util.DisplayMetrics;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+
 import io.palaima.debugdrawer.base.DebugModuleAdapter;
 
 public class DeviceModule extends DebugModuleAdapter {
diff --git a/debugdrawer-commons/src/main/java/io/palaima/debugdrawer/commons/NetworkController.java b/debugdrawer-commons/src/main/java/io/palaima/debugdrawer/commons/NetworkController.java
index 7f68478..3d8b3ef 100644
--- a/debugdrawer-commons/src/main/java/io/palaima/debugdrawer/commons/NetworkController.java
+++ b/debugdrawer-commons/src/main/java/io/palaima/debugdrawer/commons/NetworkController.java
@@ -26,7 +26,8 @@
 import android.content.pm.PackageManager;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.Nullable;
 
 import java.lang.ref.WeakReference;
 
diff --git a/debugdrawer-commons/src/main/java/io/palaima/debugdrawer/commons/NetworkModule.java b/debugdrawer-commons/src/main/java/io/palaima/debugdrawer/commons/NetworkModule.java
index 212fc9a..176d5e2 100644
--- a/debugdrawer-commons/src/main/java/io/palaima/debugdrawer/commons/NetworkModule.java
+++ b/debugdrawer-commons/src/main/java/io/palaima/debugdrawer/commons/NetworkModule.java
@@ -25,13 +25,15 @@
 import android.net.NetworkInfo;
 import android.net.wifi.WifiManager;
 import android.os.Build;
-import android.support.annotation.NonNull;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CompoundButton;
 import android.widget.Switch;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresPermission;
+
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -84,17 +86,18 @@ public void onCheckedChanged(CompoundButton button, boolean isChecked) {
 
         if (bluetoothAdapter != null) {
             bluetooth.setChecked(hasBluetoothPermission(context) && bluetoothAdapter.isEnabled());
+
             bluetooth.setOnCheckedChangeListener(
-                new CompoundButton.OnCheckedChangeListener() {
-                    @Override
-                    public void onCheckedChanged(CompoundButton button, boolean isChecked) {
-                        if (isChecked) {
-                            bluetoothAdapter.enable();
-                        } else {
-                            bluetoothAdapter.disable();
+                    new CompoundButton.OnCheckedChangeListener() {
+                        @Override
+                        public void onCheckedChanged(CompoundButton button, boolean isChecked) {
+                            if (isChecked) {
+                                bluetoothAdapter.enable();
+                            } else {
+                                bluetoothAdapter.disable();
+                            }
                         }
-                    }
-                });
+                    });
         } else {
             bluetooth.setEnabled(false);
         }
@@ -158,15 +161,15 @@ private boolean hasBluetoothPermission(Context context) {
         public void onChanged(NetworkController.NetworkChangeEvent event) {
             if (wifi != null) {
                 wifi.setChecked(event.wifiState == NetworkInfo.State.CONNECTED
-                    || event.wifiState == NetworkInfo.State.CONNECTING);
+                        || event.wifiState == NetworkInfo.State.CONNECTING);
             }
             if (mobile != null) {
                 mobile.setChecked(event.mobileState == NetworkInfo.State.CONNECTED
-                    || event.mobileState == NetworkInfo.State.CONNECTING);
+                        || event.mobileState == NetworkInfo.State.CONNECTING);
             }
             if (bluetooth != null) {
                 bluetooth.setChecked(event.bluetoothState == NetworkController.BluetoothState.ON
-                    || event.bluetoothState == NetworkController.BluetoothState.TURNING_ON);
+                        || event.bluetoothState == NetworkController.BluetoothState.TURNING_ON);
             }
         }
     };
diff --git a/debugdrawer-commons/src/main/java/io/palaima/debugdrawer/commons/SettingsModule.java b/debugdrawer-commons/src/main/java/io/palaima/debugdrawer/commons/SettingsModule.java
index c00c27c..3406a34 100644
--- a/debugdrawer-commons/src/main/java/io/palaima/debugdrawer/commons/SettingsModule.java
+++ b/debugdrawer-commons/src/main/java/io/palaima/debugdrawer/commons/SettingsModule.java
@@ -23,13 +23,14 @@
 import android.content.pm.ResolveInfo;
 import android.net.Uri;
 import android.provider.Settings;
-import android.support.annotation.NonNull;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
+
 import io.palaima.debugdrawer.base.DebugModuleAdapter;
 
 public class SettingsModule extends DebugModuleAdapter implements View.OnClickListener {
diff --git a/debugdrawer-commons/src/main/res/layout/dd_debug_drawer_module_build.xml b/debugdrawer-commons/src/main/res/layout/dd_debug_drawer_module_build.xml
index 756aede..b941df2 100644
--- a/debugdrawer-commons/src/main/res/layout/dd_debug_drawer_module_build.xml
+++ b/debugdrawer-commons/src/main/res/layout/dd_debug_drawer_module_build.xml
@@ -1,54 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
-<GridLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="12dp"
     android:columnCount="2"
+    android:padding="12dp"
     tools:ignore="UselessParent">
+
     <TextView
-        android:layout_columnSpan="2"
+        style="@style/Widget.DebugDrawer.Base.Header"
         android:layout_width="0dp"
+        android:layout_columnSpan="2"
         android:layout_gravity="start|fill_horizontal"
-        android:text="Build Information"
-        style="@style/Widget.DebugDrawer.Base.Header"
-        />
+        android:text="Build Information" />
 
     <TextView
-        android:layout_gravity="start|center_vertical"
-        android:text="Version"
         style="@style/Widget.DebugDrawer.Base.RowTitle"
-        />
+        android:layout_gravity="start|center_vertical"
+        android:text="Version" />
+
     <TextView
         android:id="@+id/dd_debug_build_code"
-        android:layout_width="0dp"
-        android:layout_gravity="start|center_vertical|fill_horizontal"
         style="@style/Widget.DebugDrawer.Base.RowValue"
-        />
+        android:layout_width="0dp"
+        android:layout_gravity="start|center_vertical|fill_horizontal" />
 
     <TextView
-        android:layout_gravity="start|center_vertical"
-        android:text="Name"
         style="@style/Widget.DebugDrawer.Base.RowTitle"
-        />
+        android:layout_gravity="start|center_vertical"
+        android:text="Name" />
+
     <TextView
         android:id="@+id/dd_debug_build_name"
-        android:layout_width="0dp"
-        android:layout_gravity="start|center_vertical|fill_horizontal"
         style="@style/Widget.DebugDrawer.Base.RowValue"
-        />
+        android:layout_width="0dp"
+        android:layout_gravity="start|center_vertical|fill_horizontal" />
 
     <TextView
-        android:layout_gravity="start|center_vertical"
-        android:text="Package"
         style="@style/Widget.DebugDrawer.Base.RowTitle"
-        />
+        android:layout_gravity="start|center_vertical"
+        android:text="Package" />
+
     <TextView
         android:id="@+id/dd_debug_build_package"
-        android:layout_width="0dp"
-        android:layout_gravity="start|center_vertical|fill_horizontal"
         style="@style/Widget.DebugDrawer.Base.RowValue"
-        />
+        android:layout_width="0dp"
+        android:layout_gravity="start|center_vertical|fill_horizontal" />
 
 </GridLayout>
diff --git a/debugdrawer-commons/src/main/res/layout/dd_debug_drawer_module_device.xml b/debugdrawer-commons/src/main/res/layout/dd_debug_drawer_module_device.xml
index fa62993..75e2766 100644
--- a/debugdrawer-commons/src/main/res/layout/dd_debug_drawer_module_device.xml
+++ b/debugdrawer-commons/src/main/res/layout/dd_debug_drawer_module_device.xml
@@ -1,91 +1,84 @@
 <?xml version="1.0" encoding="utf-8"?>
-<GridLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="12dp"
     android:columnCount="2"
+    android:padding="12dp"
     tools:ignore="UselessParent">
+
     <TextView
-        android:layout_columnSpan="2"
+        style="@style/Widget.DebugDrawer.Base.Header"
         android:layout_width="0dp"
+        android:layout_columnSpan="2"
         android:layout_gravity="start|fill_horizontal"
-        android:text="Device Information"
-        style="@style/Widget.DebugDrawer.Base.Header"
-        />
+        android:text="Device Information" />
 
     <TextView
-        android:layout_gravity="start|center_vertical"
-        android:text="Make"
         style="@style/Widget.DebugDrawer.Base.RowTitle"
-        />
+        android:layout_gravity="start|center_vertical"
+        android:text="Make" />
+
     <TextView
         android:id="@+id/dd_debug_device_make"
-        android:layout_width="0dp"
-        android:layout_gravity="start|center_vertical|fill_horizontal"
         style="@style/Widget.DebugDrawer.Base.RowValue"
-        />
+        android:layout_width="0dp"
+        android:layout_gravity="start|center_vertical|fill_horizontal" />
 
     <TextView
-        android:layout_gravity="start|center_vertical"
-        android:text="Model"
         style="@style/Widget.DebugDrawer.Base.RowTitle"
-        />
+        android:layout_gravity="start|center_vertical"
+        android:text="Model" />
+
     <TextView
         android:id="@+id/dd_debug_device_model"
-        android:layout_width="0dp"
-        android:layout_gravity="start|center_vertical|fill_horizontal"
         style="@style/Widget.DebugDrawer.Base.RowValue"
-        />
+        android:layout_width="0dp"
+        android:layout_gravity="start|center_vertical|fill_horizontal" />
 
     <TextView
-        android:layout_gravity="start|center_vertical"
-        android:text="Resolution"
         style="@style/Widget.DebugDrawer.Base.RowTitle"
-        />
+        android:layout_gravity="start|center_vertical"
+        android:text="Resolution" />
+
     <TextView
         android:id="@+id/dd_debug_device_resolution"
-        android:layout_width="0dp"
-        android:layout_gravity="start|center_vertical|fill_horizontal"
         style="@style/Widget.DebugDrawer.Base.RowValue"
-        />
+        android:layout_width="0dp"
+        android:layout_gravity="start|center_vertical|fill_horizontal" />
 
     <TextView
-        android:layout_gravity="start|center_vertical"
-        android:text="Density"
         style="@style/Widget.DebugDrawer.Base.RowTitle"
-        />
+        android:layout_gravity="start|center_vertical"
+        android:text="Density" />
+
     <TextView
         android:id="@+id/dd_debug_device_density"
-        android:layout_width="0dp"
-        android:layout_gravity="start|center_vertical|fill_horizontal"
         style="@style/Widget.DebugDrawer.Base.RowValue"
-        />
+        android:layout_width="0dp"
+        android:layout_gravity="start|center_vertical|fill_horizontal" />
 
     <TextView
-        android:layout_gravity="start|center_vertical"
-        android:text="Release"
         style="@style/Widget.DebugDrawer.Base.RowTitle"
-        />
+        android:layout_gravity="start|center_vertical"
+        android:text="Release" />
+
     <TextView
         android:id="@+id/dd_debug_device_release"
+        style="@style/Widget.DebugDrawer.Base.RowValue"
         android:layout_width="0dp"
         android:layout_gravity="start|center_vertical|fill_horizontal"
-        style="@style/Widget.DebugDrawer.Base.RowValue"
-        android:text="sdgsdgf"
-        />
+        android:text="sdgsdgf" />
 
     <TextView
-        android:layout_gravity="start|center_vertical"
-        android:text="API"
         style="@style/Widget.DebugDrawer.Base.RowTitle"
-        />
+        android:layout_gravity="start|center_vertical"
+        android:text="API" />
+
     <TextView
         android:id="@+id/dd_debug_device_api"
-        android:layout_width="0dp"
-        android:layout_gravity="start|center_vertical|fill_horizontal"
         style="@style/Widget.DebugDrawer.Base.RowValue"
-        />
+        android:layout_width="0dp"
+        android:layout_gravity="start|center_vertical|fill_horizontal" />
 
 </GridLayout>
diff --git a/debugdrawer-commons/src/main/res/layout/dd_debug_drawer_module_network.xml b/debugdrawer-commons/src/main/res/layout/dd_debug_drawer_module_network.xml
index e936318..da420cf 100644
--- a/debugdrawer-commons/src/main/res/layout/dd_debug_drawer_module_network.xml
+++ b/debugdrawer-commons/src/main/res/layout/dd_debug_drawer_module_network.xml
@@ -1,52 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
-<GridLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="12dp"
     android:columnCount="2"
+    android:padding="12dp"
     tools:ignore="UselessParent">
+
     <TextView
-        android:layout_columnSpan="2"
+        style="@style/Widget.DebugDrawer.Base.Header"
         android:layout_width="0dp"
+        android:layout_columnSpan="2"
         android:layout_gravity="start|fill_horizontal"
-        android:text="Network"
-        style="@style/Widget.DebugDrawer.Base.Header"
-        />
+        android:text="Network" />
 
     <TextView
-        android:layout_gravity="start|center_vertical"
-        android:text="Wifi"
         style="@style/Widget.DebugDrawer.Base.RowTitle"
-        />
+        android:layout_gravity="start|center_vertical"
+        android:text="Wifi" />
+
     <Switch
         android:id="@+id/dd_debug_network_wifi"
-        android:layout_gravity="start|center_vertical"
         style="@style/Widget.DebugDrawer.Base.RowWidget"
-        />
+        android:layout_gravity="start|center_vertical" />
 
     <TextView
         android:id="@+id/dd_debug_network_mobile_label"
-        android:layout_gravity="start|center_vertical"
-        android:text="Mobile"
         style="@style/Widget.DebugDrawer.Base.RowTitle"
-        />
+        android:layout_gravity="start|center_vertical"
+        android:text="Mobile" />
+
     <Switch
         android:id="@+id/dd_debug_network_mobile"
-        android:layout_gravity="start|center_vertical"
         style="@style/Widget.DebugDrawer.Base.RowWidget"
-        />
+        android:layout_gravity="start|center_vertical" />
 
     <TextView
-        android:layout_gravity="start|center_vertical"
-        android:text="Bluetooth"
         style="@style/Widget.DebugDrawer.Base.RowTitle"
-        />
+        android:layout_gravity="start|center_vertical"
+        android:text="Bluetooth" />
+
     <Switch
         android:id="@+id/dd_debug_network_bluetooth"
-        android:layout_gravity="start|center_vertical"
         style="@style/Widget.DebugDrawer.Base.RowWidget"
-        />
+        android:layout_gravity="start|center_vertical" />
 
 </GridLayout>
diff --git a/debugdrawer-commons/src/main/res/layout/dd_debug_drawer_module_settings.xml b/debugdrawer-commons/src/main/res/layout/dd_debug_drawer_module_settings.xml
index 02deb26..a102f3e 100644
--- a/debugdrawer-commons/src/main/res/layout/dd_debug_drawer_module_settings.xml
+++ b/debugdrawer-commons/src/main/res/layout/dd_debug_drawer_module_settings.xml
@@ -1,18 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
     android:padding="12dp">
 
-
     <TextView
         android:id="@+id/textView"
         style="@style/Widget.DebugDrawer.Base.Header"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="Settings"/>
+        android:text="Settings" />
 
 
     <LinearLayout
@@ -25,13 +23,13 @@
             style="@style/Widget.DebugDrawer.Settings.Icon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:src="@drawable/dd_ic_developer_mode_black_24dp"/>
+            android:src="@drawable/dd_ic_developer_mode_black_24dp" />
 
         <TextView
             style="@style/Widget.DebugDrawer.Settings.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Developer"/>
+            android:text="Developer" />
 
     </LinearLayout>
 
@@ -45,13 +43,13 @@
             style="@style/Widget.DebugDrawer.Settings.Icon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:src="@drawable/dd_ic_battery_charging_full_black_24dp"/>
+            android:src="@drawable/dd_ic_battery_charging_full_black_24dp" />
 
         <TextView
             style="@style/Widget.DebugDrawer.Settings.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Battery"/>
+            android:text="Battery" />
 
     </LinearLayout>
 
@@ -66,13 +64,13 @@
             style="@style/Widget.DebugDrawer.Settings.Icon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:src="@drawable/dd_ic_location_on_black_24dp"/>
+            android:src="@drawable/dd_ic_location_on_black_24dp" />
 
         <TextView
             style="@style/Widget.DebugDrawer.Settings.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Location"/>
+            android:text="Location" />
 
     </LinearLayout>
 
@@ -87,13 +85,13 @@
             style="@style/Widget.DebugDrawer.Settings.Icon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:src="@drawable/dd_ic_settings_black_24dp"/>
+            android:src="@drawable/dd_ic_settings_black_24dp" />
 
         <TextView
             style="@style/Widget.DebugDrawer.Settings.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Settings"/>
+            android:text="Settings" />
 
     </LinearLayout>
 
@@ -107,13 +105,13 @@
             style="@style/Widget.DebugDrawer.Settings.Icon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:src="@drawable/dd_ic_info_outline_black_24dp"/>
+            android:src="@drawable/dd_ic_info_outline_black_24dp" />
 
         <TextView
             style="@style/Widget.DebugDrawer.Settings.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="App info"/>
+            android:text="App info" />
 
     </LinearLayout>
 
@@ -127,13 +125,13 @@
             style="@style/Widget.DebugDrawer.Settings.Icon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:src="@drawable/dd_ic_delete_black_24dp"/>
+            android:src="@drawable/dd_ic_delete_black_24dp" />
 
         <TextView
             style="@style/Widget.DebugDrawer.Settings.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Uninstall"/>
+            android:text="Uninstall" />
 
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/debugdrawer-fps/build.gradle b/debugdrawer-fps/build.gradle
index 4ba4327..8f512ec 100644
--- a/debugdrawer-fps/build.gradle
+++ b/debugdrawer-fps/build.gradle
@@ -1,15 +1,22 @@
 apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+
+ext {
+    artifact = 'debugdrawer-fps'
+}
+
+apply from: "../buildSrc/install-publish.gradle"
 
 android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    compileSdkVersion COMPILE_SDK_VERSION
+    buildToolsVersion BUILD_TOOLS_VERSION
 
     defaultConfig {
-        minSdkVersion rootProject.ext.minSdkVersion
-        targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 1
-        versionName "1.0"
+        minSdkVersion MIN_SDK_VERSION
+        targetSdkVersion TARGET_SDK_VERSION
+        namespace "io.palaima.debugdrawer.fps"
     }
+
     buildTypes {
         release {
             minifyEnabled false
@@ -18,17 +25,12 @@ android {
     }
 }
 
+apply from: "../buildSrc/module_dependencies.gradle"
+
 dependencies {
-    implementation "com.android.support:support-annotations:$rootProject.ext.supportVersion"
+    implementation getLibrary("androidx.annotation:annotation" )
     implementation project(':debugdrawer-base')
-    compileOnly "jp.wasabeef:takt:$rootProject.ext.taktVersion"
-}
 
-ext {
-    libraryName = 'Debug Drawer FPS Module'
-    artifact = 'debugdrawer-fps'
-    libraryDescription = 'Android Debug Drawer FPS Module'
+    // todo deps
+    // compileOnly "jp.wasabeef:takt:$rootProject.ext.taktVersion"
 }
-
-apply from: rootProject.file('gradle/install-v1.gradle')
-apply from: rootProject.file('gradle/bintray-android-v1.gradle')
\ No newline at end of file
diff --git a/debugdrawer-fps/src/main/AndroidManifest.xml b/debugdrawer-fps/src/main/AndroidManifest.xml
index 9aa7a13..227314e 100644
--- a/debugdrawer-fps/src/main/AndroidManifest.xml
+++ b/debugdrawer-fps/src/main/AndroidManifest.xml
@@ -1,6 +1 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.palaima.debugdrawer.fps">
-
-    <application />
-
-</manifest>
+<manifest />
\ No newline at end of file
diff --git a/debugdrawer-fps/src/main/java/io/palaima/debugdrawer/fps/FpsModule.java b/debugdrawer-fps/src/main/java/io/palaima/debugdrawer/fps/FpsModule.java
index deeb71c..d2f968e 100644
--- a/debugdrawer-fps/src/main/java/io/palaima/debugdrawer/fps/FpsModule.java
+++ b/debugdrawer-fps/src/main/java/io/palaima/debugdrawer/fps/FpsModule.java
@@ -1,14 +1,15 @@
 package io.palaima.debugdrawer.fps;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CompoundButton;
 import android.widget.Switch;
 
+
+
 import io.palaima.debugdrawer.base.DebugModuleAdapter;
-import jp.wasabeef.takt.Takt;
 
 public class FpsModule extends DebugModuleAdapter {
 
diff --git a/debugdrawer-fps/src/main/res/layout/dd_debug_drawer_item_fps.xml b/debugdrawer-fps/src/main/res/layout/dd_debug_drawer_item_fps.xml
index db1791c..bdaf510 100644
--- a/debugdrawer-fps/src/main/res/layout/dd_debug_drawer_item_fps.xml
+++ b/debugdrawer-fps/src/main/res/layout/dd_debug_drawer_item_fps.xml
@@ -1,30 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<GridLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="12dp"
     android:columnCount="2"
+    android:padding="12dp"
     tools:ignore="UselessParent">
+
     <TextView
-        android:layout_columnSpan="2"
+        style="@style/Widget.DebugDrawer.Base.Header"
         android:layout_width="0dp"
+        android:layout_columnSpan="2"
         android:layout_gravity="start|fill_horizontal"
-        android:text="FPS"
-        style="@style/Widget.DebugDrawer.Base.Header"
-        />
+        android:text="FPS" />
 
     <TextView
-        android:layout_gravity="start|center_vertical"
-        android:text="Show fps"
         style="@style/Widget.DebugDrawer.Base.RowTitle"
-        />
+        android:layout_gravity="start|center_vertical"
+        android:text="Show fps" />
+
     <Switch
         android:id="@+id/dd_debug_fps"
-        android:layout_gravity="start|center_vertical"
         style="@style/Widget.DebugDrawer.Base.RowWidget"
-        />
-
+        android:layout_gravity="start|center_vertical" />
 
 </GridLayout>
diff --git a/debugdrawer-glide/build.gradle b/debugdrawer-glide/build.gradle
index b46b5c1..6331266 100644
--- a/debugdrawer-glide/build.gradle
+++ b/debugdrawer-glide/build.gradle
@@ -1,14 +1,20 @@
 apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+
+ext {
+    artifact = 'debugdrawer-glide'
+}
+
+apply from: "../buildSrc/install-publish.gradle"
 
 android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    compileSdkVersion COMPILE_SDK_VERSION
+    buildToolsVersion BUILD_TOOLS_VERSION
 
     defaultConfig {
-        minSdkVersion rootProject.ext.minSdkVersion
-        targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 1
-        versionName "1.0"
+        minSdkVersion MIN_SDK_VERSION
+        targetSdkVersion TARGET_SDK_VERSION
+        namespace "io.palaima.debugdrawer.glide"
     }
     buildTypes {
         release {
@@ -18,17 +24,10 @@ android {
     }
 }
 
+apply from: "../buildSrc/module_dependencies.gradle"
+
 dependencies {
-    implementation "com.android.support:support-annotations:$rootProject.ext.supportVersion"
+    implementation getLibrary("androidx.annotation:annotation")
+    implementation getLibrary("com.github.bumptech.glide:glide")
     implementation project(':debugdrawer-base')
-    compileOnly "com.github.bumptech.glide:glide:$rootProject.ext.glideVersion"
 }
-
-ext {
-    libraryName = 'Debug Drawer Glide Module'
-    artifact = 'debugdrawer-glide'
-    libraryDescription = 'Android Debug Drawer Glide Module'
-}
-
-apply from: rootProject.file('gradle/install-v1.gradle')
-apply from: rootProject.file('gradle/bintray-android-v1.gradle')
\ No newline at end of file
diff --git a/debugdrawer-glide/src/main/AndroidManifest.xml b/debugdrawer-glide/src/main/AndroidManifest.xml
index 7939e89..227314e 100644
--- a/debugdrawer-glide/src/main/AndroidManifest.xml
+++ b/debugdrawer-glide/src/main/AndroidManifest.xml
@@ -1,6 +1 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.palaima.debugdrawer.glide">
-
-    <application />
-
-</manifest>
+<manifest />
\ No newline at end of file
diff --git a/debugdrawer-glide/src/main/java/io/palaima/debugdrawer/glide/GlideModule.java b/debugdrawer-glide/src/main/java/io/palaima/debugdrawer/glide/GlideModule.java
index a7e7af9..d52c380 100644
--- a/debugdrawer-glide/src/main/java/io/palaima/debugdrawer/glide/GlideModule.java
+++ b/debugdrawer-glide/src/main/java/io/palaima/debugdrawer/glide/GlideModule.java
@@ -1,6 +1,6 @@
 package io.palaima.debugdrawer.glide;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/debugdrawer-glide/src/main/res/layout/dd_debug_drawer_item_glide.xml b/debugdrawer-glide/src/main/res/layout/dd_debug_drawer_item_glide.xml
index 8ef4518..66f69a5 100644
--- a/debugdrawer-glide/src/main/res/layout/dd_debug_drawer_item_glide.xml
+++ b/debugdrawer-glide/src/main/res/layout/dd_debug_drawer_item_glide.xml
@@ -1,65 +1,57 @@
 <?xml version="1.0" encoding="utf-8"?>
-<GridLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="12dp"
     android:columnCount="2"
+    android:padding="12dp"
     tools:ignore="UselessParent">
+
     <TextView
-        android:layout_columnSpan="2"
+        style="@style/Widget.DebugDrawer.Base.Header"
         android:layout_width="0dp"
+        android:layout_columnSpan="2"
         android:layout_gravity="start|fill_horizontal"
-        android:text="@string/dd_module_title"
-        style="@style/Widget.DebugDrawer.Base.Header"
-        />
+        android:text="@string/dd_module_title" />
 
     <TextView
         style="@style/Widget.DebugDrawer.Base.RowTitle"
         android:layout_gravity="start|center_vertical"
-        android:text="Bitmap Pool Size"
-        />
+        android:text="Bitmap Pool Size" />
 
     <TextView
         android:id="@+id/dd_debug_glide_pool_size"
         style="@style/Widget.DebugDrawer.Base.RowValue"
         android:layout_width="0dp"
-        android:layout_gravity="start|center_vertical|fill_horizontal"
-        />
+        android:layout_gravity="start|center_vertical|fill_horizontal" />
 
     <TextView
         style="@style/Widget.DebugDrawer.Base.RowTitle"
         android:layout_columnSpan="2"
         android:layout_gravity="start|center_vertical"
-        android:text="Memory Cache"
-        />
+        android:text="Memory Cache" />
 
     <TextView
         style="@style/Widget.DebugDrawer.Base.RowTitle"
         android:layout_gravity="start|center_vertical"
-        android:text="   Current Size"
-        />
+        android:text="   Current Size" />
 
     <TextView
         android:id="@+id/dd_debug_glide_memcache_current"
         style="@style/Widget.DebugDrawer.Base.RowValue"
         android:layout_width="0dp"
-        android:layout_gravity="start|center_vertical|fill_horizontal"
-        />
+        android:layout_gravity="start|center_vertical|fill_horizontal" />
 
     <TextView
         style="@style/Widget.DebugDrawer.Base.RowTitle"
         android:layout_gravity="start|center_vertical"
-        android:text="   Max Size"
-        />
+        android:text="   Max Size" />
 
     <TextView
         android:id="@+id/dd_debug_glide_memcache_max"
         style="@style/Widget.DebugDrawer.Base.RowValue"
         android:layout_width="0dp"
-        android:layout_gravity="start|center_vertical|fill_horizontal"
-        />
+        android:layout_gravity="start|center_vertical|fill_horizontal" />
 
     <Button
         android:id="@+id/dd_button_clear_memcache"
@@ -67,8 +59,7 @@
         android:layout_height="wrap_content"
         android:layout_columnSpan="2"
         android:text="Clear Memory Cache"
-        android:textAllCaps="true"
-        />
+        android:textAllCaps="true" />
 
     <Button
         android:id="@+id/dd_button_clear_diskcache"
@@ -76,7 +67,6 @@
         android:layout_height="wrap_content"
         android:layout_columnSpan="2"
         android:text="Clear Disk Cache"
-        android:textAllCaps="true"
-        />
+        android:textAllCaps="true" />
 
 </GridLayout>
diff --git a/debugdrawer-location/build.gradle b/debugdrawer-location/build.gradle
index 6e945e6..b95947c 100644
--- a/debugdrawer-location/build.gradle
+++ b/debugdrawer-location/build.gradle
@@ -1,14 +1,20 @@
 apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+
+ext {
+    artifact = 'debugdrawer-location'
+}
+
+apply from: "../buildSrc/install-publish.gradle"
 
 android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    compileSdkVersion COMPILE_SDK_VERSION
+    buildToolsVersion BUILD_TOOLS_VERSION
 
     defaultConfig {
-        minSdkVersion rootProject.ext.minSdkVersion
-        targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 1
-        versionName "1.0"
+        minSdkVersion MIN_SDK_VERSION
+        targetSdkVersion TARGET_SDK_VERSION
+        namespace "io.palaima.debugdrawer.location"
     }
     buildTypes {
         release {
@@ -21,18 +27,13 @@ android {
     }
 }
 
+apply from: "../buildSrc/module_dependencies.gradle"
+
 dependencies {
-    implementation "com.android.support:support-annotations:$rootProject.ext.supportVersion"
-    implementation "com.android.support:appcompat-v7:$rootProject.ext.supportVersion"
+
     implementation project(':debugdrawer-base')
-    compileOnly "com.google.android.gms:play-services-location:$rootProject.ext.playServiceVersion"
-}
 
-ext {
-    libraryName = 'Debug Drawer Location Module'
-    artifact = 'debugdrawer-location'
-    libraryDescription = 'Android Debug Drawer Location Module'
+    implementation getLibrary("androidx.annotation:annotation")
+    implementation getLibrary("androidx.appcompat:appcompat")
+    implementation getLibrary("com.google.android.gms:play-services-location")
 }
-
-apply from: rootProject.file('gradle/install-v1.gradle')
-apply from: rootProject.file('gradle/bintray-android-v1.gradle')
\ No newline at end of file
diff --git a/debugdrawer-location/src/main/AndroidManifest.xml b/debugdrawer-location/src/main/AndroidManifest.xml
index c23abda..227314e 100644
--- a/debugdrawer-location/src/main/AndroidManifest.xml
+++ b/debugdrawer-location/src/main/AndroidManifest.xml
@@ -1,6 +1 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.palaima.debugdrawer.location">
-
-    <application />
-
-</manifest>
+<manifest />
\ No newline at end of file
diff --git a/debugdrawer-location/src/main/java/io/palaima/debugdrawer/location/LocationController.java b/debugdrawer-location/src/main/java/io/palaima/debugdrawer/location/LocationController.java
index d74a3cb..d744245 100644
--- a/debugdrawer-location/src/main/java/io/palaima/debugdrawer/location/LocationController.java
+++ b/debugdrawer-location/src/main/java/io/palaima/debugdrawer/location/LocationController.java
@@ -19,8 +19,7 @@
 import android.content.Context;
 import android.location.Location;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.content.PermissionChecker;
+import androidx.annotation.NonNull;
 
 import com.google.android.gms.common.ConnectionResult;
 import com.google.android.gms.common.api.GoogleApiClient;
diff --git a/debugdrawer-location/src/main/java/io/palaima/debugdrawer/location/LocationModule.java b/debugdrawer-location/src/main/java/io/palaima/debugdrawer/location/LocationModule.java
index 2ff7d53..21205b1 100644
--- a/debugdrawer-location/src/main/java/io/palaima/debugdrawer/location/LocationModule.java
+++ b/debugdrawer-location/src/main/java/io/palaima/debugdrawer/location/LocationModule.java
@@ -24,9 +24,10 @@
 import android.content.pm.PackageManager;
 import android.location.Location;
 import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
+
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/debugdrawer-location/src/main/res/layout/dd_debug_drawer_module_location.xml b/debugdrawer-location/src/main/res/layout/dd_debug_drawer_module_location.xml
index 5764c48..343a5a6 100644
--- a/debugdrawer-location/src/main/res/layout/dd_debug_drawer_module_location.xml
+++ b/debugdrawer-location/src/main/res/layout/dd_debug_drawer_module_location.xml
@@ -1,91 +1,84 @@
 <?xml version="1.0" encoding="utf-8"?>
-<GridLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="12dp"
     android:columnCount="2"
+    android:padding="12dp"
     tools:ignore="UselessParent">
+
     <TextView
-        android:layout_columnSpan="2"
+        style="@style/Widget.DebugDrawer.Base.Header"
         android:layout_width="0dp"
+        android:layout_columnSpan="2"
         android:layout_gravity="start|fill_horizontal"
-        android:text="Location"
-        style="@style/Widget.DebugDrawer.Base.Header"
-        />
+        android:text="Location" />
 
     <TextView
-        android:layout_gravity="start|center_vertical"
-        android:text="Latitude"
         style="@style/Widget.DebugDrawer.Base.RowTitle"
-        />
+        android:layout_gravity="start|center_vertical"
+        android:text="Latitude" />
+
     <TextView
         android:id="@+id/dd_debug_location_latitude"
-        android:layout_width="0dp"
-        android:layout_gravity="start|center_vertical|fill_horizontal"
         style="@style/Widget.DebugDrawer.Base.RowValue"
-        />
+        android:layout_width="0dp"
+        android:layout_gravity="start|center_vertical|fill_horizontal" />
 
     <TextView
-        android:layout_gravity="start|center_vertical"
-        android:text="Longitude"
         style="@style/Widget.DebugDrawer.Base.RowTitle"
-        />
+        android:layout_gravity="start|center_vertical"
+        android:text="Longitude" />
+
     <TextView
         android:id="@+id/dd_debug_location_longitude"
-        android:layout_width="0dp"
-        android:layout_gravity="start|center_vertical|fill_horizontal"
         style="@style/Widget.DebugDrawer.Base.RowValue"
-        />
+        android:layout_width="0dp"
+        android:layout_gravity="start|center_vertical|fill_horizontal" />
 
     <TextView
-        android:layout_gravity="start|center_vertical"
-        android:text="Accuracy"
         style="@style/Widget.DebugDrawer.Base.RowTitle"
-        />
+        android:layout_gravity="start|center_vertical"
+        android:text="Accuracy" />
+
     <TextView
         android:id="@+id/dd_debug_location_accuracy"
-        android:layout_width="0dp"
-        android:layout_gravity="start|center_vertical|fill_horizontal"
         style="@style/Widget.DebugDrawer.Base.RowValue"
-        />
+        android:layout_width="0dp"
+        android:layout_gravity="start|center_vertical|fill_horizontal" />
 
     <TextView
-        android:layout_gravity="start|center_vertical"
-        android:text="Time"
         style="@style/Widget.DebugDrawer.Base.RowTitle"
-        />
+        android:layout_gravity="start|center_vertical"
+        android:text="Time" />
+
     <TextView
         android:id="@+id/dd_debug_location_time"
-        android:layout_width="0dp"
-        android:layout_gravity="start|center_vertical|fill_horizontal"
         style="@style/Widget.DebugDrawer.Base.RowValue"
-        />
+        android:layout_width="0dp"
+        android:layout_gravity="start|center_vertical|fill_horizontal" />
 
     <TextView
-        android:layout_gravity="start|center_vertical"
-        android:text="Provider"
         style="@style/Widget.DebugDrawer.Base.RowTitle"
-        />
+        android:layout_gravity="start|center_vertical"
+        android:text="Provider" />
+
     <TextView
         android:id="@+id/dd_debug_location_provider"
-        android:layout_width="0dp"
-        android:layout_gravity="start|center_vertical|fill_horizontal"
         style="@style/Widget.DebugDrawer.Base.RowValue"
-        />
+        android:layout_width="0dp"
+        android:layout_gravity="start|center_vertical|fill_horizontal" />
 
     <TextView
-        android:layout_gravity="start|center_vertical"
-        android:text="Map"
         style="@style/Widget.DebugDrawer.Base.RowTitle"
-        />
+        android:layout_gravity="start|center_vertical"
+        android:text="Map" />
+
     <ImageView
         android:id="@+id/dd_debug_location_map"
+        style="@style/Widget.DebugDrawer.Base.RowValue"
         android:layout_width="0dp"
         android:layout_gravity="start|center|fill_horizontal"
-        style="@style/Widget.DebugDrawer.Base.RowValue"
-        android:src="@drawable/dd_ic_map_white_24dp"
-        />
+        android:src="@drawable/dd_ic_map_white_24dp" />
 
 </GridLayout>
diff --git a/debugdrawer-logs/build.gradle b/debugdrawer-logs/build.gradle
index c12fdb5..0004d3f 100644
--- a/debugdrawer-logs/build.gradle
+++ b/debugdrawer-logs/build.gradle
@@ -1,14 +1,20 @@
 apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+
+ext {
+    artifact = 'debugdrawer-logs'
+}
+
+apply from: "../buildSrc/install-publish.gradle"
 
 android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    compileSdkVersion COMPILE_SDK_VERSION
+    buildToolsVersion BUILD_TOOLS_VERSION
 
     defaultConfig {
-        minSdkVersion rootProject.ext.minSdkVersion
-        targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 1
-        versionName "1.0"
+        minSdkVersion MIN_SDK_VERSION
+        targetSdkVersion TARGET_SDK_VERSION
+        namespace "io.palaima.debugdrawer.logs"
     }
     buildTypes {
         release {
@@ -18,19 +24,13 @@ android {
     }
 }
 
+apply from: "../buildSrc/module_dependencies.gradle"
+
 dependencies {
-    implementation "com.android.support:support-annotations:$rootProject.ext.supportVersion"
     implementation project(':debugdrawer-base')
 
-    compileOnly "com.github.pedrovgs:lynx:$rootProject.ext.lynxVersion"
-    compileOnly "com.readystatesoftware.chuck:library:$rootProject.ext.chukVersion"
+    implementation getLibrary("androidx.annotation:annotation")
+    implementation getLibrary("com.github.pedrovgs:lynx")
+    debugImplementation getLibrary("com.readystatesoftware.chuck:library")
+    releaseImplementation getLibrary("com.readystatesoftware.chuck:library-no-op")
 }
-
-ext {
-    libraryName = 'Debug Drawer Logs Module'
-    artifact = 'debugdrawer-logs'
-    libraryDescription = 'Android Debug Drawer Logs Module'
-}
-
-apply from: rootProject.file('gradle/install-v1.gradle')
-apply from: rootProject.file('gradle/bintray-android-v1.gradle')
diff --git a/debugdrawer-logs/src/main/AndroidManifest.xml b/debugdrawer-logs/src/main/AndroidManifest.xml
index d4ea390..227314e 100644
--- a/debugdrawer-logs/src/main/AndroidManifest.xml
+++ b/debugdrawer-logs/src/main/AndroidManifest.xml
@@ -1,2 +1 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="io.palaima.debugdrawer.logs"/>
+<manifest />
\ No newline at end of file
diff --git a/debugdrawer-logs/src/main/java/io/palaima/debugdrawer/logs/LogsModule.java b/debugdrawer-logs/src/main/java/io/palaima/debugdrawer/logs/LogsModule.java
index fc6ac1e..adf7c15 100644
--- a/debugdrawer-logs/src/main/java/io/palaima/debugdrawer/logs/LogsModule.java
+++ b/debugdrawer-logs/src/main/java/io/palaima/debugdrawer/logs/LogsModule.java
@@ -18,8 +18,8 @@
 package io.palaima.debugdrawer.logs;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/debugdrawer-logs/src/main/res/layout/dd_module_logs.xml b/debugdrawer-logs/src/main/res/layout/dd_module_logs.xml
index bfa1062..d923c8d 100644
--- a/debugdrawer-logs/src/main/res/layout/dd_module_logs.xml
+++ b/debugdrawer-logs/src/main/res/layout/dd_module_logs.xml
@@ -1,33 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="12dp"
     android:orientation="vertical"
-    tools:ignore="UselessParent"
-    >
+    android:padding="12dp"
+    tools:ignore="UselessParent">
 
     <TextView
+        style="@style/Widget.DebugDrawer.Base.Header"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="Logs"
-        style="@style/Widget.DebugDrawer.Base.Header"
-        />
+        android:text="Logs" />
 
     <Button
         android:id="@+id/dd_module_logs_chuck"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="HTTP Requests"
-        />
+        android:text="HTTP Requests" />
 
     <Button
         android:id="@+id/dd_module_logs_logcat"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="Logcat"
-        />
+        android:text="Logcat" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/debugdrawer-network-quality/build.gradle b/debugdrawer-network-quality/build.gradle
index cdba977..782d076 100644
--- a/debugdrawer-network-quality/build.gradle
+++ b/debugdrawer-network-quality/build.gradle
@@ -1,14 +1,21 @@
 apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+
+ext {
+    artifact = 'debugdrawer-network-quality'
+}
+
+apply from: "../buildSrc/install-publish.gradle"
+
 
 android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    compileSdkVersion COMPILE_SDK_VERSION
+    buildToolsVersion BUILD_TOOLS_VERSION
 
     defaultConfig {
-        minSdkVersion rootProject.ext.minSdkVersion
-        targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 1
-        versionName "1.0"
+        minSdkVersion MIN_SDK_VERSION
+        targetSdkVersion TARGET_SDK_VERSION
+        namespace "io.palaima.debugdrawer.network.quality"
     }
     buildTypes {
         release {
@@ -16,20 +23,30 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+
+    // region java compiler flags
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+
+    // endregion
+
+    // region compile options
+
+    kotlinOptions {
+        jvmTarget = "11"
+    }
+
+    // endregion
 }
 
+apply from: "../buildSrc/module_dependencies.gradle"
+
 dependencies {
-    implementation "com.android.support:support-annotations:$rootProject.ext.supportVersion"
     implementation project(':debugdrawer-base')
 
-    compileOnly "com.squareup.okhttp3:okhttp:$rootProject.ext.okhttpVersion"
+    implementation getLibrary("androidx.annotation:annotation")
+    implementation getLibrary("com.squareup.okhttp3:okhttp")
 }
-
-ext {
-    libraryName = 'Debug Drawer Network Quality Module'
-    artifact = 'debugdrawer-network-quality'
-    libraryDescription = 'Android Debug Drawer Network Quality Module'
-}
-
-apply from: rootProject.file('gradle/install-v1.gradle')
-apply from: rootProject.file('gradle/bintray-android-v1.gradle')
diff --git a/debugdrawer-network-quality/src/main/AndroidManifest.xml b/debugdrawer-network-quality/src/main/AndroidManifest.xml
index 9e6fbaa..cc947c5 100644
--- a/debugdrawer-network-quality/src/main/AndroidManifest.xml
+++ b/debugdrawer-network-quality/src/main/AndroidManifest.xml
@@ -1,2 +1 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="io.palaima.debugdrawer.network.quality"/>
+<manifest />
diff --git a/debugdrawer-network-quality/src/main/java/io/palaima/debugdrawer/network/quality/NetworkQualityModule.java b/debugdrawer-network-quality/src/main/java/io/palaima/debugdrawer/network/quality/NetworkQualityModule.java
index 6f39512..5d244e3 100644
--- a/debugdrawer-network-quality/src/main/java/io/palaima/debugdrawer/network/quality/NetworkQualityModule.java
+++ b/debugdrawer-network-quality/src/main/java/io/palaima/debugdrawer/network/quality/NetworkQualityModule.java
@@ -2,8 +2,8 @@
 
 import android.content.Context;
 import android.content.res.TypedArray;
-import android.support.annotation.AttrRes;
-import android.support.annotation.NonNull;
+import androidx.annotation.AttrRes;
+import androidx.annotation.NonNull;
 import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
diff --git a/debugdrawer-network-quality/src/main/res/layout/dd_module_network.xml b/debugdrawer-network-quality/src/main/res/layout/dd_module_network.xml
index e88f3d1..b1545cc 100644
--- a/debugdrawer-network-quality/src/main/res/layout/dd_module_network.xml
+++ b/debugdrawer-network-quality/src/main/res/layout/dd_module_network.xml
@@ -1,49 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
     android:padding="12dp"
-    tools:ignore="UselessParent"
-    >
+    tools:ignore="UselessParent">
 
     <TextView
         style="@style/Widget.DebugDrawer.Base.Header"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="Network Quality"
-        />
+        android:text="Network Quality" />
 
     <GridLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:columnCount="3"
-        >
+        android:columnCount="3">
         <!-- Connectivity -->
         <TextView
             style="@style/Widget.DebugDrawer.Base.RowTitle"
             android:layout_gravity="start|end|center_vertical"
-            android:text="Connected"
-            />
+            android:text="Connected" />
 
         <Switch
             android:id="@+id/dd_module_networkquality_enabled"
             style="@style/Widget.DebugDrawer.Base.RowValue"
             android:layout_gravity="start|center_vertical"
             android:layout_marginTop="4dp"
-            android:minHeight="26dp"
-            />
+            android:minHeight="26dp" />
 
-        <android.support.v4.widget.Space/>
+        <Space />
 
         <!-- Delay -->
         <TextView
             style="@style/Widget.DebugDrawer.Base.RowTitle"
             android:layout_gravity="start|center_vertical"
-            android:text="Delay"
-            />
+            android:text="Delay" />
 
         <TextView
             android:id="@+id/debug_network_delay_indicator"
@@ -52,22 +45,19 @@
             android:layout_gravity="center_vertical|clip_horizontal"
             android:gravity="end|center_vertical"
             android:text="0 s"
-            tools:text="0.5 s"
-            />
+            tools:text="0.5 s" />
 
         <SeekBar
             android:id="@+id/debug_network_delay"
             style="@style/Widget.DebugDrawer.Base.RowValue"
-            android:layout_gravity="end|fill_horizontal"
-            />
+            android:layout_gravity="end|fill_horizontal" />
 
         <!-- Error -->
 
         <TextView
             style="@style/Widget.DebugDrawer.Base.RowTitle"
             android:layout_gravity="start|center_vertical"
-            android:text="Error"
-            />
+            android:text="Error" />
 
         <TextView
             android:id="@+id/debug_network_error_indicator"
@@ -76,14 +66,12 @@
             android:layout_gravity="end|center_vertical"
             android:gravity="end|center_vertical"
             android:text="0 %"
-            tools:text="100 %"
-            />
+            tools:text="100 %" />
 
         <SeekBar
             android:id="@+id/debug_network_error"
             style="@style/Widget.DebugDrawer.Base.RowValue"
             android:layout_gravity="end|fill_horizontal"
-            tools:progress="70"
-            />
+            tools:progress="70" />
     </GridLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/debugdrawer-no-op/build.gradle b/debugdrawer-no-op/build.gradle
index 0a1a9c9..556b93f 100644
--- a/debugdrawer-no-op/build.gradle
+++ b/debugdrawer-no-op/build.gradle
@@ -1,14 +1,20 @@
 apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+ext {
+    artifact = 'debugdrawer-no-op'
+}
+
+apply from: "../buildSrc/install-publish.gradle"
+
 
 android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    compileSdkVersion COMPILE_SDK_VERSION
+    buildToolsVersion BUILD_TOOLS_VERSION
 
     defaultConfig {
-        minSdkVersion rootProject.ext.minSdkVersion
-        targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 1
-        versionName "1.0"
+        minSdkVersion MIN_SDK_VERSION
+        targetSdkVersion TARGET_SDK_VERSION
+        namespace "io.palaima.debugdrawer"
     }
     buildTypes {
         release {
@@ -16,18 +22,28 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+
+    // region java compiler flags
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+
+    // endregion
+
+    // region compile options
+
+    kotlinOptions {
+        jvmTarget = "11"
+    }
+
+    // endregion
 }
 
+apply from: "../buildSrc/module_dependencies.gradle"
+
 dependencies {
     implementation project(':debugdrawer-base')
-    implementation "com.android.support:appcompat-v7:$rootProject.ext.supportVersion"
+    implementation getLibrary("androidx.appcompat:appcompat")
 }
-
-ext {
-    libraryName = 'Debug Drawer No-Op'
-    artifact = 'debugdrawer-no-op'
-    libraryDescription = 'Android Debug Drawer No-Op'
-}
-
-apply from: rootProject.file('gradle/install-v1.gradle')
-apply from: rootProject.file('gradle/bintray-android-v1.gradle')
\ No newline at end of file
diff --git a/debugdrawer-no-op/src/main/AndroidManifest.xml b/debugdrawer-no-op/src/main/AndroidManifest.xml
index 1e0e8f3..227314e 100644
--- a/debugdrawer-no-op/src/main/AndroidManifest.xml
+++ b/debugdrawer-no-op/src/main/AndroidManifest.xml
@@ -1,6 +1 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.palaima.debugdrawer">
-
-    <application />
-
-</manifest>
+<manifest />
\ No newline at end of file
diff --git a/debugdrawer-no-op/src/main/java/io/palaima/debugdrawer/DebugDrawer.java b/debugdrawer-no-op/src/main/java/io/palaima/debugdrawer/DebugDrawer.java
index 4143dcb..e3704a1 100644
--- a/debugdrawer-no-op/src/main/java/io/palaima/debugdrawer/DebugDrawer.java
+++ b/debugdrawer-no-op/src/main/java/io/palaima/debugdrawer/DebugDrawer.java
@@ -18,10 +18,11 @@
 
 import android.app.Activity;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.IntegerRes;
-import android.support.annotation.StyleRes;
-import android.support.v4.widget.DrawerLayout;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.IntegerRes;
+import androidx.annotation.StyleRes;
+import androidx.drawerlayout.widget.DrawerLayout;
+
 import android.view.ViewGroup;
 
 import io.palaima.debugdrawer.base.DebugModule;
diff --git a/debugdrawer-okhttp/build.gradle b/debugdrawer-okhttp/build.gradle
index 2b2a295..4503a82 100644
--- a/debugdrawer-okhttp/build.gradle
+++ b/debugdrawer-okhttp/build.gradle
@@ -1,14 +1,21 @@
 apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+
+ext {
+    artifact = 'debugdrawer-okhttp'
+}
+
+apply from: "../buildSrc/install-publish.gradle"
+
 
 android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    compileSdkVersion COMPILE_SDK_VERSION
+    buildToolsVersion BUILD_TOOLS_VERSION
 
     defaultConfig {
-        minSdkVersion rootProject.ext.minSdkVersion
-        targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 1
-        versionName "1.0"
+        minSdkVersion MIN_SDK_VERSION
+        targetSdkVersion TARGET_SDK_VERSION
+        namespace "io.palaima.debugdrawer.okhttp"
     }
     buildTypes {
         release {
@@ -23,19 +30,29 @@ android {
         // more targeted fashion...
         warning 'InvalidPackage'
     }
+
+    // region java compiler flags
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+
+    // endregion
+
+    // region compile options
+
+    kotlinOptions {
+        jvmTarget = "11"
+    }
+
+    // endregion
 }
 
+apply from: "../buildSrc/module_dependencies.gradle"
+
 dependencies {
-    implementation "com.android.support:support-annotations:$rootProject.ext.supportVersion"
     implementation project(':debugdrawer-base')
-    compileOnly "com.squareup.okhttp:okhttp:$rootProject.ext.okhttp2Version"
+    implementation getLibrary("androidx.annotation:annotation")
+    implementation getLibrary("com.squareup.okhttp3:okhttp")
 }
-
-ext {
-    libraryName = 'Debug Drawer OkHttp Module'
-    artifact = 'debugdrawer-okhttp'
-    libraryDescription = 'Android Debug Drawer OkHttp Module'
-}
-
-apply from: rootProject.file('gradle/install-v1.gradle')
-apply from: rootProject.file('gradle/bintray-android-v1.gradle')
\ No newline at end of file
diff --git a/debugdrawer-okhttp/src/main/AndroidManifest.xml b/debugdrawer-okhttp/src/main/AndroidManifest.xml
index 9c8593c..227314e 100644
--- a/debugdrawer-okhttp/src/main/AndroidManifest.xml
+++ b/debugdrawer-okhttp/src/main/AndroidManifest.xml
@@ -1,6 +1 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.palaima.debugdrawer.okhttp">
-
-    <application />
-
-</manifest>
+<manifest />
\ No newline at end of file
diff --git a/debugdrawer-okhttp/src/main/java/io/palaima/debugdrawer/okhttp/OkHttpModule.java b/debugdrawer-okhttp/src/main/java/io/palaima/debugdrawer/okhttp/OkHttpModule.java
index dd901fb..0faf8f3 100644
--- a/debugdrawer-okhttp/src/main/java/io/palaima/debugdrawer/okhttp/OkHttpModule.java
+++ b/debugdrawer-okhttp/src/main/java/io/palaima/debugdrawer/okhttp/OkHttpModule.java
@@ -1,14 +1,14 @@
 package io.palaima.debugdrawer.okhttp;
 
-import android.support.annotation.NonNull;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import com.squareup.okhttp.OkHttpClient;
+import androidx.annotation.NonNull;
 
 import io.palaima.debugdrawer.base.DebugModuleAdapter;
+import okhttp3.OkHttpClient;
 
 public class OkHttpModule extends DebugModuleAdapter {
 
@@ -68,13 +68,13 @@ private void refresh() {
         final int writeTotal = writeSuccessCount() + writeAbortCount();
         final int percentage = (int) ((1f * writeAbortCount() / writeTotal) * 100);
         okHttpCacheWriteErrorView.setText(
-            new StringBuilder().append(writeAbortCount())
-                .append(" / ")
-                .append(writeTotal)
-                .append(" (")
-                .append(percentage)
-                .append("%)")
-                .toString()
+                new StringBuilder().append(writeAbortCount())
+                        .append(" / ")
+                        .append(writeTotal)
+                        .append(" (")
+                        .append(percentage)
+                        .append("%)")
+                        .toString()
         );
         okHttpCacheRequestCountView.setText(String.valueOf(requestCount()));
         okHttpCacheNetworkCountView.setText(String.valueOf(networkCount()));
@@ -97,26 +97,26 @@ private static String sizeString(long bytes) {
     }
 
     private long maxSize() {
-        return client.getCache().getMaxSize();
+        return client.cache().maxSize();
     }
 
     private int writeSuccessCount() {
-        return client.getCache().getWriteSuccessCount();
+        return client.cache().writeSuccessCount();
     }
 
     private int writeAbortCount() {
-        return client.getCache().getWriteAbortCount();
+        return client.cache().writeAbortCount();
     }
 
     private int requestCount() {
-        return client.getCache().getRequestCount();
+        return client.cache().requestCount();
     }
 
     private int networkCount() {
-        return client.getCache().getNetworkCount();
+        return client.cache().networkCount();
     }
 
     private int hitCount() {
-        return client.getCache().getHitCount();
+        return client.cache().hitCount();
     }
 }
diff --git a/debugdrawer-okhttp/src/main/res/layout/dd_debug_drawer_module_okhttp.xml b/debugdrawer-okhttp/src/main/res/layout/dd_debug_drawer_module_okhttp.xml
index b7bed52..4c9553b 100644
--- a/debugdrawer-okhttp/src/main/res/layout/dd_debug_drawer_module_okhttp.xml
+++ b/debugdrawer-okhttp/src/main/res/layout/dd_debug_drawer_module_okhttp.xml
@@ -1,78 +1,72 @@
 <?xml version="1.0" encoding="utf-8"?>
-<GridLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="12dp"
     android:columnCount="2"
+    android:padding="12dp"
     tools:ignore="UselessParent">
+
     <TextView
-        android:layout_columnSpan="2"
+        style="@style/Widget.DebugDrawer.Base.Header"
         android:layout_width="0dp"
+        android:layout_columnSpan="2"
         android:layout_gravity="start|fill_horizontal"
-        android:text="OkHttp Cache"
-        style="@style/Widget.DebugDrawer.Base.Header"
-        />
+        android:text="OkHttp Cache" />
 
     <TextView
-        android:layout_gravity="start|center_vertical"
-        android:text="Max Size"
         style="@style/Widget.DebugDrawer.Base.RowTitle"
-        />
+        android:layout_gravity="start|center_vertical"
+        android:text="Max Size" />
+
     <TextView
         android:id="@+id/dd_debug_okhttp_cache_max_size"
-        android:layout_width="0dp"
-        android:layout_gravity="start|center_vertical|fill_horizontal"
         style="@style/Widget.DebugDrawer.Base.RowValue"
-        />
+        android:layout_width="0dp"
+        android:layout_gravity="start|center_vertical|fill_horizontal" />
 
     <TextView
-        android:layout_gravity="start|center_vertical"
-        android:text="Write Errors"
         style="@style/Widget.DebugDrawer.Base.RowTitle"
-        />
+        android:layout_gravity="start|center_vertical"
+        android:text="Write Errors" />
+
     <TextView
         android:id="@+id/dd_debug_okhttp_cache_write_error"
-        android:layout_width="0dp"
-        android:layout_gravity="start|center_vertical|fill_horizontal"
         style="@style/Widget.DebugDrawer.Base.RowValue"
-        />
+        android:layout_width="0dp"
+        android:layout_gravity="start|center_vertical|fill_horizontal" />
 
     <TextView
-        android:layout_gravity="start|center_vertical"
-        android:text="Request Count"
         style="@style/Widget.DebugDrawer.Base.RowTitle"
-        />
+        android:layout_gravity="start|center_vertical"
+        android:text="Request Count" />
+
     <TextView
         android:id="@+id/dd_debug_okhttp_cache_request_count"
-        android:layout_width="0dp"
-        android:layout_gravity="start|center_vertical|fill_horizontal"
         style="@style/Widget.DebugDrawer.Base.RowValue"
-        />
+        android:layout_width="0dp"
+        android:layout_gravity="start|center_vertical|fill_horizontal" />
 
     <TextView
-        android:layout_gravity="start|center_vertical"
-        android:text="   Network Count"
         style="@style/Widget.DebugDrawer.Base.RowTitle"
-        />
+        android:layout_gravity="start|center_vertical"
+        android:text="   Network Count" />
+
     <TextView
         android:id="@+id/dd_debug_okhttp_cache_network_count"
-        android:layout_width="0dp"
-        android:layout_gravity="start|center_vertical|fill_horizontal"
         style="@style/Widget.DebugDrawer.Base.RowValue"
-        />
+        android:layout_width="0dp"
+        android:layout_gravity="start|center_vertical|fill_horizontal" />
 
     <TextView
-        android:layout_gravity="start|center_vertical"
-        android:text="   Hit Count"
         style="@style/Widget.DebugDrawer.Base.RowTitle"
-        />
+        android:layout_gravity="start|center_vertical"
+        android:text="   Hit Count" />
+
     <TextView
         android:id="@+id/dd_debug_okhttp_cache_hit_count"
-        android:layout_width="0dp"
-        android:layout_gravity="start|center_vertical|fill_horizontal"
         style="@style/Widget.DebugDrawer.Base.RowValue"
-        />
+        android:layout_width="0dp"
+        android:layout_gravity="start|center_vertical|fill_horizontal" />
 
 </GridLayout>
diff --git a/debugdrawer-okhttp3/build.gradle b/debugdrawer-okhttp3/build.gradle
index abf43a2..a7d395b 100644
--- a/debugdrawer-okhttp3/build.gradle
+++ b/debugdrawer-okhttp3/build.gradle
@@ -1,14 +1,20 @@
 apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+
+ext {
+    artifact = 'debugdrawer-okhttp3'
+}
+
+apply from: "../buildSrc/install-publish.gradle"
 
 android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    compileSdkVersion COMPILE_SDK_VERSION
+    buildToolsVersion BUILD_TOOLS_VERSION
 
     defaultConfig {
-        minSdkVersion rootProject.ext.minSdkVersion
-        targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 1
-        versionName "1.0"
+        minSdkVersion MIN_SDK_VERSION
+        targetSdkVersion TARGET_SDK_VERSION
+        namespace "io.palaima.debugdrawer.okhttp3"
     }
     buildTypes {
         release {
@@ -16,19 +22,30 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+
+    // region java compiler flags
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+
+    // endregion
+
+    // region compile options
+
+    kotlinOptions {
+        jvmTarget = "11"
+    }
+
+    // endregion
 }
 
+apply from: "../buildSrc/module_dependencies.gradle"
+
 dependencies {
-    implementation "com.android.support:support-annotations:$rootProject.ext.supportVersion"
     implementation project(':debugdrawer-base')
-    compileOnly "com.squareup.okhttp3:okhttp:$rootProject.ext.okhttpVersion"
-}
 
-ext {
-    libraryName = 'Debug Drawer OkHttp3 Module'
-    artifact = 'debugdrawer-okhttp3'
-    libraryDescription = 'Android Debug Drawer OkHttp3 Module'
+    implementation getLibrary("androidx.annotation:annotation")
+    implementation getLibrary("com.squareup.okhttp3:okhttp")
 }
-
-apply from: rootProject.file('gradle/install-v1.gradle')
-apply from: rootProject.file('gradle/bintray-android-v1.gradle')
\ No newline at end of file
diff --git a/debugdrawer-okhttp3/src/main/AndroidManifest.xml b/debugdrawer-okhttp3/src/main/AndroidManifest.xml
index 14b9331..227314e 100644
--- a/debugdrawer-okhttp3/src/main/AndroidManifest.xml
+++ b/debugdrawer-okhttp3/src/main/AndroidManifest.xml
@@ -1,7 +1 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.palaima.debugdrawer.okhttp3"
-    >
-
-    <application />
-
-</manifest>
+<manifest />
\ No newline at end of file
diff --git a/debugdrawer-okhttp3/src/main/java/io/palaima/debugdrawer/okhttp3/OkHttp3Module.java b/debugdrawer-okhttp3/src/main/java/io/palaima/debugdrawer/okhttp3/OkHttp3Module.java
index 88787af..e05956c 100644
--- a/debugdrawer-okhttp3/src/main/java/io/palaima/debugdrawer/okhttp3/OkHttp3Module.java
+++ b/debugdrawer-okhttp3/src/main/java/io/palaima/debugdrawer/okhttp3/OkHttp3Module.java
@@ -1,6 +1,6 @@
 package io.palaima.debugdrawer.okhttp3;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/debugdrawer-okhttp3/src/main/res/layout/dd_debug_drawer_module_okhttp3.xml b/debugdrawer-okhttp3/src/main/res/layout/dd_debug_drawer_module_okhttp3.xml
index 6aa2f3a..a9c63ce 100644
--- a/debugdrawer-okhttp3/src/main/res/layout/dd_debug_drawer_module_okhttp3.xml
+++ b/debugdrawer-okhttp3/src/main/res/layout/dd_debug_drawer_module_okhttp3.xml
@@ -6,8 +6,7 @@
     android:orientation="vertical"
     android:padding="12dp">
 
-    <GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
+    <GridLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:columnCount="2"
diff --git a/debugdrawer-picasso/build.gradle b/debugdrawer-picasso/build.gradle
index 1e69c9e..0fb9a69 100644
--- a/debugdrawer-picasso/build.gradle
+++ b/debugdrawer-picasso/build.gradle
@@ -1,14 +1,20 @@
 apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+
+ext {
+    artifact = 'debugdrawer-picasso'
+}
+
+apply from: "../buildSrc/install-publish.gradle"
 
 android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    compileSdkVersion COMPILE_SDK_VERSION
+    buildToolsVersion BUILD_TOOLS_VERSION
 
     defaultConfig {
-        minSdkVersion rootProject.ext.minSdkVersion
-        targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 1
-        versionName "1.0"
+        minSdkVersion MIN_SDK_VERSION
+        targetSdkVersion TARGET_SDK_VERSION
+        namespace "io.palaima.debugdrawer.picasso"
     }
     buildTypes {
         release {
@@ -16,19 +22,30 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+
+    // region java compiler flags
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+
+    // endregion
+
+    // region compile options
+
+    kotlinOptions {
+        jvmTarget = "11"
+    }
+
+    // endregion
 }
 
+apply from: "../buildSrc/module_dependencies.gradle"
+
 dependencies {
-    implementation "com.android.support:support-annotations:$rootProject.ext.supportVersion"
     implementation project(':debugdrawer-base')
-    compileOnly "com.squareup.picasso:picasso:$rootProject.ext.picassoVersion"
-}
 
-ext {
-    libraryName = 'Debug Drawer Picasso Module'
-    artifact = 'debugdrawer-picasso'
-    libraryDescription = 'Android Debug Drawer Picasso Module'
+    implementation getLibrary("androidx.annotation:annotation")
+    implementation getLibrary("com.squareup.picasso:picasso")
 }
-
-apply from: rootProject.file('gradle/install-v1.gradle')
-apply from: rootProject.file('gradle/bintray-android-v1.gradle')
\ No newline at end of file
diff --git a/debugdrawer-picasso/src/main/AndroidManifest.xml b/debugdrawer-picasso/src/main/AndroidManifest.xml
index 16c8c89..227314e 100644
--- a/debugdrawer-picasso/src/main/AndroidManifest.xml
+++ b/debugdrawer-picasso/src/main/AndroidManifest.xml
@@ -1,6 +1 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.palaima.debugdrawer.picasso">
-
-    <application />
-
-</manifest>
+<manifest />
\ No newline at end of file
diff --git a/debugdrawer-picasso/src/main/java/io/palaima/debugdrawer/picasso/PicassoModule.java b/debugdrawer-picasso/src/main/java/io/palaima/debugdrawer/picasso/PicassoModule.java
index a20b80d..64a449b 100644
--- a/debugdrawer-picasso/src/main/java/io/palaima/debugdrawer/picasso/PicassoModule.java
+++ b/debugdrawer-picasso/src/main/java/io/palaima/debugdrawer/picasso/PicassoModule.java
@@ -1,6 +1,6 @@
 package io.palaima.debugdrawer.picasso;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/debugdrawer-picasso/src/main/res/layout/dd_debug_drawer_item_picasso.xml b/debugdrawer-picasso/src/main/res/layout/dd_debug_drawer_item_picasso.xml
index c613755..023037e 100644
--- a/debugdrawer-picasso/src/main/res/layout/dd_debug_drawer_item_picasso.xml
+++ b/debugdrawer-picasso/src/main/res/layout/dd_debug_drawer_item_picasso.xml
@@ -1,137 +1,126 @@
 <?xml version="1.0" encoding="utf-8"?>
-<GridLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="12dp"
     android:columnCount="2"
+    android:padding="12dp"
     tools:ignore="UselessParent">
+
     <TextView
-        android:layout_columnSpan="2"
+        style="@style/Widget.DebugDrawer.Base.Header"
         android:layout_width="0dp"
+        android:layout_columnSpan="2"
         android:layout_gravity="start|fill_horizontal"
-        android:text="Picasso"
-        style="@style/Widget.DebugDrawer.Base.Header"
-        />
+        android:text="Picasso" />
 
     <TextView
-        android:layout_gravity="start|center_vertical"
-        android:text="Indicators"
         style="@style/Widget.DebugDrawer.Base.RowTitle"
-        />
+        android:layout_gravity="start|center_vertical"
+        android:text="Indicators" />
+
     <Switch
         android:id="@+id/dd_debug_picasso_indicators"
-        android:layout_gravity="start|center_vertical"
         style="@style/Widget.DebugDrawer.Base.RowWidget"
-        />
+        android:layout_gravity="start|center_vertical" />
 
     <TextView
-        android:layout_gravity="start|center_vertical"
-        android:text="Cache"
         style="@style/Widget.DebugDrawer.Base.RowTitle"
-        />
+        android:layout_gravity="start|center_vertical"
+        android:text="Cache" />
+
     <TextView
         android:id="@+id/dd_debug_picasso_cache_size"
-        android:layout_width="0dp"
-        android:layout_gravity="start|center_vertical|fill_horizontal"
         style="@style/Widget.DebugDrawer.Base.RowValue"
-        />
+        android:layout_width="0dp"
+        android:layout_gravity="start|center_vertical|fill_horizontal" />
 
     <TextView
-        android:layout_gravity="start|center_vertical"
-        android:text="   Hits"
         style="@style/Widget.DebugDrawer.Base.RowTitle"
-        />
+        android:layout_gravity="start|center_vertical"
+        android:text="   Hits" />
+
     <TextView
         android:id="@+id/dd_debug_picasso_cache_hit"
-        android:layout_width="0dp"
-        android:layout_gravity="start|center_vertical|fill_horizontal"
         style="@style/Widget.DebugDrawer.Base.RowValue"
-        />
+        android:layout_width="0dp"
+        android:layout_gravity="start|center_vertical|fill_horizontal" />
 
     <TextView
-        android:layout_gravity="start|center_vertical"
-        android:text="   Misses"
         style="@style/Widget.DebugDrawer.Base.RowTitle"
-        />
+        android:layout_gravity="start|center_vertical"
+        android:text="   Misses" />
+
     <TextView
         android:id="@+id/dd_debug_picasso_cache_miss"
-        android:layout_width="0dp"
-        android:layout_gravity="start|center_vertical|fill_horizontal"
         style="@style/Widget.DebugDrawer.Base.RowValue"
-        />
+        android:layout_width="0dp"
+        android:layout_gravity="start|center_vertical|fill_horizontal" />
 
     <TextView
-        android:layout_gravity="start|center_vertical"
-        android:text="Decoded"
         style="@style/Widget.DebugDrawer.Base.RowTitle"
-        />
+        android:layout_gravity="start|center_vertical"
+        android:text="Decoded" />
+
     <TextView
         android:id="@+id/dd_debug_picasso_decoded"
-        android:layout_width="0dp"
-        android:layout_gravity="start|center_vertical|fill_horizontal"
         style="@style/Widget.DebugDrawer.Base.RowValue"
-        />
+        android:layout_width="0dp"
+        android:layout_gravity="start|center_vertical|fill_horizontal" />
 
     <TextView
-        android:layout_gravity="start|center_vertical"
-        android:text="   Total"
         style="@style/Widget.DebugDrawer.Base.RowTitle"
-        />
+        android:layout_gravity="start|center_vertical"
+        android:text="   Total" />
+
     <TextView
         android:id="@+id/dd_debug_picasso_decoded_total"
-        android:layout_width="0dp"
-        android:layout_gravity="start|center_vertical|fill_horizontal"
         style="@style/Widget.DebugDrawer.Base.RowValue"
-        />
+        android:layout_width="0dp"
+        android:layout_gravity="start|center_vertical|fill_horizontal" />
 
     <TextView
-        android:layout_gravity="start|center_vertical"
-        android:text="   Average"
         style="@style/Widget.DebugDrawer.Base.RowTitle"
-        />
+        android:layout_gravity="start|center_vertical"
+        android:text="   Average" />
+
     <TextView
         android:id="@+id/dd_debug_picasso_decoded_avg"
-        android:layout_width="0dp"
-        android:layout_gravity="start|center_vertical|fill_horizontal"
         style="@style/Widget.DebugDrawer.Base.RowValue"
-        />
+        android:layout_width="0dp"
+        android:layout_gravity="start|center_vertical|fill_horizontal" />
 
     <TextView
-        android:layout_gravity="start|center_vertical"
-        android:text="Transformed"
         style="@style/Widget.DebugDrawer.Base.RowTitle"
-        />
+        android:layout_gravity="start|center_vertical"
+        android:text="Transformed" />
+
     <TextView
         android:id="@+id/dd_debug_picasso_transformed"
-        android:layout_width="0dp"
-        android:layout_gravity="start|center_vertical|fill_horizontal"
         style="@style/Widget.DebugDrawer.Base.RowValue"
-        />
+        android:layout_width="0dp"
+        android:layout_gravity="start|center_vertical|fill_horizontal" />
 
     <TextView
-        android:layout_gravity="start|center_vertical"
-        android:text="   Total"
         style="@style/Widget.DebugDrawer.Base.RowTitle"
-        />
+        android:layout_gravity="start|center_vertical"
+        android:text="   Total" />
+
     <TextView
         android:id="@+id/dd_debug_picasso_transformed_total"
-        android:layout_width="0dp"
-        android:layout_gravity="start|center_vertical|fill_horizontal"
         style="@style/Widget.DebugDrawer.Base.RowValue"
-        />
+        android:layout_width="0dp"
+        android:layout_gravity="start|center_vertical|fill_horizontal" />
 
     <TextView
-        android:layout_gravity="start|center_vertical"
-        android:text="   Average"
         style="@style/Widget.DebugDrawer.Base.RowTitle"
-        />
+        android:layout_gravity="start|center_vertical"
+        android:text="   Average" />
+
     <TextView
         android:id="@+id/dd_debug_picasso_transformed_avg"
-        android:layout_width="0dp"
-        android:layout_gravity="start|center_vertical|fill_horizontal"
         style="@style/Widget.DebugDrawer.Base.RowValue"
-        />
+        android:layout_width="0dp"
+        android:layout_gravity="start|center_vertical|fill_horizontal" />
 
 </GridLayout>
diff --git a/debugdrawer-scalpel/build.gradle b/debugdrawer-scalpel/build.gradle
index c6956f7..056671c 100644
--- a/debugdrawer-scalpel/build.gradle
+++ b/debugdrawer-scalpel/build.gradle
@@ -1,14 +1,20 @@
 apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+
+ext {
+    artifact = 'debugdrawer-scalpel'
+}
+
+apply from: "../buildSrc/install-publish.gradle"
 
 android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    compileSdkVersion COMPILE_SDK_VERSION
+    buildToolsVersion BUILD_TOOLS_VERSION
 
     defaultConfig {
-        minSdkVersion rootProject.ext.minSdkVersion
-        targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 1
-        versionName "1.0"
+        minSdkVersion MIN_SDK_VERSION
+        targetSdkVersion TARGET_SDK_VERSION
+        namespace "io.palaima.debugdrawer.scalpel"
     }
     buildTypes {
         release {
@@ -16,19 +22,32 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+
+    // region java compiler flags
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+
+    // endregion
+
+    // region compile options
+
+    kotlinOptions {
+        jvmTarget = "11"
+    }
+
+    // endregion
 }
 
+apply from: "../buildSrc/module_dependencies.gradle"
+
 dependencies {
-    implementation "com.android.support:support-annotations:$rootProject.ext.supportVersion"
     implementation project(':debugdrawer-base')
-    compileOnly "com.jakewharton.scalpel:scalpel:$rootProject.ext.scalpelVersion"
-}
 
-ext {
-    libraryName = 'Debug Drawer Scalpel Module'
-    artifact = 'debugdrawer-scalpel'
-    libraryDescription = 'Android Debug Drawer Scalpel Module'
+    implementation getLibrary("androidx.annotation:annotation")
+    implementation getLibrary("com.jakewharton.scalpel:scalpel")
 }
 
-apply from: rootProject.file('gradle/install-v1.gradle')
-apply from: rootProject.file('gradle/bintray-android-v1.gradle')
\ No newline at end of file
+
diff --git a/debugdrawer-scalpel/src/main/AndroidManifest.xml b/debugdrawer-scalpel/src/main/AndroidManifest.xml
index a89076a..227314e 100644
--- a/debugdrawer-scalpel/src/main/AndroidManifest.xml
+++ b/debugdrawer-scalpel/src/main/AndroidManifest.xml
@@ -1,6 +1 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.palaima.debugdrawer.scalpel">
-
-    <application />
-
-</manifest>
+<manifest />
\ No newline at end of file
diff --git a/debugdrawer-scalpel/src/main/java/io/palaima/debugdrawer/scalpel/ScalpelModule.java b/debugdrawer-scalpel/src/main/java/io/palaima/debugdrawer/scalpel/ScalpelModule.java
index 556e08e..c983ebf 100644
--- a/debugdrawer-scalpel/src/main/java/io/palaima/debugdrawer/scalpel/ScalpelModule.java
+++ b/debugdrawer-scalpel/src/main/java/io/palaima/debugdrawer/scalpel/ScalpelModule.java
@@ -3,7 +3,7 @@
 
 import android.app.Activity;
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/debugdrawer-scalpel/src/main/res/layout/dd_debug_drawer_item_scalpel.xml b/debugdrawer-scalpel/src/main/res/layout/dd_debug_drawer_item_scalpel.xml
index 8d636e7..0a8c8d3 100644
--- a/debugdrawer-scalpel/src/main/res/layout/dd_debug_drawer_item_scalpel.xml
+++ b/debugdrawer-scalpel/src/main/res/layout/dd_debug_drawer_item_scalpel.xml
@@ -1,50 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
-<GridLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="12dp"
     android:columnCount="2"
+    android:padding="12dp"
     tools:ignore="UselessParent">
+
     <TextView
-        android:layout_columnSpan="2"
+        style="@style/Widget.DebugDrawer.Base.Header"
         android:layout_width="0dp"
+        android:layout_columnSpan="2"
         android:layout_gravity="start|fill_horizontal"
-        android:text="Scalpel"
-        style="@style/Widget.DebugDrawer.Base.Header"
-        />
+        android:text="Scalpel" />
 
     <TextView
-        android:layout_gravity="start|center_vertical"
-        android:text="Enable Scalpel"
         style="@style/Widget.DebugDrawer.Base.RowTitle"
-        />
+        android:layout_gravity="start|center_vertical"
+        android:text="Enable Scalpel" />
+
     <Switch
         android:id="@+id/dd_debug_enable_scalpel"
-        android:layout_gravity="start|center_vertical"
         style="@style/Widget.DebugDrawer.Base.RowWidget"
-        />
+        android:layout_gravity="start|center_vertical" />
+
     <TextView
-        android:layout_gravity="start|center_vertical"
-        android:text="Disable Graphics"
         style="@style/Widget.DebugDrawer.Base.RowTitle"
-        />
+        android:layout_gravity="start|center_vertical"
+        android:text="Disable Graphics" />
+
     <Switch
         android:id="@+id/dd_debug_disable_graphics"
-        android:layout_gravity="start|center_vertical"
         style="@style/Widget.DebugDrawer.Base.RowWidget"
-        />
+        android:layout_gravity="start|center_vertical" />
+
     <TextView
-        android:layout_gravity="start|center_vertical"
-        android:text="Show Ids"
         style="@style/Widget.DebugDrawer.Base.RowTitle"
-        />
+        android:layout_gravity="start|center_vertical"
+        android:text="Show Ids" />
+
     <Switch
         android:id="@+id/dd_debug_show_ids"
-        android:layout_gravity="start|center_vertical"
         style="@style/Widget.DebugDrawer.Base.RowWidget"
-        />
+        android:layout_gravity="start|center_vertical" />
 
 
 </GridLayout>
diff --git a/debugdrawer-timber/build.gradle b/debugdrawer-timber/build.gradle
index b8f1ac1..0de9341 100644
--- a/debugdrawer-timber/build.gradle
+++ b/debugdrawer-timber/build.gradle
@@ -1,14 +1,21 @@
 apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+
+ext {
+    artifact = 'debugdrawer-timber'
+}
+
+apply from: "../buildSrc/install-publish.gradle"
+
 
 android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    compileSdkVersion COMPILE_SDK_VERSION
+    buildToolsVersion BUILD_TOOLS_VERSION
 
     defaultConfig {
-        minSdkVersion rootProject.ext.minSdkVersion
-        targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 1
-        versionName "1.0"
+        minSdkVersion MIN_SDK_VERSION
+        targetSdkVersion TARGET_SDK_VERSION
+        namespace "io.palaima.debugdrawer.timber"
     }
     buildTypes {
         release {
@@ -16,19 +23,29 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-}
 
-dependencies {
-    implementation project(':debugdrawer-base')
-    implementation "com.android.support:appcompat-v7:$rootProject.ext.supportVersion"
-    compileOnly "com.jakewharton.timber:timber:$rootProject.ext.timberVersion"
-}
+    // region java compiler flags
 
-ext {
-    libraryName = 'Debug Drawer Timber Module'
-    artifact = 'debugdrawer-timber'
-    libraryDescription = 'Android Debug Drawer Timber Module'
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+
+    // endregion
+
+    // region compile options
+
+    kotlinOptions {
+        jvmTarget = "11"
+    }
+
+    // endregion
 }
 
-apply from: rootProject.file('gradle/install-v1.gradle')
-apply from: rootProject.file('gradle/bintray-android-v1.gradle')
\ No newline at end of file
+apply from: "../buildSrc/module_dependencies.gradle"
+
+dependencies {
+    implementation project(':debugdrawer-base')
+    implementation getLibrary("androidx.appcompat:appcompat")
+    implementation getLibrary("com.jakewharton.timber:timber")
+}
\ No newline at end of file
diff --git a/debugdrawer-timber/src/main/AndroidManifest.xml b/debugdrawer-timber/src/main/AndroidManifest.xml
index cb46180..227314e 100644
--- a/debugdrawer-timber/src/main/AndroidManifest.xml
+++ b/debugdrawer-timber/src/main/AndroidManifest.xml
@@ -1,6 +1 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.palaima.debugdrawer.timber">
-
-    <application />
-
-</manifest>
+<manifest />
\ No newline at end of file
diff --git a/debugdrawer-timber/src/main/java/io/palaima/debugdrawer/timber/TimberModule.java b/debugdrawer-timber/src/main/java/io/palaima/debugdrawer/timber/TimberModule.java
index 2dc508a..5f50854 100644
--- a/debugdrawer-timber/src/main/java/io/palaima/debugdrawer/timber/TimberModule.java
+++ b/debugdrawer-timber/src/main/java/io/palaima/debugdrawer/timber/TimberModule.java
@@ -1,6 +1,6 @@
 package io.palaima.debugdrawer.timber;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/debugdrawer-timber/src/main/java/io/palaima/debugdrawer/timber/data/LumberYard.java b/debugdrawer-timber/src/main/java/io/palaima/debugdrawer/timber/data/LumberYard.java
index 914ee82..d1f45fe 100644
--- a/debugdrawer-timber/src/main/java/io/palaima/debugdrawer/timber/data/LumberYard.java
+++ b/debugdrawer-timber/src/main/java/io/palaima/debugdrawer/timber/data/LumberYard.java
@@ -1,7 +1,7 @@
 package io.palaima.debugdrawer.timber.data;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.io.File;
 import java.io.FileWriter;
diff --git a/debugdrawer-timber/src/main/java/io/palaima/debugdrawer/timber/ui/LogDialog.java b/debugdrawer-timber/src/main/java/io/palaima/debugdrawer/timber/ui/LogDialog.java
index 8527a7b..f460455 100644
--- a/debugdrawer-timber/src/main/java/io/palaima/debugdrawer/timber/ui/LogDialog.java
+++ b/debugdrawer-timber/src/main/java/io/palaima/debugdrawer/timber/ui/LogDialog.java
@@ -7,10 +7,11 @@
 import android.net.Uri;
 import android.os.Handler;
 import android.os.Looper;
-import android.support.v7.app.AlertDialog;
 import android.widget.ListView;
 import android.widget.Toast;
 
+import androidx.appcompat.app.AlertDialog;
+
 import java.io.File;
 
 import io.palaima.debugdrawer.timber.R;
diff --git a/debugdrawer-timber/src/main/res/layout/dd_debug_drawer_module_log.xml b/debugdrawer-timber/src/main/res/layout/dd_debug_drawer_module_log.xml
index 6898dd6..4840dbe 100644
--- a/debugdrawer-timber/src/main/res/layout/dd_debug_drawer_module_log.xml
+++ b/debugdrawer-timber/src/main/res/layout/dd_debug_drawer_module_log.xml
@@ -1,24 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:padding="12dp"
+    tools:ignore="UselessParent">
+
+    <TextView
+        style="@style/Widget.DebugDrawer.Base.Header"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:padding="12dp"
-        tools:ignore="UselessParent">
+        android:text="Timber" />
 
-    <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="Timber"
-            style="@style/Widget.DebugDrawer.Base.Header"
-            />
     <Button
-            android:id="@+id/dd_button_log"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="Show logs"
-            android:textAllCaps="true"
-            />
+        android:id="@+id/dd_button_log"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Show logs"
+        android:textAllCaps="true" />
 </LinearLayout>
diff --git a/debugdrawer-timber/src/main/res/layout/dd_item_log_entry.xml b/debugdrawer-timber/src/main/res/layout/dd_item_log_entry.xml
index 7fdf36f..c5f5dd0 100644
--- a/debugdrawer-timber/src/main/res/layout/dd_item_log_entry.xml
+++ b/debugdrawer-timber/src/main/res/layout/dd_item_log_entry.xml
@@ -1,52 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<RelativeLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        >
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
 
     <TextView
-            android:id="@+id/dd_text_log_level"
-            android:layout_width="20dp"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:textColor="@color/dd_debug_log_level_text"
-            android:textSize="10sp"
-            android:textStyle="bold"
-            tools:text="Log level"
-            />
+        android:id="@+id/dd_text_log_level"
+        android:layout_width="20dp"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:textColor="@color/dd_debug_log_level_text"
+        android:textSize="10sp"
+        android:textStyle="bold"
+        tools:text="Log level" />
 
     <TextView
-            android:id="@+id/dd_text_log_tag"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
-            android:layout_alignParentRight="true"
-            android:layout_toEndOf="@id/dd_text_log_level"
-            android:layout_toRightOf="@id/dd_text_log_level"
-            android:background="@color/dd_debug_log_background"
-            android:ellipsize="end"
-            android:lines="1"
-            android:paddingLeft="4dp"
-            android:paddingRight="4dp"
-            android:textColor="?android:attr/textColorSecondary"
-            android:textSize="10sp"
-            tools:text="Log tag"
-            />
+        android:id="@+id/dd_text_log_tag"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        android:layout_toEndOf="@id/dd_text_log_level"
+        android:layout_toRightOf="@id/dd_text_log_level"
+        android:background="@color/dd_debug_log_background"
+        android:ellipsize="end"
+        android:lines="1"
+        android:paddingLeft="4dp"
+        android:paddingRight="4dp"
+        android:textColor="?android:attr/textColorSecondary"
+        android:textSize="10sp"
+        tools:text="Log tag" />
 
     <TextView
-            android:id="@+id/dd_text_log_message"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/dd_text_log_level"
-            android:layout_marginLeft="2dp"
-            android:layout_marginStart="2dp"
-            android:background="@color/dd_debug_log_background"
-            android:padding="4dp"
-            android:textColor="?android:attr/textColorPrimary"
-            android:textStyle="bold"
-            tools:text="Log message"
-            />
+        android:id="@+id/dd_text_log_message"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/dd_text_log_level"
+        android:layout_marginStart="2dp"
+        android:layout_marginLeft="2dp"
+        android:background="@color/dd_debug_log_background"
+        android:padding="4dp"
+        android:textColor="?android:attr/textColorPrimary"
+        android:textStyle="bold"
+        tools:text="Log message" />
 </RelativeLayout>
diff --git a/debugdrawer-view-no-op/build.gradle b/debugdrawer-view-no-op/build.gradle
index e4dfdea..291c776 100644
--- a/debugdrawer-view-no-op/build.gradle
+++ b/debugdrawer-view-no-op/build.gradle
@@ -1,14 +1,21 @@
 apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+
+ext {
+    artifact = 'debugdrawer-view-no-op'
+}
+
+apply from: "../buildSrc/install-publish.gradle"
+
 
 android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    compileSdkVersion COMPILE_SDK_VERSION
+    buildToolsVersion BUILD_TOOLS_VERSION
 
     defaultConfig {
-        minSdkVersion rootProject.ext.minSdkVersion
-        targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 1
-        versionName "1.0"
+        minSdkVersion MIN_SDK_VERSION
+        targetSdkVersion TARGET_SDK_VERSION
+        namespace "io.palaima.debugdrawer.view"
     }
     buildTypes {
         release {
@@ -16,17 +23,27 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+
+    // region java compiler flags
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+
+    // endregion
+
+    // region compile options
+
+    kotlinOptions {
+        jvmTarget = "11"
+    }
+
+    // endregion
 }
 
+apply from: "../buildSrc/module_dependencies.gradle"
+
 dependencies {
     implementation project(':debugdrawer-base')
 }
-
-ext {
-    libraryName = 'Debug Drawer View No-Op'
-    artifact = 'debugdrawer-view-no-op'
-    libraryDescription = 'Android Debug Drawer View No-Op'
-}
-
-apply from: rootProject.file('gradle/install-v1.gradle')
-apply from: rootProject.file('gradle/bintray-android-v1.gradle')
\ No newline at end of file
diff --git a/debugdrawer-view-no-op/src/main/AndroidManifest.xml b/debugdrawer-view-no-op/src/main/AndroidManifest.xml
index 9a2efc1..227314e 100644
--- a/debugdrawer-view-no-op/src/main/AndroidManifest.xml
+++ b/debugdrawer-view-no-op/src/main/AndroidManifest.xml
@@ -1,6 +1 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.palaima.debugdrawer.view">
-
-    <application />
-
-</manifest>
+<manifest />
\ No newline at end of file
diff --git a/debugdrawer-view/build.gradle b/debugdrawer-view/build.gradle
index 78f0673..2ffd2e8 100644
--- a/debugdrawer-view/build.gradle
+++ b/debugdrawer-view/build.gradle
@@ -1,14 +1,21 @@
 apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+
+ext {
+    artifact = 'debugdrawer-view'
+}
+
+apply from: "../buildSrc/install-publish.gradle"
+
 
 android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    compileSdkVersion COMPILE_SDK_VERSION
+    buildToolsVersion BUILD_TOOLS_VERSION
 
     defaultConfig {
-        minSdkVersion rootProject.ext.minSdkVersion
-        targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 1
-        versionName "1.0"
+        minSdkVersion MIN_SDK_VERSION
+        targetSdkVersion TARGET_SDK_VERSION
+        namespace "io.palaima.debugdrawer.view"
     }
     buildTypes {
         release {
@@ -16,17 +23,27 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-}
 
-dependencies {
-    implementation project(':debugdrawer-base')
-}
+    // region java compiler flags
 
-ext {
-    libraryName = 'Debug Drawer View'
-    artifact = 'debugdrawer-view'
-    libraryDescription = 'Android Debug Drawer View'
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+
+    // endregion
+
+    // region compile options
+
+    kotlinOptions {
+        jvmTarget = "11"
+    }
+
+    // endregion
 }
 
-apply from: rootProject.file('gradle/install-v1.gradle')
-apply from: rootProject.file('gradle/bintray-android-v1.gradle')
\ No newline at end of file
+apply from: "../buildSrc/module_dependencies.gradle"
+
+dependencies {
+    implementation project(':debugdrawer-base')
+}
\ No newline at end of file
diff --git a/debugdrawer-view/src/main/AndroidManifest.xml b/debugdrawer-view/src/main/AndroidManifest.xml
index 9a2efc1..227314e 100644
--- a/debugdrawer-view/src/main/AndroidManifest.xml
+++ b/debugdrawer-view/src/main/AndroidManifest.xml
@@ -1,6 +1 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.palaima.debugdrawer.view">
-
-    <application />
-
-</manifest>
+<manifest />
\ No newline at end of file
diff --git a/debugdrawer-view/src/main/java/io/palaima/debugdrawer/view/DebugView.java b/debugdrawer-view/src/main/java/io/palaima/debugdrawer/view/DebugView.java
index 50bb28e..63554ea 100644
--- a/debugdrawer-view/src/main/java/io/palaima/debugdrawer/view/DebugView.java
+++ b/debugdrawer-view/src/main/java/io/palaima/debugdrawer/view/DebugView.java
@@ -14,21 +14,36 @@ public class DebugView extends LinearLayout {
     private DebugModule[] drawerItems;
 
     public DebugView(Context context) {
-        this(context, null);
-        setOrientation(VERTICAL);
+        super(context);
+        init(context, null, null, null);
     }
 
     public DebugView(Context context, AttributeSet attrs) {
-        this(context, attrs, 0);
-        setOrientation(VERTICAL);
+        super(context, attrs);
+        init(context, attrs, null, null);
     }
 
-    public DebugView(Context context, AttributeSet attrSet, int defStyleAttr) {
-        super(context, attrSet, defStyleAttr);
+    public DebugView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init(context, attrs, defStyleAttr, null);
+    }
+
+    public DebugView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+        init(context, attrs, defStyleAttr, defStyleRes);
+    }
+
+
+    private void init(Context context, AttributeSet attributeSet, Integer defStyleAttr, Integer defStyleRes) {
         setOrientation(VERTICAL);
 
-        int[] attrs = {android.R.attr.windowBackground};
-        TypedArray a = context.obtainStyledAttributes(attrSet, attrs);
+        TypedArray a;
+        if (defStyleAttr == null || defStyleRes == null) {
+            a = context.obtainStyledAttributes(attributeSet, new int[]{android.R.attr.windowBackground});
+        } else {
+            a = context.obtainStyledAttributes(attributeSet, new int[]{android.R.attr.windowBackground}, defStyleAttr, defStyleRes);
+        }
+
         Drawable windowBackground = a.getDrawable(0);
         a.recycle();
         setBackgroundDrawable(windowBackground);
diff --git a/debugdrawer/build.gradle b/debugdrawer/build.gradle
index 14c88a3..726d58e 100644
--- a/debugdrawer/build.gradle
+++ b/debugdrawer/build.gradle
@@ -1,35 +1,59 @@
 apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+
+ext {
+    artifact = 'debugdrawer'
+}
+
+version = '1.0'
+
+apply from: "../buildSrc/install-publish.gradle"
 
 android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
+
+    compileSdkVersion COMPILE_SDK_VERSION
+    buildToolsVersion BUILD_TOOLS_VERSION
+
 
     defaultConfig {
-        minSdkVersion rootProject.ext.minSdkVersion
-        targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 1
-        versionName "1.0"
+        minSdkVersion MIN_SDK_VERSION
+        targetSdkVersion TARGET_SDK_VERSION
+        namespace 'io.palaima.debugdrawer'
     }
+
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+
+    // region java compiler flags
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+
+    // endregion
+
+    // region compile options
+
+    kotlinOptions {
+        jvmTarget = "11"
+    }
+
+    // endregion
 }
 
+apply from: "../buildSrc/module_dependencies.gradle"
+
 dependencies {
-    implementation "com.android.support:appcompat-v7:$rootProject.ext.supportVersion"
-    implementation "com.android.support:support-annotations:$rootProject.ext.supportVersion"
+
     implementation project(':debugdrawer-view')
     implementation project(':debugdrawer-base')
-}
 
-ext {
-    libraryName = 'Debug Drawer'
-    artifact = 'debugdrawer'
-    libraryDescription = 'Android Debug Drawer'
+    implementation getLibrary("androidx.appcompat:appcompat")
 }
 
-apply from: rootProject.file('gradle/install-v1.gradle')
-apply from: rootProject.file('gradle/bintray-android-v1.gradle')
+
diff --git a/debugdrawer/src/main/AndroidManifest.xml b/debugdrawer/src/main/AndroidManifest.xml
index 1e0e8f3..15e7c2a 100644
--- a/debugdrawer/src/main/AndroidManifest.xml
+++ b/debugdrawer/src/main/AndroidManifest.xml
@@ -1,6 +1 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.palaima.debugdrawer">
-
-    <application />
-
-</manifest>
+<manifest/>
\ No newline at end of file
diff --git a/debugdrawer/src/main/java/io/palaima/debugdrawer/DebugDrawer.java b/debugdrawer/src/main/java/io/palaima/debugdrawer/DebugDrawer.java
index 76efbb9..afc2c24 100644
--- a/debugdrawer/src/main/java/io/palaima/debugdrawer/DebugDrawer.java
+++ b/debugdrawer/src/main/java/io/palaima/debugdrawer/DebugDrawer.java
@@ -19,11 +19,6 @@
 import android.app.Activity;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.IntegerRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.StyleRes;
-import android.support.v4.widget.DrawerLayout;
 import android.util.TypedValue;
 import android.view.ContextThemeWrapper;
 import android.view.Gravity;
@@ -33,6 +28,12 @@
 import android.widget.FrameLayout;
 import android.widget.ScrollView;
 
+import androidx.annotation.DrawableRes;
+import androidx.annotation.IntegerRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.StyleRes;
+import androidx.drawerlayout.widget.DrawerLayout;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -220,7 +221,7 @@ public Builder widthDp(int drawerWidthDp) {
             if (activity == null) {
                 throw new RuntimeException("please pass an activity first to use this call");
             }
-            this.drawerWidth = (int) TypedValue.applyDimension(1, drawerWidthDp,
+            this.drawerWidth = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, drawerWidthDp,
                 activity.getResources().getDisplayMetrics());
             return this;
         }
diff --git a/debugdrawer/src/main/java/io/palaima/debugdrawer/view/ScrimInsetsFrameLayout.java b/debugdrawer/src/main/java/io/palaima/debugdrawer/view/ScrimInsetsFrameLayout.java
index ecc6b94..456de43 100644
--- a/debugdrawer/src/main/java/io/palaima/debugdrawer/view/ScrimInsetsFrameLayout.java
+++ b/debugdrawer/src/main/java/io/palaima/debugdrawer/view/ScrimInsetsFrameLayout.java
@@ -23,10 +23,11 @@
 import android.graphics.Rect;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
-import android.support.v4.view.ViewCompat;
 import android.util.AttributeSet;
 import android.widget.FrameLayout;
 
+import androidx.core.view.ViewCompat;
+
 import io.palaima.debugdrawer.R;
 
 
diff --git a/debugdrawer/src/main/res/layout/dd_debug_drawer.xml b/debugdrawer/src/main/res/layout/dd_debug_drawer.xml
index 393817c..7762765 100644
--- a/debugdrawer/src/main/res/layout/dd_debug_drawer.xml
+++ b/debugdrawer/src/main/res/layout/dd_debug_drawer.xml
@@ -1,20 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.DrawerLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/dd_drawer_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
-    >
+    android:fitsSystemWindows="true">
     <!--
         the clickable here should fix the hanging which occurs sometimes
         http://stackoverflow.com/questions/18044277/android-navigation-drawer-bug-using-the-sample
         -->
     <io.palaima.debugdrawer.view.ScrimInsetsFrameLayout
-        android:clickable="true"
         android:id="@+id/dd_content_layout"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
+        android:layout_height="match_parent"
+        android:clickable="true" />
 
     <include layout="@layout/dd_debug_drawer_slider" />
-</android.support.v4.widget.DrawerLayout>
+
+</androidx.drawerlayout.widget.DrawerLayout>
diff --git a/debugdrawer/src/main/res/layout/dd_debug_drawer_slider.xml b/debugdrawer/src/main/res/layout/dd_debug_drawer_slider.xml
index b440486..14d5d01 100644
--- a/debugdrawer/src/main/res/layout/dd_debug_drawer_slider.xml
+++ b/debugdrawer/src/main/res/layout/dd_debug_drawer_slider.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/dd_slider_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -13,5 +12,5 @@
     <io.palaima.debugdrawer.view.DebugView
         android:id="@+id/dd_debug_view"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
+        android:layout_height="wrap_content" />
 </ScrollView>
diff --git a/gradle.properties b/gradle.properties
index d240ea6..f93674d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,18 +1,64 @@
-## Project-wide Gradle settings.
-#
-# For more details on how to configure your build environment visit
-# http://www.gradle.org/docs/current/userguide/build_environment.html
-#
-# 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
-#
-# When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
-#Sat May 30 12:41:55 EEST 2015
+## =================================================================================================
+## gradle
+## =================================================================================================
+org.gradle.jvmargs=-Xmx8g -Xms1g -XX:MaxPermSize=1g -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseCompressedOops -XX:+CMSClassUnloadingEnabled -XX:+UseParallelGC
+org.gradle.caching=true
+org.gradle.configureondemand=true
+org.gradle.daemon=true
+org.gradle.info=true
+org.gradle.offline=true
+org.gradle.profile=true
+org.gradle.parallel=true
+org.gradle.parallel.threads=8
+org.gradle.workers.max=32
+# https://blog.gradle.org/introducing-file-system-watching
+org.gradle.unsafe.watch-fs=true
+# https://docs.gradle.org/current/userguide/configuration_cache.html
+org.gradle.unsafe.configuration-cache=true
+org.gradle.unsafe.configuration-cache-problems=warn
+## =================================================================================================
+## java
+## =================================================================================================
+compileJava.options.incremental=true
+compileJava.options.fork=true
+## =================================================================================================
+## android
+## =================================================================================================
+# https://developer.android.com/topic/libraries/support-library/androidx-overview
+android.useAndroidX=true
+# Automatically convert third-party libraries to use AndroidX
+android.enableJetifier=true
+## Determines whether to generate a BuildConfig class.
+android.defaults.buildfeatures.buildconfig=false
+## Determines whether to support Data Binding.
+android.defaults.buildFeatures.dataBinding=false
+## Determines whether to support View Binding.
+android.defaults.buildFeatures.viewBinding=true
+## Determines whether to generate binder classes for your AIDL files.
+android.defaults.buildfeatures.aidl=false
+## Determines whether to support RenderScript.
+android.defaults.buildfeatures.renderscript=false
+## Determines whether to support injecting custom variables into the module’s R class.
+android.defaults.buildfeatures.resvalues=true
+## Determines whether to support shader AOT compilation.
+android.defaults.buildfeatures.shaders=false
+## since agp 7.0.1
+### Android plugin 7.0.1 has experimental support for using relative path sensitivity with CompileLibraryResourcesTask inputs which will provide more build cache hits and improve build speed.
+android.experimental.cacheCompileLibResources=true
+android.experimental.enableSourceSetPathsMap=true
+## =================================================================================================
+## kotlin
+## =================================================================================================
+# Kotlin code style for this project: "official" or "obsolete":
+kotlin.code.style=official
+kotlin.incremental=true
+kotlin.caching.enabled=true
+kotlin.incremental.js=true
+## =================================================================================================
+## kapt
+## =================================================================================================
+kapt.incremental.apt=true
+
+# https://developer.android.com/studio/publish-library/configure-pub-variants
+android.disableAutomaticComponentCreation=true
 
-org.gradle.jvmargs=-Xmx2048m -XX\:MaxPermSize\=512m
-org.gradle.parallel=false
diff --git a/gradle/bintray-android-v1.gradle b/gradle/bintray-android-v1.gradle
deleted file mode 100644
index 316d485..0000000
--- a/gradle/bintray-android-v1.gradle
+++ /dev/null
@@ -1,77 +0,0 @@
-apply plugin: 'com.jfrog.bintray'
-
-version = libraryVersion
-
-task sourcesJar(type: Jar) {
-    from android.sourceSets.main.java.srcDirs
-    classifier = 'sources'
-}
-
-task javadoc(type: Javadoc) {
-    source = android.sourceSets.main.java.srcDirs
-    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
-}
-
-task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = 'javadoc'
-    from javadoc.destinationDir
-}
-artifacts {
-    //archives javadocJar
-    archives sourcesJar
-}
-
-def _user = System.getenv("BINTRAY_USER")
-def _key =  System.getenv("BINTRAY_API_KEY")
-def _passphrase = System.getenv("BINTRAY_PASSPHRASE")
-def _oss_user = System.getenv("OSS_USER")
-def _oss_password = System.getenv("OSS_PASSWORD")
-
-if(project.rootProject.file('local.properties').exists() && (_user == null || _user.isEmpty())){
-    Properties properties = new Properties()
-    properties.load(project.rootProject.file('local.properties').newDataInputStream())
-
-    _user = properties.getProperty("bintray.user")
-    _key = properties.getProperty("bintray.apikey")
-    _passphrase = properties.getProperty("bintray.gpg.password")
-    _oss_user = properties.getProperty("oss.user")
-    _oss_password = properties.getProperty("oss.password")
-}
-
-// Bintray
-
-bintray {
-    user = _user
-    key = _key
-    dryRun = dryRun
-    publish = publish
-    override = override
-    configurations = ['archives']
-    pkg {
-        repo = bintrayRepo
-        name = artifact
-        desc = libraryDescription
-        userOrg = orgName
-        websiteUrl = siteUrl
-        vcsUrl = gitUrl
-        licenses = allLicenses
-        githubRepo = githubRepo
-        githubReleaseNotesFile = githubReleaseNotesFile
-        publicDownloadNumbers = true
-        version {
-            released = new Date()
-            desc = libraryDescription
-            gpg {
-                sign = true //Determines whether to GPG sign the files. The default is false
-                passphrase = _passphrase
-                //Optional. The passphrase for GPG signing'
-            }
-            mavenCentralSync {
-                sync = true //[Default: true] Determines whether to sync the version to Maven Central.
-                user = _oss_user //OSS user token: mandatory
-                password = _oss_password //OSS user password: mandatory
-                close = '1' //Optional property. By default the staging repository is closed and artifacts are released to Maven Central. You can optionally turn this behaviour off (by puting 0 as value) and release the version manually.
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/gradle/bintray-java-v1.gradle b/gradle/bintray-java-v1.gradle
deleted file mode 100644
index 503712b..0000000
--- a/gradle/bintray-java-v1.gradle
+++ /dev/null
@@ -1,60 +0,0 @@
-apply plugin: 'com.jfrog.bintray'
-
-version = libraryVersion
-
-task sourcesJar(type: Jar) {
-    from sourceSets.main.allSource
-    classifier = 'sources'
-}
-
-task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = 'javadoc'
-    from javadoc.destinationDir
-}
-artifacts {
-    archives javadocJar
-    archives sourcesJar
-}
-
-// Bintray
-
-def _user = System.getenv("BINTRAY_USER")
-def _key =  System.getenv("BINTRAY_API_KEY")
-def _passphrase = System.getenv("BINTRAY_PASSPHRASE")
-
-if(project.rootProject.file('local.properties').exists() && (_user == null || _user.isEmpty())){
-    Properties properties = new Properties()
-    properties.load(project.rootProject.file('local.properties').newDataInputStream())
-
-    _user = properties.getProperty("bintray.user")
-    _key = properties.getProperty("bintray.apikey");
-    _passphrase = properties.getProperty("bintray.gpg.password")
-}
-
-bintray {
-    user = _user
-    key = _key
-
-    configurations = ['archives']
-    pkg {
-        repo = bintrayRepo
-        name = bintrayName
-        desc = libraryDescription
-        userOrg = orgName
-        websiteUrl = siteUrl
-        vcsUrl = gitUrl
-        licenses = ['Apache-2.0']
-        publish = true
-        publicDownloadNumbers = true
-        version {
-            desc = libraryDescription
-            gpg {
-                sign = true //Determines whether to GPG sign the files. The default is false
-                passphrase = _passphrase
-                //Optional. The passphrase for GPG signing'
-            }
-        }
-    }
-}
-
-//from https://github.com/workarounds/bundler/blob/master/gradle/bintray-java-v1.gradle
\ No newline at end of file
diff --git a/gradle/install-v1.gradle b/gradle/install-v1.gradle
deleted file mode 100644
index 79980d1..0000000
--- a/gradle/install-v1.gradle
+++ /dev/null
@@ -1,44 +0,0 @@
-apply plugin: 'com.github.dcendents.android-maven'
-
-group = publishedGroupId                               // Maven Group ID for the artifact
-
-install {
-    repositories.mavenInstaller {
-        // This generates POM.xml with proper parameters
-        pom {
-            project {
-                packaging 'aar'
-                groupId publishedGroupId
-                artifactId artifact
-
-                // Add your description here
-                name libraryName
-                description libraryDescription
-                url siteUrl
-
-                // Set your license
-                licenses {
-                    license {
-                        name licenseName
-                        url licenseUrl
-                    }
-                }
-                developers {
-                    developer {
-                        id developerId
-                        name developerName
-                        email developerEmail
-                    }
-                }
-                scm {
-                    connection gitUrl
-                    developerConnection gitUrl
-                    url siteUrl
-
-                }
-            }
-        }
-    }
-}
-
-//from https://github.com/workarounds/bundler/blob/master/gradle/install-v1.gradle
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 3baa851..249e583 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 5bdd85d..ae04661 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Sun Jan 29 14:30:42 EET 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.2.1-all.zip
diff --git a/gradlew b/gradlew
index 27309d9..a69d9cb 100755
--- a/gradlew
+++ b/gradlew
@@ -1,78 +1,129 @@
-#!/usr/bin/env bash
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
-warn ( ) {
+warn () {
     echo "$*"
-}
+} >&2
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -81,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -89,76 +140,101 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
 fi
 
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
     # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
         fi
-        i=$((i+1))
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
     done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
-}
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index f6d5974..53a6b23 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,4 +1,20 @@
-@if "%DEBUG%" == "" @echo off
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -9,19 +25,22 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @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=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -35,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -45,44 +64,26 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
diff --git a/release.sh b/release.sh
deleted file mode 100755
index 8c54f7d..0000000
--- a/release.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-set -ev
-
-./gradlew clean
-./gradlew assemble
-./gradlew bintrayUpload
diff --git a/settings.gradle b/settings.gradle
index fc15815..48dae57 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1,18 @@
-include ':app', ':debugdrawer', ':debugdrawer-picasso', ':debugdrawer-okhttp', ':debugdrawer-scalpel', ':debugdrawer-location', ':debugdrawer-timber', ':debugdrawer-fps', ':debugdrawer-actions', ':debugdrawer-base', ':debugdrawer-commons', ':debugdrawer-view', ':debugdrawer-no-op', ':debugdrawer-view-no-op', ':debugdrawer-glide', ':debugdrawer-okhttp3', ':debugdrawer-logs', ':debugdrawer-network-quality'
+include ':app'
+include ':debugdrawer'
+include ':debugdrawer-base'
+include ':debugdrawer-commons'
+include ':debugdrawer-picasso'
+include ':debugdrawer-okhttp'
+include ':debugdrawer-scalpel'
+include ':debugdrawer-location'
+include ':debugdrawer-timber'
+//include ':debugdrawer-fps'
+include ':debugdrawer-actions'
+include ':debugdrawer-view'
+include ':debugdrawer-no-op'
+include ':debugdrawer-view-no-op'
+include ':debugdrawer-glide'
+include ':debugdrawer-okhttp3'
+include ':debugdrawer-logs'
+include ':debugdrawer-network-quality'
diff --git a/version.properties b/version.properties
deleted file mode 100644
index afba2cc..0000000
--- a/version.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-version.major=0
-version.minor=8
-version.patch=0
-version.suffix=
-version.snapshot=false
-
-version.dryRun=false
-version.publish=true
\ No newline at end of file