From a52ae96b32ec1cdd6535733a7deafed9860c819b Mon Sep 17 00:00:00 2001
From: Mantas Palaima <palaima.mantas@gmail.com>
Date: Sun, 27 Dec 2015 16:24:05 +0200
Subject: [PATCH] Refactoring

All resources with dd prefixes
Use provided invested of compile for external dependencies
---
 app/build.gradle                              |   6 +-
 .../app/DebugDrawerApplication.java           |   3 +-
 .../debugdrawer/app/DebugViewActivity.java    |  42 ++--
 .../palaima/debugdrawer/app/ImageAdapter.java |  10 +-
 .../palaima/debugdrawer/app/MainActivity.java |  46 ++--
 .../main/res/layout/activity_debugview.xml    |   2 +-
 build.gradle                                  |   2 +-
 debugdrawer-actions/build.gradle              |   1 -
 .../debugdrawer/actions/ActionsModule.java    |   5 +-
 .../debugdrawer/actions/ButtonAction.java     |   2 +-
 .../debugdrawer/actions/SpinnerAction.java    |   4 +-
 .../debugdrawer/actions/SwitchAction.java     |   9 +-
 ...xml => dd_debug_drawer_module_actions.xml} |   0
 ...ug_drawer_module_actions_spinner_item.xml} |   0
 .../src/main/res/values/colors.xml            |   4 -
 .../src/main/res/values/dimens.xml            |   8 +-
 ....9.png => dd_debug_drawer_header_bg.9.png} | Bin
 ....9.png => dd_debug_drawer_header_bg.9.png} | Bin
 ....9.png => dd_debug_drawer_header_bg.9.png} | Bin
 .../src/main/res/values/styles.xml            |   2 +-
 .../debugdrawer/commons/BuildModule.java      |   8 +-
 .../debugdrawer/commons/DeviceModule.java     |  14 +-
 .../debugdrawer/commons/NetworkModule.java    |   8 +-
 .../debugdrawer/commons/SettingsModule.java   |  26 +--
 ...g => dd_ic_battery_unknown_white_24dp.png} | Bin
 ...e_24dp.png => dd_ic_delete_white_24dp.png} | Bin
 ...ng => dd_ic_developer_mode_white_24dp.png} | Bin
 ....png => dd_ic_info_outline_white_24dp.png} | Bin
 ...p.png => dd_ic_location_on_white_24dp.png} | Bin
 ...24dp.png => dd_ic_settings_white_24dp.png} | Bin
 ...g => dd_ic_battery_unknown_white_24dp.png} | Bin
 ...e_24dp.png => dd_ic_delete_white_24dp.png} | Bin
 ...ng => dd_ic_developer_mode_white_24dp.png} | Bin
 ....png => dd_ic_info_outline_white_24dp.png} | Bin
 ...p.png => dd_ic_location_on_white_24dp.png} | Bin
 ...24dp.png => dd_ic_settings_white_24dp.png} | Bin
 ...g => dd_ic_battery_unknown_white_24dp.png} | Bin
 ...e_24dp.png => dd_ic_delete_white_24dp.png} | Bin
 ...ng => dd_ic_developer_mode_white_24dp.png} | Bin
 ....png => dd_ic_info_outline_white_24dp.png} | Bin
 ...p.png => dd_ic_location_on_white_24dp.png} | Bin
 ...24dp.png => dd_ic_settings_white_24dp.png} | Bin
 ...g => dd_ic_battery_unknown_white_24dp.png} | Bin
 ...e_24dp.png => dd_ic_delete_white_24dp.png} | Bin
 ...ng => dd_ic_developer_mode_white_24dp.png} | Bin
 ....png => dd_ic_info_outline_white_24dp.png} | Bin
 ...p.png => dd_ic_location_on_white_24dp.png} | Bin
 ...24dp.png => dd_ic_settings_white_24dp.png} | Bin
 ...g => dd_ic_battery_unknown_white_24dp.png} | Bin
 ...e_24dp.png => dd_ic_delete_white_24dp.png} | Bin
 ...ng => dd_ic_developer_mode_white_24dp.png} | Bin
 ....png => dd_ic_info_outline_white_24dp.png} | Bin
 ...p.png => dd_ic_location_on_white_24dp.png} | Bin
 ...24dp.png => dd_ic_settings_white_24dp.png} | Bin
 ...d.xml => dd_debug_drawer_module_build.xml} |   6 +-
 ....xml => dd_debug_drawer_module_device.xml} |  12 +-
 ...xml => dd_debug_drawer_module_network.xml} |   6 +-
 ...ml => dd_debug_drawer_module_settings.xml} |  36 +--
 debugdrawer-fps/build.gradle                  |   3 +-
 .../io/palaima/debugdrawer/fps/FpsModule.java |  23 +-
 ...m_fps.xml => dd_debug_drawer_item_fps.xml} |   2 +-
 debugdrawer-location/build.gradle             |   2 +-
 .../debugdrawer/location/LocationModule.java  |  63 ++++--
 ...hite_24dp.png => dd_ic_map_white_24dp.png} | Bin
 ...hite_24dp.png => dd_ic_map_white_24dp.png} | Bin
 ...hite_24dp.png => dd_ic_map_white_24dp.png} | Bin
 ...hite_24dp.png => dd_ic_map_white_24dp.png} | Bin
 ...hite_24dp.png => dd_ic_map_white_24dp.png} | Bin
 ...ml => dd_debug_drawer_module_location.xml} |  14 +-
 .../src/main/res/values/strings.xml           |  12 +-
 .../src/main/res/values/colors.xml            |  10 -
 debugdrawer-no-op/build.gradle                |   1 +
 .../io/palaima/debugdrawer/DebugDrawer.java   |  14 ++
 debugdrawer-okhttp/build.gradle               |   3 +-
 .../debugdrawer/okhttp/OkHttpModule.java      |  60 +++--
 ....xml => dd_debug_drawer_module_okhttp.xml} |  10 +-
 debugdrawer-picasso/build.gradle              |   3 +-
 .../debugdrawer/picasso/PicassoModule.java    |  98 ++++----
 ...o.xml => dd_debug_drawer_item_picasso.xml} |  20 +-
 debugdrawer-scalpel/build.gradle              |   3 +-
 .../debugdrawer/scalpel/ScalpelModule.java    |  39 +++-
 ...l.xml => dd_debug_drawer_item_scalpel.xml} |   6 +-
 .../.gitignore                                |   0
 .../build.gradle                              |   4 +-
 .../gradle.properties                         |   0
 .../src/main/AndroidManifest.xml              |   2 +-
 .../debugdrawer/timber/TimberModule.java      |  10 +-
 .../debugdrawer/timber}/data/LumberYard.java  |  50 ++++-
 .../debugdrawer/timber}/model/LogEntry.java   |  30 +--
 .../debugdrawer/timber}/ui/LogAdapter.java    |  24 +-
 .../debugdrawer/timber}/ui/LogDialog.java     |  23 +-
 .../debugdrawer/timber}/util/Intents.java     |   2 +-
 .../res/layout/dd_debug_drawer_module_log.xml |   4 +-
 .../src/main/res/layout/dd_item_log_entry.xml |  18 +-
 .../src/main/res/values/colors.xml            |  10 +
 .../palaima/debugdrawer/view/DebugView.java   |  26 +--
 .../io/palaima/debugdrawer/DebugDrawer.java   | 210 ++++++++++--------
 .../io/palaima/debugdrawer/util/UIUtils.java  |   2 +-
 .../view/ScrimInsetsFrameLayout.java          |  68 +++---
 .../debug_drawer_header_bg.9.png              | Bin 149 -> 0 bytes
 .../ic_battery_unknown_white_24dp.png         | Bin 263 -> 0 bytes
 .../drawable-hdpi/ic_delete_white_24dp.png    | Bin 161 -> 0 bytes
 .../ic_developer_mode_white_24dp.png          | Bin 300 -> 0 bytes
 .../ic_info_outline_white_24dp.png            | Bin 485 -> 0 bytes
 .../ic_location_on_white_24dp.png             | Bin 371 -> 0 bytes
 .../drawable-hdpi/ic_settings_white_24dp.png  | Bin 460 -> 0 bytes
 .../debug_drawer_header_bg.9.png              | Bin 147 -> 0 bytes
 .../ic_battery_unknown_white_24dp.png         | Bin 189 -> 0 bytes
 .../drawable-mdpi/ic_delete_white_24dp.png    | Bin 115 -> 0 bytes
 .../ic_developer_mode_white_24dp.png          | Bin 217 -> 0 bytes
 .../ic_info_outline_white_24dp.png            | Bin 320 -> 0 bytes
 .../ic_location_on_white_24dp.png             | Bin 265 -> 0 bytes
 .../drawable-mdpi/ic_settings_white_24dp.png  | Bin 326 -> 0 bytes
 .../debug_drawer_header_bg.9.png              | Bin 151 -> 0 bytes
 .../ic_battery_unknown_white_24dp.png         | Bin 311 -> 0 bytes
 .../drawable-xhdpi/ic_delete_white_24dp.png   | Bin 151 -> 0 bytes
 .../ic_developer_mode_white_24dp.png          | Bin 410 -> 0 bytes
 .../ic_info_outline_white_24dp.png            | Bin 655 -> 0 bytes
 .../ic_location_on_white_24dp.png             | Bin 456 -> 0 bytes
 .../drawable-xhdpi/ic_settings_white_24dp.png | Bin 562 -> 0 bytes
 .../ic_battery_unknown_white_24dp.png         | Bin 428 -> 0 bytes
 .../drawable-xxhdpi/ic_delete_white_24dp.png  | Bin 194 -> 0 bytes
 .../ic_developer_mode_white_24dp.png          | Bin 461 -> 0 bytes
 .../ic_info_outline_white_24dp.png            | Bin 953 -> 0 bytes
 .../ic_location_on_white_24dp.png             | Bin 675 -> 0 bytes
 .../ic_settings_white_24dp.png                | Bin 843 -> 0 bytes
 .../ic_battery_unknown_white_24dp.png         | Bin 572 -> 0 bytes
 .../drawable-xxxhdpi/ic_delete_white_24dp.png | Bin 243 -> 0 bytes
 .../ic_developer_mode_white_24dp.png          | Bin 667 -> 0 bytes
 .../ic_info_outline_white_24dp.png            | Bin 1279 -> 0 bytes
 .../ic_location_on_white_24dp.png             | Bin 869 -> 0 bytes
 .../ic_settings_white_24dp.png                | Bin 1074 -> 0 bytes
 .../{debug_drawer.xml => dd_debug_drawer.xml} |   6 +-
 ..._slider.xml => dd_debug_drawer_slider.xml} |   8 +-
 .../res/layout/debug_drawer_module_build.xml  |  54 -----
 .../res/layout/debug_drawer_module_device.xml |  91 --------
 .../layout/debug_drawer_module_divider.xml    |  16 --
 .../layout/debug_drawer_module_network.xml    |  51 -----
 .../layout/debug_drawer_module_settings.xml   | 103 ---------
 debugdrawer/src/main/res/values/attrs.xml     |   4 +-
 debugdrawer/src/main/res/values/dimens.xml    |   8 +-
 debugdrawer/src/main/res/values/styles.xml    |  31 ---
 settings.gradle                               |   2 +-
 143 files changed, 648 insertions(+), 857 deletions(-)
 rename debugdrawer-actions/src/main/res/layout/{debug_drawer_module_actions.xml => dd_debug_drawer_module_actions.xml} (100%)
 rename debugdrawer-actions/src/main/res/layout/{debug_drawer_module_actions_spinner_item.xml => dd_debug_drawer_module_actions_spinner_item.xml} (100%)
 delete mode 100644 debugdrawer-actions/src/main/res/values/colors.xml
 rename debugdrawer-base/src/main/res/drawable-hdpi/{debug_drawer_header_bg.9.png => dd_debug_drawer_header_bg.9.png} (100%)
 rename debugdrawer-base/src/main/res/drawable-mdpi/{debug_drawer_header_bg.9.png => dd_debug_drawer_header_bg.9.png} (100%)
 rename debugdrawer-base/src/main/res/drawable-xhdpi/{debug_drawer_header_bg.9.png => dd_debug_drawer_header_bg.9.png} (100%)
 rename debugdrawer-commons/src/main/res/drawable-hdpi/{ic_battery_unknown_white_24dp.png => dd_ic_battery_unknown_white_24dp.png} (100%)
 rename debugdrawer-commons/src/main/res/drawable-hdpi/{ic_delete_white_24dp.png => dd_ic_delete_white_24dp.png} (100%)
 rename debugdrawer-commons/src/main/res/drawable-hdpi/{ic_developer_mode_white_24dp.png => dd_ic_developer_mode_white_24dp.png} (100%)
 rename debugdrawer-commons/src/main/res/drawable-hdpi/{ic_info_outline_white_24dp.png => dd_ic_info_outline_white_24dp.png} (100%)
 rename debugdrawer-commons/src/main/res/drawable-hdpi/{ic_location_on_white_24dp.png => dd_ic_location_on_white_24dp.png} (100%)
 rename debugdrawer-commons/src/main/res/drawable-hdpi/{ic_settings_white_24dp.png => dd_ic_settings_white_24dp.png} (100%)
 rename debugdrawer-commons/src/main/res/drawable-mdpi/{ic_battery_unknown_white_24dp.png => dd_ic_battery_unknown_white_24dp.png} (100%)
 rename debugdrawer-commons/src/main/res/drawable-mdpi/{ic_delete_white_24dp.png => dd_ic_delete_white_24dp.png} (100%)
 rename debugdrawer-commons/src/main/res/drawable-mdpi/{ic_developer_mode_white_24dp.png => dd_ic_developer_mode_white_24dp.png} (100%)
 rename debugdrawer-commons/src/main/res/drawable-mdpi/{ic_info_outline_white_24dp.png => dd_ic_info_outline_white_24dp.png} (100%)
 rename debugdrawer-commons/src/main/res/drawable-mdpi/{ic_location_on_white_24dp.png => dd_ic_location_on_white_24dp.png} (100%)
 rename debugdrawer-commons/src/main/res/drawable-mdpi/{ic_settings_white_24dp.png => dd_ic_settings_white_24dp.png} (100%)
 rename debugdrawer-commons/src/main/res/drawable-xhdpi/{ic_battery_unknown_white_24dp.png => dd_ic_battery_unknown_white_24dp.png} (100%)
 rename debugdrawer-commons/src/main/res/drawable-xhdpi/{ic_delete_white_24dp.png => dd_ic_delete_white_24dp.png} (100%)
 rename debugdrawer-commons/src/main/res/drawable-xhdpi/{ic_developer_mode_white_24dp.png => dd_ic_developer_mode_white_24dp.png} (100%)
 rename debugdrawer-commons/src/main/res/drawable-xhdpi/{ic_info_outline_white_24dp.png => dd_ic_info_outline_white_24dp.png} (100%)
 rename debugdrawer-commons/src/main/res/drawable-xhdpi/{ic_location_on_white_24dp.png => dd_ic_location_on_white_24dp.png} (100%)
 rename debugdrawer-commons/src/main/res/drawable-xhdpi/{ic_settings_white_24dp.png => dd_ic_settings_white_24dp.png} (100%)
 rename debugdrawer-commons/src/main/res/drawable-xxhdpi/{ic_battery_unknown_white_24dp.png => dd_ic_battery_unknown_white_24dp.png} (100%)
 rename debugdrawer-commons/src/main/res/drawable-xxhdpi/{ic_delete_white_24dp.png => dd_ic_delete_white_24dp.png} (100%)
 rename debugdrawer-commons/src/main/res/drawable-xxhdpi/{ic_developer_mode_white_24dp.png => dd_ic_developer_mode_white_24dp.png} (100%)
 rename debugdrawer-commons/src/main/res/drawable-xxhdpi/{ic_info_outline_white_24dp.png => dd_ic_info_outline_white_24dp.png} (100%)
 rename debugdrawer-commons/src/main/res/drawable-xxhdpi/{ic_location_on_white_24dp.png => dd_ic_location_on_white_24dp.png} (100%)
 rename debugdrawer-commons/src/main/res/drawable-xxhdpi/{ic_settings_white_24dp.png => dd_ic_settings_white_24dp.png} (100%)
 rename debugdrawer-commons/src/main/res/drawable-xxxhdpi/{ic_battery_unknown_white_24dp.png => dd_ic_battery_unknown_white_24dp.png} (100%)
 rename debugdrawer-commons/src/main/res/drawable-xxxhdpi/{ic_delete_white_24dp.png => dd_ic_delete_white_24dp.png} (100%)
 rename debugdrawer-commons/src/main/res/drawable-xxxhdpi/{ic_developer_mode_white_24dp.png => dd_ic_developer_mode_white_24dp.png} (100%)
 rename debugdrawer-commons/src/main/res/drawable-xxxhdpi/{ic_info_outline_white_24dp.png => dd_ic_info_outline_white_24dp.png} (100%)
 rename debugdrawer-commons/src/main/res/drawable-xxxhdpi/{ic_location_on_white_24dp.png => dd_ic_location_on_white_24dp.png} (100%)
 rename debugdrawer-commons/src/main/res/drawable-xxxhdpi/{ic_settings_white_24dp.png => dd_ic_settings_white_24dp.png} (100%)
 rename debugdrawer-commons/src/main/res/layout/{debug_drawer_module_build.xml => dd_debug_drawer_module_build.xml} (92%)
 rename debugdrawer-commons/src/main/res/layout/{debug_drawer_module_device.xml => dd_debug_drawer_module_device.xml} (90%)
 rename debugdrawer-commons/src/main/res/layout/{debug_drawer_module_network.xml => dd_debug_drawer_module_network.xml} (90%)
 rename debugdrawer-commons/src/main/res/layout/{debug_drawer_module_settings.xml => dd_debug_drawer_module_settings.xml} (72%)
 rename debugdrawer-fps/src/main/res/layout/{debug_drawer_item_fps.xml => dd_debug_drawer_item_fps.xml} (95%)
 rename debugdrawer-location/src/main/res/drawable-hdpi/{ic_map_white_24dp.png => dd_ic_map_white_24dp.png} (100%)
 rename debugdrawer-location/src/main/res/drawable-mdpi/{ic_map_white_24dp.png => dd_ic_map_white_24dp.png} (100%)
 rename debugdrawer-location/src/main/res/drawable-xhdpi/{ic_map_white_24dp.png => dd_ic_map_white_24dp.png} (100%)
 rename debugdrawer-location/src/main/res/drawable-xxhdpi/{ic_map_white_24dp.png => dd_ic_map_white_24dp.png} (100%)
 rename debugdrawer-location/src/main/res/drawable-xxxhdpi/{ic_map_white_24dp.png => dd_ic_map_white_24dp.png} (100%)
 rename debugdrawer-location/src/main/res/layout/{debug_drawer_module_location.xml => dd_debug_drawer_module_location.xml} (88%)
 delete mode 100644 debugdrawer-log/src/main/res/values/colors.xml
 rename debugdrawer-okhttp/src/main/res/layout/{debug_drawer_module_okhttp.xml => dd_debug_drawer_module_okhttp.xml} (88%)
 rename debugdrawer-picasso/src/main/res/layout/{debug_drawer_item_picasso.xml => dd_debug_drawer_item_picasso.xml} (88%)
 rename debugdrawer-scalpel/src/main/res/layout/{debug_drawer_item_scalpel.xml => dd_debug_drawer_item_scalpel.xml} (91%)
 rename {debugdrawer-log => debugdrawer-timber}/.gitignore (100%)
 rename {debugdrawer-log => debugdrawer-timber}/build.gradle (92%)
 rename {debugdrawer-log => debugdrawer-timber}/gradle.properties (100%)
 rename {debugdrawer-log => debugdrawer-timber}/src/main/AndroidManifest.xml (74%)
 rename debugdrawer-log/src/main/java/io/palaima/debugdrawer/log/LogModule.java => debugdrawer-timber/src/main/java/io/palaima/debugdrawer/timber/TimberModule.java (70%)
 rename {debugdrawer-log/src/main/java/io/palaima/debugdrawer/log => debugdrawer-timber/src/main/java/io/palaima/debugdrawer/timber}/data/LumberYard.java (76%)
 rename {debugdrawer-log/src/main/java/io/palaima/debugdrawer/log => debugdrawer-timber/src/main/java/io/palaima/debugdrawer/timber}/model/LogEntry.java (60%)
 rename {debugdrawer-log/src/main/java/io/palaima/debugdrawer/log => debugdrawer-timber/src/main/java/io/palaima/debugdrawer/timber}/ui/LogAdapter.java (82%)
 rename {debugdrawer-log/src/main/java/io/palaima/debugdrawer/log => debugdrawer-timber/src/main/java/io/palaima/debugdrawer/timber}/ui/LogDialog.java (82%)
 rename {debugdrawer-log/src/main/java/io/palaima/debugdrawer/log => debugdrawer-timber/src/main/java/io/palaima/debugdrawer/timber}/util/Intents.java (96%)
 rename debugdrawer-log/src/main/res/layout/debug_drawer_module_log.xml => debugdrawer-timber/src/main/res/layout/dd_debug_drawer_module_log.xml (90%)
 rename debugdrawer-log/src/main/res/layout/item_log_entry.xml => debugdrawer-timber/src/main/res/layout/dd_item_log_entry.xml (73%)
 create mode 100644 debugdrawer-timber/src/main/res/values/colors.xml
 delete mode 100644 debugdrawer/src/main/res/drawable-hdpi/debug_drawer_header_bg.9.png
 delete mode 100644 debugdrawer/src/main/res/drawable-hdpi/ic_battery_unknown_white_24dp.png
 delete mode 100644 debugdrawer/src/main/res/drawable-hdpi/ic_delete_white_24dp.png
 delete mode 100644 debugdrawer/src/main/res/drawable-hdpi/ic_developer_mode_white_24dp.png
 delete mode 100644 debugdrawer/src/main/res/drawable-hdpi/ic_info_outline_white_24dp.png
 delete mode 100644 debugdrawer/src/main/res/drawable-hdpi/ic_location_on_white_24dp.png
 delete mode 100644 debugdrawer/src/main/res/drawable-hdpi/ic_settings_white_24dp.png
 delete mode 100644 debugdrawer/src/main/res/drawable-mdpi/debug_drawer_header_bg.9.png
 delete mode 100644 debugdrawer/src/main/res/drawable-mdpi/ic_battery_unknown_white_24dp.png
 delete mode 100644 debugdrawer/src/main/res/drawable-mdpi/ic_delete_white_24dp.png
 delete mode 100644 debugdrawer/src/main/res/drawable-mdpi/ic_developer_mode_white_24dp.png
 delete mode 100644 debugdrawer/src/main/res/drawable-mdpi/ic_info_outline_white_24dp.png
 delete mode 100644 debugdrawer/src/main/res/drawable-mdpi/ic_location_on_white_24dp.png
 delete mode 100644 debugdrawer/src/main/res/drawable-mdpi/ic_settings_white_24dp.png
 delete mode 100644 debugdrawer/src/main/res/drawable-xhdpi/debug_drawer_header_bg.9.png
 delete mode 100644 debugdrawer/src/main/res/drawable-xhdpi/ic_battery_unknown_white_24dp.png
 delete mode 100644 debugdrawer/src/main/res/drawable-xhdpi/ic_delete_white_24dp.png
 delete mode 100644 debugdrawer/src/main/res/drawable-xhdpi/ic_developer_mode_white_24dp.png
 delete mode 100644 debugdrawer/src/main/res/drawable-xhdpi/ic_info_outline_white_24dp.png
 delete mode 100644 debugdrawer/src/main/res/drawable-xhdpi/ic_location_on_white_24dp.png
 delete mode 100644 debugdrawer/src/main/res/drawable-xhdpi/ic_settings_white_24dp.png
 delete mode 100644 debugdrawer/src/main/res/drawable-xxhdpi/ic_battery_unknown_white_24dp.png
 delete mode 100644 debugdrawer/src/main/res/drawable-xxhdpi/ic_delete_white_24dp.png
 delete mode 100644 debugdrawer/src/main/res/drawable-xxhdpi/ic_developer_mode_white_24dp.png
 delete mode 100644 debugdrawer/src/main/res/drawable-xxhdpi/ic_info_outline_white_24dp.png
 delete mode 100644 debugdrawer/src/main/res/drawable-xxhdpi/ic_location_on_white_24dp.png
 delete mode 100644 debugdrawer/src/main/res/drawable-xxhdpi/ic_settings_white_24dp.png
 delete mode 100644 debugdrawer/src/main/res/drawable-xxxhdpi/ic_battery_unknown_white_24dp.png
 delete mode 100644 debugdrawer/src/main/res/drawable-xxxhdpi/ic_delete_white_24dp.png
 delete mode 100644 debugdrawer/src/main/res/drawable-xxxhdpi/ic_developer_mode_white_24dp.png
 delete mode 100644 debugdrawer/src/main/res/drawable-xxxhdpi/ic_info_outline_white_24dp.png
 delete mode 100644 debugdrawer/src/main/res/drawable-xxxhdpi/ic_location_on_white_24dp.png
 delete mode 100644 debugdrawer/src/main/res/drawable-xxxhdpi/ic_settings_white_24dp.png
 rename debugdrawer/src/main/res/layout/{debug_drawer.xml => dd_debug_drawer.xml} (83%)
 rename debugdrawer/src/main/res/layout/{debug_drawer_slider.xml => dd_debug_drawer_slider.xml} (70%)
 delete mode 100644 debugdrawer/src/main/res/layout/debug_drawer_module_build.xml
 delete mode 100644 debugdrawer/src/main/res/layout/debug_drawer_module_device.xml
 delete mode 100644 debugdrawer/src/main/res/layout/debug_drawer_module_divider.xml
 delete mode 100644 debugdrawer/src/main/res/layout/debug_drawer_module_network.xml
 delete mode 100644 debugdrawer/src/main/res/layout/debug_drawer_module_settings.xml
 delete mode 100644 debugdrawer/src/main/res/values/styles.xml

diff --git a/app/build.gradle b/app/build.gradle
index 185fdf6..787405b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -39,6 +39,8 @@ dependencies {
     compile 'com.squareup.picasso:picasso:2.5.2'
     compile 'com.squareup.okhttp:okhttp:2.5.0'
     compile 'jp.wasabeef:takt:1.0.2'
+    compile 'com.jakewharton.timber:timber:4.1.0'
+    compile 'com.jakewharton.scalpel:scalpel:1.1.2'
     compile 'com.google.android.gms:play-services-location:8.3.0'
 
     /*debugCompile 'io.palaima.debugdrawer:debugdrawer:0.6.0'
@@ -75,13 +77,13 @@ dependencies {
     debugCompile project(':debugdrawer-view')
     compile project(':debugdrawer-base')
     compile project(':debugdrawer-commons')
+    compile project(':debugdrawer-actions')
     compile project(':debugdrawer-picasso')
     compile project(':debugdrawer-okhttp')
     compile project(':debugdrawer-scalpel')
     compile project(':debugdrawer-location')
-    compile project(':debugdrawer-log')
+    compile project(':debugdrawer-timber')
     compile project(':debugdrawer-fps')
-    compile project(':debugdrawer-actions')
 
     debugCompile 'com.squareup.leakcanary:leakcanary-android:1.3.1'
     releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.3.1'
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 5529973..da73dd9 100644
--- a/app/src/main/java/io/palaima/debugdrawer/app/DebugDrawerApplication.java
+++ b/app/src/main/java/io/palaima/debugdrawer/app/DebugDrawerApplication.java
@@ -4,7 +4,7 @@
 
 import com.squareup.leakcanary.LeakCanary;
 
-import io.palaima.debugdrawer.log.data.LumberYard;
+import io.palaima.debugdrawer.timber.data.LumberYard;
 import timber.log.Timber;
 
 
@@ -13,6 +13,7 @@
  * @since 01/07/15
  */
 public class DebugDrawerApplication extends Application {
+
     @Override
     public void onCreate() {
         super.onCreate();
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 ff67dd5..abb1dd8 100644
--- a/app/src/main/java/io/palaima/debugdrawer/app/DebugViewActivity.java
+++ b/app/src/main/java/io/palaima/debugdrawer/app/DebugViewActivity.java
@@ -27,31 +27,31 @@
 import io.palaima.debugdrawer.commons.SettingsModule;
 import io.palaima.debugdrawer.fps.FpsModule;
 import io.palaima.debugdrawer.location.LocationModule;
-import io.palaima.debugdrawer.log.LogModule;
 import io.palaima.debugdrawer.okhttp.OkHttpModule;
 import io.palaima.debugdrawer.picasso.PicassoModule;
 import io.palaima.debugdrawer.scalpel.ScalpelModule;
+import io.palaima.debugdrawer.timber.TimberModule;
 import io.palaima.debugdrawer.view.DebugView;
 import jp.wasabeef.takt.Takt;
 import timber.log.Timber;
 
 public class DebugViewActivity extends AppCompatActivity {
 
-    private Toolbar mToolbar;
+    private Toolbar toolbar;
 
-    private DebugView mDebugView;
+    private DebugView debugView;
 
-    private Picasso mPicasso;
+    private Picasso picasso;
 
-    private OkHttpClient mOkHttpClient;
+    private OkHttpClient okHttpClient;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_debugview);
-        mOkHttpClient = createOkHttpClient(this.getApplication());
-        mPicasso = new Picasso.Builder(this)
-            .downloader(new OkHttpDownloader(mOkHttpClient))
+        okHttpClient = createOkHttpClient(this.getApplication());
+        picasso = new Picasso.Builder(this)
+            .downloader(new OkHttpDownloader(okHttpClient))
             .listener(new Picasso.Listener() {
                 @Override
                 public void onImageLoadFailed(Picasso picasso, Uri uri, Exception e) {
@@ -85,16 +85,16 @@ public void onClick() {
             }
         );
 
-        mDebugView = (DebugView) findViewById(R.id.debug_view);
+        debugView = (DebugView) findViewById(R.id.debug_view);
 
-        mDebugView.modules(
+        debugView.modules(
             new ActionsModule(switchAction, buttonAction, spinnerAction),
             new FpsModule(Takt.stock(getApplication())),
             new LocationModule(this),
             new ScalpelModule(this),
-            new LogModule(),
-            new OkHttpModule(mOkHttpClient),
-            new PicassoModule(mPicasso),
+            new TimberModule(),
+            new OkHttpModule(okHttpClient),
+            new PicassoModule(picasso),
             new DeviceModule(this),
             new BuildModule(this),
             new NetworkModule(this),
@@ -115,32 +115,32 @@ private void showDummyLog() {
 
     @Override protected void onResume() {
         super.onResume();
-        mDebugView.onResume();
+        debugView.onResume();
     }
 
     @Override protected void onPause() {
         super.onPause();
-        mDebugView.onPause();
+        debugView.onPause();
     }
 
     @Override
     protected void onStart() {
         super.onStart();
-        mDebugView.onStart();
+        debugView.onStart();
     }
 
     @Override
     protected void onStop() {
         super.onStop();
-        mDebugView.onStop();
+        debugView.onStop();
     }
 
     protected Toolbar setupToolBar() {
-        mToolbar = (Toolbar) findViewById(R.id.mainToolbar);
-        if (mToolbar != null) {
-            setSupportActionBar(mToolbar);
+        toolbar = (Toolbar) findViewById(R.id.mainToolbar);
+        if (toolbar != null) {
+            setSupportActionBar(toolbar);
         }
-        return mToolbar;
+        return toolbar;
     }
 
     private static final int DISK_CACHE_SIZE = 50 * 1024 * 1024; // 50 MB
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 8d6af60..361da4f 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,5 @@
 package io.palaima.debugdrawer.app;
 
-import com.squareup.picasso.Picasso;
-
 import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -9,15 +7,17 @@
 import android.widget.ArrayAdapter;
 import android.widget.ImageView;
 
+import com.squareup.picasso.Picasso;
+
 import java.util.List;
 
 public class ImageAdapter extends ArrayAdapter<String> {
 
-    private final Picasso mPicasso;
+    private final Picasso picasso;
 
     public ImageAdapter(Context context, List<String> images, Picasso picasso) {
         super(context, 0, images);
-        mPicasso = picasso;
+        this.picasso = picasso;
     }
 
     @Override
@@ -26,7 +26,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
         if (convertView == null) {
             convertView = LayoutInflater.from(getContext()).inflate(R.layout.image_item, parent, false);
         }
-        mPicasso.load(url).into((ImageView)convertView.findViewById(R.id.image));
+        picasso.load(url).into((ImageView)convertView.findViewById(R.id.image));
         return convertView;
     }
 }
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 0e9f3af..bfd03c5 100644
--- a/app/src/main/java/io/palaima/debugdrawer/app/MainActivity.java
+++ b/app/src/main/java/io/palaima/debugdrawer/app/MainActivity.java
@@ -29,35 +29,35 @@
 import io.palaima.debugdrawer.actions.SpinnerAction;
 import io.palaima.debugdrawer.actions.SwitchAction;
 import io.palaima.debugdrawer.commons.BuildModule;
-import io.palaima.debugdrawer.fps.FpsModule;
-import io.palaima.debugdrawer.location.LocationModule;
-import io.palaima.debugdrawer.log.LogModule;
 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.okhttp.OkHttpModule;
 import io.palaima.debugdrawer.picasso.PicassoModule;
 import io.palaima.debugdrawer.scalpel.ScalpelModule;
+import io.palaima.debugdrawer.timber.TimberModule;
 import jp.wasabeef.takt.Takt;
 import timber.log.Timber;
 
 public class MainActivity extends AppCompatActivity {
 
-    private Toolbar mToolbar;
+    private Toolbar toolbar;
 
-    private DebugDrawer mDebugDrawer;
+    private DebugDrawer debugDrawer;
 
-    private Picasso mPicasso;
+    private Picasso picasso;
 
-    private OkHttpClient mOkHttpClient;
+    private OkHttpClient okHttpClient;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-        mOkHttpClient = createOkHttpClient(this.getApplication());
-        mPicasso = new Picasso.Builder(this)
-                .downloader(new OkHttpDownloader(mOkHttpClient))
+        okHttpClient = createOkHttpClient(this.getApplication());
+        picasso = new Picasso.Builder(this)
+                .downloader(new OkHttpDownloader(okHttpClient))
                 .listener(new Picasso.Listener() {
                     @Override
                     public void onImageLoadFailed(Picasso picasso, Uri uri, Exception e) {
@@ -97,14 +97,14 @@ public void onClick() {
             }
         );
 
-        mDebugDrawer = new DebugDrawer.Builder(this).modules(
+        debugDrawer = new DebugDrawer.Builder(this).modules(
                 new ActionsModule(switchAction, buttonAction, spinnerAction),
                 new FpsModule(Takt.stock(getApplication())),
                 new LocationModule(this),
                 new ScalpelModule(this),
-                new LogModule(),
-                new OkHttpModule(mOkHttpClient),
-                new PicassoModule(mPicasso),
+                new TimberModule(),
+                new OkHttpModule(okHttpClient),
+                new PicassoModule(picasso),
                 new DeviceModule(this),
                 new BuildModule(this),
                 new NetworkModule(this),
@@ -119,7 +119,7 @@ public void onClick() {
         }
 
         ListView listView = (ListView) findViewById(R.id.image_list);
-        listView.setAdapter(new ImageAdapter(this, images, mPicasso));
+        listView.setAdapter(new ImageAdapter(this, images, picasso));
     }
 
     private void showDummyLog() {
@@ -134,23 +134,23 @@ private void showDummyLog() {
     @Override
     protected void onStart() {
         super.onStart();
-        mDebugDrawer.onStart();
+        debugDrawer.onStart();
     }
 
     @Override protected void onResume() {
         super.onResume();
-        mDebugDrawer.onResume();
+        debugDrawer.onResume();
     }
 
     @Override protected void onPause() {
         super.onPause();
-        mDebugDrawer.onPause();
+        debugDrawer.onPause();
     }
 
     @Override
     protected void onStop() {
         super.onStop();
-        mDebugDrawer.onStop();
+        debugDrawer.onStop();
     }
 
     @Override
@@ -177,11 +177,11 @@ public boolean onOptionsItemSelected(MenuItem item) {
     }
 
     protected Toolbar setupToolBar() {
-        mToolbar = (Toolbar) findViewById(R.id.mainToolbar);
-        if (mToolbar != null) {
-            setSupportActionBar(mToolbar);
+        toolbar = (Toolbar) findViewById(R.id.mainToolbar);
+        if (toolbar != null) {
+            setSupportActionBar(toolbar);
         }
-        return mToolbar;
+        return toolbar;
     }
 
     private static final int DISK_CACHE_SIZE = 50 * 1024 * 1024; // 50 MB
diff --git a/app/src/main/res/layout/activity_debugview.xml b/app/src/main/res/layout/activity_debugview.xml
index e13b8f0..1b0974c 100644
--- a/app/src/main/res/layout/activity_debugview.xml
+++ b/app/src/main/res/layout/activity_debugview.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context=".MainActivity">
+    tools:context=".DebugViewActivity">
 
     <include layout="@layout/toolbar"/>
 
diff --git a/build.gradle b/build.gradle
index bb0178b..03a8a16 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.0.0-alpha2'
+        classpath 'com.android.tools.build:gradle:2.0.0-alpha3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/debugdrawer-actions/build.gradle b/debugdrawer-actions/build.gradle
index 11caf4b..8818c3b 100644
--- a/debugdrawer-actions/build.gradle
+++ b/debugdrawer-actions/build.gradle
@@ -19,7 +19,6 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:support-v4:23.1.1'
     compile project(':debugdrawer-base')
 }
 
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 6ac2b4b..480f863 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,7 +1,6 @@
 package io.palaima.debugdrawer.actions;
 
 import android.support.annotation.NonNull;
-import android.support.v4.content.ContextCompat;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -26,11 +25,11 @@ public ActionsModule(Action... actions) {
 
     @NonNull @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @NonNull ViewGroup parent) {
-        LinearLayout view = (LinearLayout) inflater.inflate(R.layout.debug_drawer_module_actions, parent, false);
+        LinearLayout view = (LinearLayout) inflater.inflate(R.layout.dd_debug_drawer_module_actions, parent, false);
 
         if (actions.isEmpty()) {
             TextView noActionsLabel = new TextView(parent.getContext());
-            noActionsLabel.setTextColor(ContextCompat.getColor(parent.getContext(), R.color.white));
+            noActionsLabel.setTextColor(parent.getResources().getColor(android.R.color.white));
             noActionsLabel.setText("No actions added");
             view.addView(noActionsLabel);
         } else {
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 e55c1a6..63edee3 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
@@ -24,7 +24,7 @@ public View getView(LinearLayout linearLayout) {
         Resources resources = context.getResources();
 
         LinearLayout.LayoutParams buttonLayoutParams = new LinearLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT);
-        buttonLayoutParams.topMargin = resources.getDimensionPixelOffset(R.dimen.padding_small);
+        buttonLayoutParams.topMargin = resources.getDimensionPixelOffset(R.dimen.dd_padding_small);
 
         Button button = new Button(context);
         button.setLayoutParams(buttonLayoutParams);
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 0a72a75..549de0a 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
@@ -41,7 +41,7 @@ public View getView(LinearLayout view) {
         Resources resources = context.getResources();
 
         LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT);
-        layoutParams.topMargin = resources.getDimensionPixelOffset(R.dimen.padding_small);
+        layoutParams.topMargin = resources.getDimensionPixelOffset(R.dimen.dd_padding_small);
 
         Spinner spinner = new Spinner(context);
         spinner.setLayoutParams(layoutParams);
@@ -58,7 +58,7 @@ public View getView(LinearLayout view) {
             }
         });
 
-        ArrayAdapter<String> adapter = new ArrayAdapter<>(context, R.layout.debug_drawer_module_actions_spinner_item, titles);
+        ArrayAdapter<String> adapter = new ArrayAdapter<>(context, R.layout.dd_debug_drawer_module_actions_spinner_item, titles);
         adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
         spinner.setAdapter(adapter);
 
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 a2e7b10..69ffc67 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
@@ -3,7 +3,6 @@
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.res.Resources;
-import android.support.v4.content.ContextCompat;
 import android.util.TypedValue;
 import android.view.Gravity;
 import android.view.View;
@@ -35,20 +34,20 @@ public View getView(LinearLayout linearLayout) {
         Resources resources = context.getResources();
 
         LinearLayout.LayoutParams viewGroupLayoutParams = new LinearLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT);
-        viewGroupLayoutParams.topMargin = resources.getDimensionPixelOffset(R.dimen.padding_small);
+        viewGroupLayoutParams.topMargin = resources.getDimensionPixelOffset(R.dimen.dd_padding_small);
 
         LinearLayout viewGroup = new LinearLayout(context);
         viewGroup.setLayoutParams(viewGroupLayoutParams);
         viewGroup.setOrientation(LinearLayout.HORIZONTAL);
 
         LinearLayout.LayoutParams textViewLayoutParams = new LinearLayout.LayoutParams(WRAP_CONTENT, WRAP_CONTENT);
-        textViewLayoutParams.rightMargin = resources.getDimensionPixelSize(R.dimen.spacing_big);
+        textViewLayoutParams.rightMargin = resources.getDimensionPixelSize(R.dimen.dd_spacing_big);
 
         TextView textView = new TextView(context);
         textView.setLayoutParams(textViewLayoutParams);
         textView.setText(name);
-        textView.setTextColor(ContextCompat.getColor(context, R.color.white));
-        textView.setTextSize(TypedValue.COMPLEX_UNIT_PX, resources.getDimension(R.dimen.font_normal));
+        textView.setTextColor(context.getResources().getColor(android.R.color.white));
+        textView.setTextSize(TypedValue.COMPLEX_UNIT_PX, resources.getDimension(R.dimen.dd_font_normal));
         textView.setGravity(Gravity.CENTER_VERTICAL);
 
         switchButton = new Switch(context);
diff --git a/debugdrawer-actions/src/main/res/layout/debug_drawer_module_actions.xml b/debugdrawer-actions/src/main/res/layout/dd_debug_drawer_module_actions.xml
similarity index 100%
rename from debugdrawer-actions/src/main/res/layout/debug_drawer_module_actions.xml
rename to debugdrawer-actions/src/main/res/layout/dd_debug_drawer_module_actions.xml
diff --git a/debugdrawer-actions/src/main/res/layout/debug_drawer_module_actions_spinner_item.xml b/debugdrawer-actions/src/main/res/layout/dd_debug_drawer_module_actions_spinner_item.xml
similarity index 100%
rename from debugdrawer-actions/src/main/res/layout/debug_drawer_module_actions_spinner_item.xml
rename to debugdrawer-actions/src/main/res/layout/dd_debug_drawer_module_actions_spinner_item.xml
diff --git a/debugdrawer-actions/src/main/res/values/colors.xml b/debugdrawer-actions/src/main/res/values/colors.xml
deleted file mode 100644
index a180061..0000000
--- a/debugdrawer-actions/src/main/res/values/colors.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="white">@android:color/white</color>
-</resources>
\ No newline at end of file
diff --git a/debugdrawer-actions/src/main/res/values/dimens.xml b/debugdrawer-actions/src/main/res/values/dimens.xml
index 6d84a8b..f07e1df 100644
--- a/debugdrawer-actions/src/main/res/values/dimens.xml
+++ b/debugdrawer-actions/src/main/res/values/dimens.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="spacing_big">16dp</dimen>
-
-    <dimen name="padding_small">4dp</dimen>
-
-    <dimen name="font_normal">16sp</dimen>
+    <dimen name="dd_spacing_big">16dp</dimen>
+    <dimen name="dd_padding_small">4dp</dimen>
+    <dimen name="dd_font_normal">16sp</dimen>
 </resources>
\ No newline at end of file
diff --git a/debugdrawer-base/src/main/res/drawable-hdpi/debug_drawer_header_bg.9.png b/debugdrawer-base/src/main/res/drawable-hdpi/dd_debug_drawer_header_bg.9.png
similarity index 100%
rename from debugdrawer-base/src/main/res/drawable-hdpi/debug_drawer_header_bg.9.png
rename to debugdrawer-base/src/main/res/drawable-hdpi/dd_debug_drawer_header_bg.9.png
diff --git a/debugdrawer-base/src/main/res/drawable-mdpi/debug_drawer_header_bg.9.png b/debugdrawer-base/src/main/res/drawable-mdpi/dd_debug_drawer_header_bg.9.png
similarity index 100%
rename from debugdrawer-base/src/main/res/drawable-mdpi/debug_drawer_header_bg.9.png
rename to debugdrawer-base/src/main/res/drawable-mdpi/dd_debug_drawer_header_bg.9.png
diff --git a/debugdrawer-base/src/main/res/drawable-xhdpi/debug_drawer_header_bg.9.png b/debugdrawer-base/src/main/res/drawable-xhdpi/dd_debug_drawer_header_bg.9.png
similarity index 100%
rename from debugdrawer-base/src/main/res/drawable-xhdpi/debug_drawer_header_bg.9.png
rename to debugdrawer-base/src/main/res/drawable-xhdpi/dd_debug_drawer_header_bg.9.png
diff --git a/debugdrawer-base/src/main/res/values/styles.xml b/debugdrawer-base/src/main/res/values/styles.xml
index 99f9f8b..f299020 100644
--- a/debugdrawer-base/src/main/res/values/styles.xml
+++ b/debugdrawer-base/src/main/res/values/styles.xml
@@ -11,7 +11,7 @@
         <item name="android:textSize">13sp</item>
         <item name="android:layout_marginTop">8dp</item>
         <item name="android:layout_marginBottom">2dp</item>
-        <item name="android:background">@drawable/debug_drawer_header_bg</item>
+        <item name="android:background">@drawable/dd_debug_drawer_header_bg</item>
     </style>
     <style name="Widget.DebugDrawer.Base.RowWidget" parent="None">
         <item name="android:minHeight">30dp</item>
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 5f6dbcc..769f07d 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
@@ -42,13 +42,13 @@ public BuildModule(Context context) {
 
     @NonNull @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @NonNull ViewGroup parent) {
-        View view = inflater.inflate(R.layout.debug_drawer_module_build, parent, false);
+        View view = inflater.inflate(R.layout.dd_debug_drawer_module_build, parent, false);
         view.setClickable(false);
         view.setEnabled(false);
 
-        codeLabel = (TextView) view.findViewById(R.id.debug_build_code);
-        nameLabel = (TextView) view.findViewById(R.id.debug_build_name);
-        packageLabel = (TextView) view.findViewById(R.id.debug_build_package);
+        codeLabel = (TextView) view.findViewById(R.id.dd_debug_build_code);
+        nameLabel = (TextView) view.findViewById(R.id.dd_debug_build_name);
+        packageLabel = (TextView) view.findViewById(R.id.dd_debug_build_package);
 
         refresh();
 
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 af0fdd4..5ac5681 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
@@ -81,16 +81,16 @@ private static String getDensityString(DisplayMetrics displayMetrics) {
 
     @NonNull @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @NonNull ViewGroup parent) {
-        View view = inflater.inflate(R.layout.debug_drawer_module_device, parent, false);
+        View view = inflater.inflate(R.layout.dd_debug_drawer_module_device, parent, false);
         view.setClickable(false);
         view.setEnabled(false);
 
-        deviceMakeLabel = (TextView) view.findViewById(R.id.debug_device_make);
-        deviceModelLabel = (TextView) view.findViewById(R.id.debug_device_model);
-        deviceResolutionLabel = (TextView) view.findViewById(R.id.debug_device_resolution);
-        deviceDensityLabel = (TextView) view.findViewById(R.id.debug_device_density);
-        deviceReleaseLabel = (TextView) view.findViewById(R.id.debug_device_release);
-        deviceApiLabel = (TextView) view.findViewById(R.id.debug_device_api);
+        deviceMakeLabel = (TextView) view.findViewById(R.id.dd_debug_device_make);
+        deviceModelLabel = (TextView) view.findViewById(R.id.dd_debug_device_model);
+        deviceResolutionLabel = (TextView) view.findViewById(R.id.dd_debug_device_resolution);
+        deviceDensityLabel = (TextView) view.findViewById(R.id.dd_debug_device_density);
+        deviceReleaseLabel = (TextView) view.findViewById(R.id.dd_debug_device_release);
+        deviceApiLabel = (TextView) view.findViewById(R.id.dd_debug_device_api);
 
         deviceModelLabel.setText(deviceModel);
         deviceMakeLabel.setText(deviceMake);
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 b9973fe..0f8ac02 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
@@ -44,12 +44,12 @@ public NetworkModule(Context context) {
 
     @NonNull @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @NonNull ViewGroup parent) {
-        View view = inflater.inflate(R.layout.debug_drawer_module_network, parent, false);
-        wifi = (Switch) view.findViewById(R.id.debug_network_wifi);
-        mobile = (Switch) view.findViewById(R.id.debug_network_mobile);
+        View view = inflater.inflate(R.layout.dd_debug_drawer_module_network, parent, false);
+        wifi = (Switch) view.findViewById(R.id.dd_debug_network_wifi);
+        mobile = (Switch) view.findViewById(R.id.dd_debug_network_mobile);
         // In JellyBean 4.2, mobile network settings are only accessible from system apps
         mobile.setEnabled(Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR1);
-        bluetooth = (Switch) view.findViewById(R.id.debug_network_bluetooth);
+        bluetooth = (Switch) view.findViewById(R.id.dd_debug_network_bluetooth);
 
         networkController = NetworkController.newInstance(context);
 
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 70e7728..74e0b82 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
@@ -54,22 +54,22 @@ public SettingsModule(Context context) {
 
     @NonNull @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @NonNull ViewGroup parent) {
-        View view = inflater.inflate(R.layout.debug_drawer_module_settings, parent, false);
+        View view = inflater.inflate(R.layout.dd_debug_drawer_module_settings, parent, false);
         view.setClickable(false);
         view.setEnabled(false);
 
-        developer = (ImageView) view.findViewById(R.id.debug_settings_developer);
-        developerTitle = view.findViewById(R.id.debug_settings_developer_title);
-        battery = (ImageView) view.findViewById(R.id.debug_settings_batery);
-        batteryTitle = view.findViewById(R.id.debug_settings_batery_title);
-        settings = (ImageView) view.findViewById(R.id.debug_settings_settings);
-        settingsTitle = view.findViewById(R.id.debug_settings_settings_title);
-        info = (ImageView) view.findViewById(R.id.debug_settings_info);
-        infoTitle = view.findViewById(R.id.debug_settings_info_title);
-        uninstall = (ImageView) view.findViewById(R.id.debug_settings_delete);
-        uninstallTitle = view.findViewById(R.id.debug_settings_delete_title);
-        location = (ImageView) view.findViewById(R.id.debug_location_settings);
-        locationTitle = view.findViewById(R.id.debug_location_settings_title);
+        developer = (ImageView) view.findViewById(R.id.dd_debug_settings_developer);
+        developerTitle = view.findViewById(R.id.dd_debug_settings_developer_title);
+        battery = (ImageView) view.findViewById(R.id.dd_debug_settings_batery);
+        batteryTitle = view.findViewById(R.id.dd_debug_settings_batery_title);
+        settings = (ImageView) view.findViewById(R.id.dd_debug_settings_settings);
+        settingsTitle = view.findViewById(R.id.dd_debug_settings_settings_title);
+        info = (ImageView) view.findViewById(R.id.dd_debug_settings_info);
+        infoTitle = view.findViewById(R.id.dd_debug_settings_info_title);
+        uninstall = (ImageView) view.findViewById(R.id.dd_debug_settings_delete);
+        uninstallTitle = view.findViewById(R.id.dd_debug_settings_delete_title);
+        location = (ImageView) view.findViewById(R.id.dd_debug_location_settings);
+        locationTitle = view.findViewById(R.id.dd_debug_location_settings_title);
 
         developer.setOnClickListener(this);
         developerTitle.setOnClickListener(this);
diff --git a/debugdrawer-commons/src/main/res/drawable-hdpi/ic_battery_unknown_white_24dp.png b/debugdrawer-commons/src/main/res/drawable-hdpi/dd_ic_battery_unknown_white_24dp.png
similarity index 100%
rename from debugdrawer-commons/src/main/res/drawable-hdpi/ic_battery_unknown_white_24dp.png
rename to debugdrawer-commons/src/main/res/drawable-hdpi/dd_ic_battery_unknown_white_24dp.png
diff --git a/debugdrawer-commons/src/main/res/drawable-hdpi/ic_delete_white_24dp.png b/debugdrawer-commons/src/main/res/drawable-hdpi/dd_ic_delete_white_24dp.png
similarity index 100%
rename from debugdrawer-commons/src/main/res/drawable-hdpi/ic_delete_white_24dp.png
rename to debugdrawer-commons/src/main/res/drawable-hdpi/dd_ic_delete_white_24dp.png
diff --git a/debugdrawer-commons/src/main/res/drawable-hdpi/ic_developer_mode_white_24dp.png b/debugdrawer-commons/src/main/res/drawable-hdpi/dd_ic_developer_mode_white_24dp.png
similarity index 100%
rename from debugdrawer-commons/src/main/res/drawable-hdpi/ic_developer_mode_white_24dp.png
rename to debugdrawer-commons/src/main/res/drawable-hdpi/dd_ic_developer_mode_white_24dp.png
diff --git a/debugdrawer-commons/src/main/res/drawable-hdpi/ic_info_outline_white_24dp.png b/debugdrawer-commons/src/main/res/drawable-hdpi/dd_ic_info_outline_white_24dp.png
similarity index 100%
rename from debugdrawer-commons/src/main/res/drawable-hdpi/ic_info_outline_white_24dp.png
rename to debugdrawer-commons/src/main/res/drawable-hdpi/dd_ic_info_outline_white_24dp.png
diff --git a/debugdrawer-commons/src/main/res/drawable-hdpi/ic_location_on_white_24dp.png b/debugdrawer-commons/src/main/res/drawable-hdpi/dd_ic_location_on_white_24dp.png
similarity index 100%
rename from debugdrawer-commons/src/main/res/drawable-hdpi/ic_location_on_white_24dp.png
rename to debugdrawer-commons/src/main/res/drawable-hdpi/dd_ic_location_on_white_24dp.png
diff --git a/debugdrawer-commons/src/main/res/drawable-hdpi/ic_settings_white_24dp.png b/debugdrawer-commons/src/main/res/drawable-hdpi/dd_ic_settings_white_24dp.png
similarity index 100%
rename from debugdrawer-commons/src/main/res/drawable-hdpi/ic_settings_white_24dp.png
rename to debugdrawer-commons/src/main/res/drawable-hdpi/dd_ic_settings_white_24dp.png
diff --git a/debugdrawer-commons/src/main/res/drawable-mdpi/ic_battery_unknown_white_24dp.png b/debugdrawer-commons/src/main/res/drawable-mdpi/dd_ic_battery_unknown_white_24dp.png
similarity index 100%
rename from debugdrawer-commons/src/main/res/drawable-mdpi/ic_battery_unknown_white_24dp.png
rename to debugdrawer-commons/src/main/res/drawable-mdpi/dd_ic_battery_unknown_white_24dp.png
diff --git a/debugdrawer-commons/src/main/res/drawable-mdpi/ic_delete_white_24dp.png b/debugdrawer-commons/src/main/res/drawable-mdpi/dd_ic_delete_white_24dp.png
similarity index 100%
rename from debugdrawer-commons/src/main/res/drawable-mdpi/ic_delete_white_24dp.png
rename to debugdrawer-commons/src/main/res/drawable-mdpi/dd_ic_delete_white_24dp.png
diff --git a/debugdrawer-commons/src/main/res/drawable-mdpi/ic_developer_mode_white_24dp.png b/debugdrawer-commons/src/main/res/drawable-mdpi/dd_ic_developer_mode_white_24dp.png
similarity index 100%
rename from debugdrawer-commons/src/main/res/drawable-mdpi/ic_developer_mode_white_24dp.png
rename to debugdrawer-commons/src/main/res/drawable-mdpi/dd_ic_developer_mode_white_24dp.png
diff --git a/debugdrawer-commons/src/main/res/drawable-mdpi/ic_info_outline_white_24dp.png b/debugdrawer-commons/src/main/res/drawable-mdpi/dd_ic_info_outline_white_24dp.png
similarity index 100%
rename from debugdrawer-commons/src/main/res/drawable-mdpi/ic_info_outline_white_24dp.png
rename to debugdrawer-commons/src/main/res/drawable-mdpi/dd_ic_info_outline_white_24dp.png
diff --git a/debugdrawer-commons/src/main/res/drawable-mdpi/ic_location_on_white_24dp.png b/debugdrawer-commons/src/main/res/drawable-mdpi/dd_ic_location_on_white_24dp.png
similarity index 100%
rename from debugdrawer-commons/src/main/res/drawable-mdpi/ic_location_on_white_24dp.png
rename to debugdrawer-commons/src/main/res/drawable-mdpi/dd_ic_location_on_white_24dp.png
diff --git a/debugdrawer-commons/src/main/res/drawable-mdpi/ic_settings_white_24dp.png b/debugdrawer-commons/src/main/res/drawable-mdpi/dd_ic_settings_white_24dp.png
similarity index 100%
rename from debugdrawer-commons/src/main/res/drawable-mdpi/ic_settings_white_24dp.png
rename to debugdrawer-commons/src/main/res/drawable-mdpi/dd_ic_settings_white_24dp.png
diff --git a/debugdrawer-commons/src/main/res/drawable-xhdpi/ic_battery_unknown_white_24dp.png b/debugdrawer-commons/src/main/res/drawable-xhdpi/dd_ic_battery_unknown_white_24dp.png
similarity index 100%
rename from debugdrawer-commons/src/main/res/drawable-xhdpi/ic_battery_unknown_white_24dp.png
rename to debugdrawer-commons/src/main/res/drawable-xhdpi/dd_ic_battery_unknown_white_24dp.png
diff --git a/debugdrawer-commons/src/main/res/drawable-xhdpi/ic_delete_white_24dp.png b/debugdrawer-commons/src/main/res/drawable-xhdpi/dd_ic_delete_white_24dp.png
similarity index 100%
rename from debugdrawer-commons/src/main/res/drawable-xhdpi/ic_delete_white_24dp.png
rename to debugdrawer-commons/src/main/res/drawable-xhdpi/dd_ic_delete_white_24dp.png
diff --git a/debugdrawer-commons/src/main/res/drawable-xhdpi/ic_developer_mode_white_24dp.png b/debugdrawer-commons/src/main/res/drawable-xhdpi/dd_ic_developer_mode_white_24dp.png
similarity index 100%
rename from debugdrawer-commons/src/main/res/drawable-xhdpi/ic_developer_mode_white_24dp.png
rename to debugdrawer-commons/src/main/res/drawable-xhdpi/dd_ic_developer_mode_white_24dp.png
diff --git a/debugdrawer-commons/src/main/res/drawable-xhdpi/ic_info_outline_white_24dp.png b/debugdrawer-commons/src/main/res/drawable-xhdpi/dd_ic_info_outline_white_24dp.png
similarity index 100%
rename from debugdrawer-commons/src/main/res/drawable-xhdpi/ic_info_outline_white_24dp.png
rename to debugdrawer-commons/src/main/res/drawable-xhdpi/dd_ic_info_outline_white_24dp.png
diff --git a/debugdrawer-commons/src/main/res/drawable-xhdpi/ic_location_on_white_24dp.png b/debugdrawer-commons/src/main/res/drawable-xhdpi/dd_ic_location_on_white_24dp.png
similarity index 100%
rename from debugdrawer-commons/src/main/res/drawable-xhdpi/ic_location_on_white_24dp.png
rename to debugdrawer-commons/src/main/res/drawable-xhdpi/dd_ic_location_on_white_24dp.png
diff --git a/debugdrawer-commons/src/main/res/drawable-xhdpi/ic_settings_white_24dp.png b/debugdrawer-commons/src/main/res/drawable-xhdpi/dd_ic_settings_white_24dp.png
similarity index 100%
rename from debugdrawer-commons/src/main/res/drawable-xhdpi/ic_settings_white_24dp.png
rename to debugdrawer-commons/src/main/res/drawable-xhdpi/dd_ic_settings_white_24dp.png
diff --git a/debugdrawer-commons/src/main/res/drawable-xxhdpi/ic_battery_unknown_white_24dp.png b/debugdrawer-commons/src/main/res/drawable-xxhdpi/dd_ic_battery_unknown_white_24dp.png
similarity index 100%
rename from debugdrawer-commons/src/main/res/drawable-xxhdpi/ic_battery_unknown_white_24dp.png
rename to debugdrawer-commons/src/main/res/drawable-xxhdpi/dd_ic_battery_unknown_white_24dp.png
diff --git a/debugdrawer-commons/src/main/res/drawable-xxhdpi/ic_delete_white_24dp.png b/debugdrawer-commons/src/main/res/drawable-xxhdpi/dd_ic_delete_white_24dp.png
similarity index 100%
rename from debugdrawer-commons/src/main/res/drawable-xxhdpi/ic_delete_white_24dp.png
rename to debugdrawer-commons/src/main/res/drawable-xxhdpi/dd_ic_delete_white_24dp.png
diff --git a/debugdrawer-commons/src/main/res/drawable-xxhdpi/ic_developer_mode_white_24dp.png b/debugdrawer-commons/src/main/res/drawable-xxhdpi/dd_ic_developer_mode_white_24dp.png
similarity index 100%
rename from debugdrawer-commons/src/main/res/drawable-xxhdpi/ic_developer_mode_white_24dp.png
rename to debugdrawer-commons/src/main/res/drawable-xxhdpi/dd_ic_developer_mode_white_24dp.png
diff --git a/debugdrawer-commons/src/main/res/drawable-xxhdpi/ic_info_outline_white_24dp.png b/debugdrawer-commons/src/main/res/drawable-xxhdpi/dd_ic_info_outline_white_24dp.png
similarity index 100%
rename from debugdrawer-commons/src/main/res/drawable-xxhdpi/ic_info_outline_white_24dp.png
rename to debugdrawer-commons/src/main/res/drawable-xxhdpi/dd_ic_info_outline_white_24dp.png
diff --git a/debugdrawer-commons/src/main/res/drawable-xxhdpi/ic_location_on_white_24dp.png b/debugdrawer-commons/src/main/res/drawable-xxhdpi/dd_ic_location_on_white_24dp.png
similarity index 100%
rename from debugdrawer-commons/src/main/res/drawable-xxhdpi/ic_location_on_white_24dp.png
rename to debugdrawer-commons/src/main/res/drawable-xxhdpi/dd_ic_location_on_white_24dp.png
diff --git a/debugdrawer-commons/src/main/res/drawable-xxhdpi/ic_settings_white_24dp.png b/debugdrawer-commons/src/main/res/drawable-xxhdpi/dd_ic_settings_white_24dp.png
similarity index 100%
rename from debugdrawer-commons/src/main/res/drawable-xxhdpi/ic_settings_white_24dp.png
rename to debugdrawer-commons/src/main/res/drawable-xxhdpi/dd_ic_settings_white_24dp.png
diff --git a/debugdrawer-commons/src/main/res/drawable-xxxhdpi/ic_battery_unknown_white_24dp.png b/debugdrawer-commons/src/main/res/drawable-xxxhdpi/dd_ic_battery_unknown_white_24dp.png
similarity index 100%
rename from debugdrawer-commons/src/main/res/drawable-xxxhdpi/ic_battery_unknown_white_24dp.png
rename to debugdrawer-commons/src/main/res/drawable-xxxhdpi/dd_ic_battery_unknown_white_24dp.png
diff --git a/debugdrawer-commons/src/main/res/drawable-xxxhdpi/ic_delete_white_24dp.png b/debugdrawer-commons/src/main/res/drawable-xxxhdpi/dd_ic_delete_white_24dp.png
similarity index 100%
rename from debugdrawer-commons/src/main/res/drawable-xxxhdpi/ic_delete_white_24dp.png
rename to debugdrawer-commons/src/main/res/drawable-xxxhdpi/dd_ic_delete_white_24dp.png
diff --git a/debugdrawer-commons/src/main/res/drawable-xxxhdpi/ic_developer_mode_white_24dp.png b/debugdrawer-commons/src/main/res/drawable-xxxhdpi/dd_ic_developer_mode_white_24dp.png
similarity index 100%
rename from debugdrawer-commons/src/main/res/drawable-xxxhdpi/ic_developer_mode_white_24dp.png
rename to debugdrawer-commons/src/main/res/drawable-xxxhdpi/dd_ic_developer_mode_white_24dp.png
diff --git a/debugdrawer-commons/src/main/res/drawable-xxxhdpi/ic_info_outline_white_24dp.png b/debugdrawer-commons/src/main/res/drawable-xxxhdpi/dd_ic_info_outline_white_24dp.png
similarity index 100%
rename from debugdrawer-commons/src/main/res/drawable-xxxhdpi/ic_info_outline_white_24dp.png
rename to debugdrawer-commons/src/main/res/drawable-xxxhdpi/dd_ic_info_outline_white_24dp.png
diff --git a/debugdrawer-commons/src/main/res/drawable-xxxhdpi/ic_location_on_white_24dp.png b/debugdrawer-commons/src/main/res/drawable-xxxhdpi/dd_ic_location_on_white_24dp.png
similarity index 100%
rename from debugdrawer-commons/src/main/res/drawable-xxxhdpi/ic_location_on_white_24dp.png
rename to debugdrawer-commons/src/main/res/drawable-xxxhdpi/dd_ic_location_on_white_24dp.png
diff --git a/debugdrawer-commons/src/main/res/drawable-xxxhdpi/ic_settings_white_24dp.png b/debugdrawer-commons/src/main/res/drawable-xxxhdpi/dd_ic_settings_white_24dp.png
similarity index 100%
rename from debugdrawer-commons/src/main/res/drawable-xxxhdpi/ic_settings_white_24dp.png
rename to debugdrawer-commons/src/main/res/drawable-xxxhdpi/dd_ic_settings_white_24dp.png
diff --git a/debugdrawer-commons/src/main/res/layout/debug_drawer_module_build.xml b/debugdrawer-commons/src/main/res/layout/dd_debug_drawer_module_build.xml
similarity index 92%
rename from debugdrawer-commons/src/main/res/layout/debug_drawer_module_build.xml
rename to debugdrawer-commons/src/main/res/layout/dd_debug_drawer_module_build.xml
index d7b6dc0..756aede 100644
--- a/debugdrawer-commons/src/main/res/layout/debug_drawer_module_build.xml
+++ b/debugdrawer-commons/src/main/res/layout/dd_debug_drawer_module_build.xml
@@ -21,7 +21,7 @@
         style="@style/Widget.DebugDrawer.Base.RowTitle"
         />
     <TextView
-        android:id="@+id/debug_build_code"
+        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"
@@ -33,7 +33,7 @@
         style="@style/Widget.DebugDrawer.Base.RowTitle"
         />
     <TextView
-        android:id="@+id/debug_build_name"
+        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"
@@ -45,7 +45,7 @@
         style="@style/Widget.DebugDrawer.Base.RowTitle"
         />
     <TextView
-        android:id="@+id/debug_build_package"
+        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"
diff --git a/debugdrawer-commons/src/main/res/layout/debug_drawer_module_device.xml b/debugdrawer-commons/src/main/res/layout/dd_debug_drawer_module_device.xml
similarity index 90%
rename from debugdrawer-commons/src/main/res/layout/debug_drawer_module_device.xml
rename to debugdrawer-commons/src/main/res/layout/dd_debug_drawer_module_device.xml
index 9a0b9ce..fa62993 100644
--- a/debugdrawer-commons/src/main/res/layout/debug_drawer_module_device.xml
+++ b/debugdrawer-commons/src/main/res/layout/dd_debug_drawer_module_device.xml
@@ -21,7 +21,7 @@
         style="@style/Widget.DebugDrawer.Base.RowTitle"
         />
     <TextView
-        android:id="@+id/debug_device_make"
+        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"
@@ -33,7 +33,7 @@
         style="@style/Widget.DebugDrawer.Base.RowTitle"
         />
     <TextView
-        android:id="@+id/debug_device_model"
+        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"
@@ -45,7 +45,7 @@
         style="@style/Widget.DebugDrawer.Base.RowTitle"
         />
     <TextView
-        android:id="@+id/debug_device_resolution"
+        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"
@@ -57,7 +57,7 @@
         style="@style/Widget.DebugDrawer.Base.RowTitle"
         />
     <TextView
-        android:id="@+id/debug_device_density"
+        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"
@@ -69,7 +69,7 @@
         style="@style/Widget.DebugDrawer.Base.RowTitle"
         />
     <TextView
-        android:id="@+id/debug_device_release"
+        android:id="@+id/dd_debug_device_release"
         android:layout_width="0dp"
         android:layout_gravity="start|center_vertical|fill_horizontal"
         style="@style/Widget.DebugDrawer.Base.RowValue"
@@ -82,7 +82,7 @@
         style="@style/Widget.DebugDrawer.Base.RowTitle"
         />
     <TextView
-        android:id="@+id/debug_device_api"
+        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"
diff --git a/debugdrawer-commons/src/main/res/layout/debug_drawer_module_network.xml b/debugdrawer-commons/src/main/res/layout/dd_debug_drawer_module_network.xml
similarity index 90%
rename from debugdrawer-commons/src/main/res/layout/debug_drawer_module_network.xml
rename to debugdrawer-commons/src/main/res/layout/dd_debug_drawer_module_network.xml
index 5e1ee7c..2e7605c 100644
--- a/debugdrawer-commons/src/main/res/layout/debug_drawer_module_network.xml
+++ b/debugdrawer-commons/src/main/res/layout/dd_debug_drawer_module_network.xml
@@ -21,7 +21,7 @@
         style="@style/Widget.DebugDrawer.Base.RowTitle"
         />
     <Switch
-        android:id="@+id/debug_network_wifi"
+        android:id="@+id/dd_debug_network_wifi"
         android:layout_gravity="start|center_vertical"
         style="@style/Widget.DebugDrawer.Base.RowWidget"
         />
@@ -32,7 +32,7 @@
         style="@style/Widget.DebugDrawer.Base.RowTitle"
         />
     <Switch
-        android:id="@+id/debug_network_mobile"
+        android:id="@+id/dd_debug_network_mobile"
         android:layout_gravity="start|center_vertical"
         style="@style/Widget.DebugDrawer.Base.RowWidget"
         />
@@ -43,7 +43,7 @@
         style="@style/Widget.DebugDrawer.Base.RowTitle"
         />
     <Switch
-        android:id="@+id/debug_network_bluetooth"
+        android:id="@+id/dd_debug_network_bluetooth"
         android:layout_gravity="start|center_vertical"
         style="@style/Widget.DebugDrawer.Base.RowWidget"
         />
diff --git a/debugdrawer-commons/src/main/res/layout/debug_drawer_module_settings.xml b/debugdrawer-commons/src/main/res/layout/dd_debug_drawer_module_settings.xml
similarity index 72%
rename from debugdrawer-commons/src/main/res/layout/debug_drawer_module_settings.xml
rename to debugdrawer-commons/src/main/res/layout/dd_debug_drawer_module_settings.xml
index c3b8fc3..41d92c3 100644
--- a/debugdrawer-commons/src/main/res/layout/debug_drawer_module_settings.xml
+++ b/debugdrawer-commons/src/main/res/layout/dd_debug_drawer_module_settings.xml
@@ -17,87 +17,87 @@
         />
 
     <TextView
-        android:id="@+id/debug_settings_developer_title"
+        android:id="@+id/dd_debug_settings_developer_title"
         android:layout_gravity="start|center_vertical"
         android:text="Developer"
         style="@style/Widget.DebugDrawer.Base.RowTitle"
         />
     <ImageView
-        android:id="@+id/debug_settings_developer"
+        android:id="@+id/dd_debug_settings_developer"
         android:layout_width="0dp"
         android:layout_gravity="start|center|fill_horizontal"
         style="@style/Widget.DebugDrawer.Base.RowValue"
-        android:src="@drawable/ic_developer_mode_white_24dp"
+        android:src="@drawable/dd_ic_developer_mode_white_24dp"
         />
 
     <TextView
-        android:id="@+id/debug_settings_batery_title"
+        android:id="@+id/dd_debug_settings_batery_title"
         android:layout_gravity="start|center_vertical"
         android:text="Battery"
         style="@style/Widget.DebugDrawer.Base.RowTitle"
         />
     <ImageView
-        android:id="@+id/debug_settings_batery"
+        android:id="@+id/dd_debug_settings_batery"
         android:layout_width="0dp"
         android:layout_gravity="start|center|fill_horizontal"
         style="@style/Widget.DebugDrawer.Base.RowValue"
-        android:src="@drawable/ic_battery_unknown_white_24dp"
+        android:src="@drawable/dd_ic_battery_unknown_white_24dp"
         />
 
     <TextView
-        android:id="@+id/debug_location_settings_title"
+        android:id="@+id/dd_debug_location_settings_title"
         android:layout_gravity="start|center_vertical"
         android:text="Location"
         style="@style/Widget.DebugDrawer.Base.RowTitle"
         />
     <ImageView
-        android:id="@+id/debug_location_settings"
+        android:id="@+id/dd_debug_location_settings"
         android:layout_width="0dp"
         android:layout_gravity="start|center|fill_horizontal"
         style="@style/Widget.DebugDrawer.Base.RowValue"
-        android:src="@drawable/ic_location_on_white_24dp"
+        android:src="@drawable/dd_ic_location_on_white_24dp"
         />
 
     <TextView
-        android:id="@+id/debug_settings_settings_title"
+        android:id="@+id/dd_debug_settings_settings_title"
         android:layout_gravity="start|center_vertical"
         android:text="Settings"
         style="@style/Widget.DebugDrawer.Base.RowTitle"
         />
     <ImageView
-        android:id="@+id/debug_settings_settings"
+        android:id="@+id/dd_debug_settings_settings"
         android:layout_width="0dp"
         android:layout_gravity="start|center|fill_horizontal"
         style="@style/Widget.DebugDrawer.Base.RowValue"
-        android:src="@drawable/ic_settings_white_24dp"
+        android:src="@drawable/dd_ic_settings_white_24dp"
         />
 
     <TextView
-        android:id="@+id/debug_settings_info_title"
+        android:id="@+id/dd_debug_settings_info_title"
         android:layout_gravity="start|center_vertical"
         android:text="App info"
         style="@style/Widget.DebugDrawer.Base.RowTitle"
         />
     <ImageView
-        android:id="@+id/debug_settings_info"
+        android:id="@+id/dd_debug_settings_info"
         android:layout_width="0dp"
         android:layout_gravity="start|center|fill_horizontal"
         style="@style/Widget.DebugDrawer.Base.RowValue"
-        android:src="@drawable/ic_info_outline_white_24dp"
+        android:src="@drawable/dd_ic_info_outline_white_24dp"
         />
 
     <TextView
-        android:id="@+id/debug_settings_delete_title"
+        android:id="@+id/dd_debug_settings_delete_title"
         android:layout_gravity="start|center_vertical"
         android:text="Uninstall"
         style="@style/Widget.DebugDrawer.Base.RowTitle"
         />
     <ImageView
-        android:id="@+id/debug_settings_delete"
+        android:id="@+id/dd_debug_settings_delete"
         android:layout_width="0dp"
         android:layout_gravity="start|center|fill_horizontal"
         style="@style/Widget.DebugDrawer.Base.RowValue"
-        android:src="@drawable/ic_delete_white_24dp"
+        android:src="@drawable/dd_ic_delete_white_24dp"
         />
 
 </GridLayout>
diff --git a/debugdrawer-fps/build.gradle b/debugdrawer-fps/build.gradle
index cd078cb..94950d7 100644
--- a/debugdrawer-fps/build.gradle
+++ b/debugdrawer-fps/build.gradle
@@ -20,8 +20,7 @@ android {
 
 dependencies {
     compile project(':debugdrawer-base')
-    compile 'com.android.support:support-annotations:23.1.1'
-    compile 'jp.wasabeef:takt:1.0.2'
+    provided 'jp.wasabeef:takt:1.0.2'
 }
 
 apply from: 'https://raw.github.com/chrisbanes/gradle-mvn-push/master/gradle-mvn-push.gradle'
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 6c0ee91..14ea4b6 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
@@ -12,19 +12,38 @@
 
 public class FpsModule implements DebugModule {
 
+    private static final boolean HAS_TAKT;
+
+    static {
+        boolean hasDependency;
+
+        try {
+            Class.forName("jp.wasabeef.takt.Takt");
+            hasDependency = true;
+        } catch (ClassNotFoundException e) {
+            hasDependency = false;
+        }
+
+        HAS_TAKT = hasDependency;
+    }
+
     private final Takt.Program program;
 
     private boolean isChecked;
 
     public FpsModule(@NonNull Takt.Program program) {
+        if (!HAS_TAKT) {
+            throw new RuntimeException("Takt dependency is not found");
+        }
+
         this.program = program;
     }
 
     @Override
     @NonNull
     public View onCreateView(@NonNull LayoutInflater inflater, @NonNull ViewGroup parent) {
-        View view = inflater.inflate(R.layout.debug_drawer_item_fps, parent, false);
-        Switch showSwitch = (Switch) view.findViewById(R.id.debug_fps);
+        View view = inflater.inflate(R.layout.dd_debug_drawer_item_fps, parent, false);
+        Switch showSwitch = (Switch) view.findViewById(R.id.dd_debug_fps);
         showSwitch.setOnCheckedChangeListener(
             new CompoundButton.OnCheckedChangeListener() {
                 @Override
diff --git a/debugdrawer-fps/src/main/res/layout/debug_drawer_item_fps.xml b/debugdrawer-fps/src/main/res/layout/dd_debug_drawer_item_fps.xml
similarity index 95%
rename from debugdrawer-fps/src/main/res/layout/debug_drawer_item_fps.xml
rename to debugdrawer-fps/src/main/res/layout/dd_debug_drawer_item_fps.xml
index ba4c5ef..db1791c 100644
--- a/debugdrawer-fps/src/main/res/layout/debug_drawer_item_fps.xml
+++ b/debugdrawer-fps/src/main/res/layout/dd_debug_drawer_item_fps.xml
@@ -21,7 +21,7 @@
         style="@style/Widget.DebugDrawer.Base.RowTitle"
         />
     <Switch
-        android:id="@+id/debug_fps"
+        android:id="@+id/dd_debug_fps"
         android:layout_gravity="start|center_vertical"
         style="@style/Widget.DebugDrawer.Base.RowWidget"
         />
diff --git a/debugdrawer-location/build.gradle b/debugdrawer-location/build.gradle
index 920b96d..e1f9ed9 100644
--- a/debugdrawer-location/build.gradle
+++ b/debugdrawer-location/build.gradle
@@ -20,8 +20,8 @@ android {
 
 dependencies {
     compile 'com.android.support:appcompat-v7:23.1.1'
-    compile 'com.google.android.gms:play-services-location:8.3.0'
     compile project(':debugdrawer-base')
+    provided 'com.google.android.gms:play-services-location:8.3.0'
 }
 
 apply from: 'https://raw.github.com/chrisbanes/gradle-mvn-push/master/gradle-mvn-push.gradle'
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 605b926..ed0a8c1 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
@@ -46,6 +46,21 @@
 
 public class LocationModule implements DebugModule {
 
+    private static final boolean HAS_LOCATION;
+
+    static {
+        boolean hasDependency;
+
+        try {
+            Class.forName("com.google.android.gms.location.LocationRequest");
+            hasDependency = true;
+        } catch (ClassNotFoundException e) {
+            hasDependency = false;
+        }
+
+        HAS_LOCATION = hasDependency;
+    }
+
     private transient final Context         context;
     private final           LocationRequest locationRequest;
 
@@ -77,29 +92,31 @@ public LocationModule(Context context) {
      * @param locationRequestsAvailable defines if location should be updated every 10 seconds
      */
     public LocationModule(Context context, boolean locationRequestsAvailable) {
-        this(context, locationRequestsAvailable ? new LocationRequest()
+        this(context, HAS_LOCATION && locationRequestsAvailable ? new LocationRequest()
             .setInterval(TimeUnit.SECONDS.toMillis(10))
             .setFastestInterval(TimeUnit.SECONDS.toMillis(5))
             .setPriority(LocationRequest.PRIORITY_HIGH_ACCURACY) : null);
     }
 
     public LocationModule(Context context, long interval, long fastestInterval) {
-        this(context, new LocationRequest()
+        this(context, HAS_LOCATION ? new LocationRequest()
             .setInterval(interval)
             .setFastestInterval(fastestInterval)
-            .setPriority(LocationRequest.PRIORITY_HIGH_ACCURACY));
+            .setPriority(LocationRequest.PRIORITY_HIGH_ACCURACY) : null);
     }
 
-    public LocationModule(Context context, LocationRequest locationRequest) {
-        this.locationRequest = locationRequest;
+    public LocationModule(@NonNull Context context, LocationRequest locationRequest) {
+        if (!HAS_LOCATION) {
+            throw new RuntimeException("Google Play location dependency is not found");
+        }
         this.context = context.getApplicationContext();
+        this.locationRequest = locationRequest;
     }
 
     @NonNull @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @NonNull ViewGroup parent) {
         checkPermission();
-        boolean available = GooglePlayServicesUtil
-            .isGooglePlayServicesAvailable(context) == ConnectionResult.SUCCESS;
+        boolean available = GooglePlayServicesUtil.isGooglePlayServicesAvailable(context) == ConnectionResult.SUCCESS;
         if (available && hasPermission) {
             locationController = LocationController.newInstance(context);
             if (locationRequest != null) {
@@ -108,13 +125,13 @@ public View onCreateView(@NonNull LayoutInflater inflater, @NonNull ViewGroup pa
         }
 
         if (locationController != null && hasPermission) {
-            View view = inflater.inflate(R.layout.debug_drawer_module_location, parent, false);
-            latitude = (TextView) view.findViewById(R.id.debug_location_latitude);
-            longitude = (TextView) view.findViewById(R.id.debug_location_longitude);
-            accuracy = (TextView) view.findViewById(R.id.debug_location_accuracy);
-            time = (TextView) view.findViewById(R.id.debug_location_time);
-            provider = (TextView) view.findViewById(R.id.debug_location_provider);
-            view.findViewById(R.id.debug_location_map).setOnClickListener(
+            View view = inflater.inflate(R.layout.dd_debug_drawer_module_location, parent, false);
+            latitude = (TextView) view.findViewById(R.id.dd_debug_location_latitude);
+            longitude = (TextView) view.findViewById(R.id.dd_debug_location_longitude);
+            accuracy = (TextView) view.findViewById(R.id.dd_debug_location_accuracy);
+            time = (TextView) view.findViewById(R.id.dd_debug_location_time);
+            provider = (TextView) view.findViewById(R.id.dd_debug_location_provider);
+            view.findViewById(R.id.dd_debug_location_map).setOnClickListener(
                 new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
@@ -134,12 +151,12 @@ public void onLocationChanged(Location location) {
         } else if (!hasPermission) {
             TextView errorText = new TextView(context);
             errorText.setTextAppearance(context, R.style.Widget_DebugDrawer_Base_Header);
-            errorText.setText(R.string.debug_drawer_location_no_permission);
+            errorText.setText(R.string.dd_debug_drawer_location_no_permission);
             return errorText;
         } else {
             TextView errorText = new TextView(context);
             errorText.setTextAppearance(context, R.style.Widget_DebugDrawer_Base_Header);
-            errorText.setText(R.string.debug_drawer_location_google_play_unavailable);
+            errorText.setText(R.string.dd_debug_drawer_location_google_play_unavailable);
             return errorText;
         }
     }
@@ -185,11 +202,11 @@ private void updateLocation(Location location) {
             time.setText(sdf.format(date));
             provider.setText(location.getProvider());
         } else {
-            latitude.setText(R.string.debug_drawer_location_empty);
-            longitude.setText(R.string.debug_drawer_location_empty);
-            accuracy.setText(R.string.debug_drawer_location_empty);
-            time.setText(R.string.debug_drawer_location_empty);
-            provider.setText(R.string.debug_drawer_location_no_provider);
+            latitude.setText(R.string.dd_debug_drawer_location_empty);
+            longitude.setText(R.string.dd_debug_drawer_location_empty);
+            accuracy.setText(R.string.dd_debug_drawer_location_empty);
+            time.setText(R.string.dd_debug_drawer_location_empty);
+            provider.setText(R.string.dd_debug_drawer_location_no_provider);
         }
     }
 
@@ -216,10 +233,10 @@ private void openMaps(Context context) {
                 intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                 context.startActivity(intent);
             } else {
-                Toast.makeText(context, R.string.debug_drawer_location_not_found, Toast.LENGTH_SHORT).show();
+                Toast.makeText(context, R.string.dd_debug_drawer_location_not_found, Toast.LENGTH_SHORT).show();
             }
         } catch (ActivityNotFoundException e) {
-            Toast.makeText(context, R.string.debug_drawer_location_map_not_found, Toast.LENGTH_SHORT).show();
+            Toast.makeText(context, R.string.dd_debug_drawer_location_map_not_found, Toast.LENGTH_SHORT).show();
         }
     }
 
diff --git a/debugdrawer-location/src/main/res/drawable-hdpi/ic_map_white_24dp.png b/debugdrawer-location/src/main/res/drawable-hdpi/dd_ic_map_white_24dp.png
similarity index 100%
rename from debugdrawer-location/src/main/res/drawable-hdpi/ic_map_white_24dp.png
rename to debugdrawer-location/src/main/res/drawable-hdpi/dd_ic_map_white_24dp.png
diff --git a/debugdrawer-location/src/main/res/drawable-mdpi/ic_map_white_24dp.png b/debugdrawer-location/src/main/res/drawable-mdpi/dd_ic_map_white_24dp.png
similarity index 100%
rename from debugdrawer-location/src/main/res/drawable-mdpi/ic_map_white_24dp.png
rename to debugdrawer-location/src/main/res/drawable-mdpi/dd_ic_map_white_24dp.png
diff --git a/debugdrawer-location/src/main/res/drawable-xhdpi/ic_map_white_24dp.png b/debugdrawer-location/src/main/res/drawable-xhdpi/dd_ic_map_white_24dp.png
similarity index 100%
rename from debugdrawer-location/src/main/res/drawable-xhdpi/ic_map_white_24dp.png
rename to debugdrawer-location/src/main/res/drawable-xhdpi/dd_ic_map_white_24dp.png
diff --git a/debugdrawer-location/src/main/res/drawable-xxhdpi/ic_map_white_24dp.png b/debugdrawer-location/src/main/res/drawable-xxhdpi/dd_ic_map_white_24dp.png
similarity index 100%
rename from debugdrawer-location/src/main/res/drawable-xxhdpi/ic_map_white_24dp.png
rename to debugdrawer-location/src/main/res/drawable-xxhdpi/dd_ic_map_white_24dp.png
diff --git a/debugdrawer-location/src/main/res/drawable-xxxhdpi/ic_map_white_24dp.png b/debugdrawer-location/src/main/res/drawable-xxxhdpi/dd_ic_map_white_24dp.png
similarity index 100%
rename from debugdrawer-location/src/main/res/drawable-xxxhdpi/ic_map_white_24dp.png
rename to debugdrawer-location/src/main/res/drawable-xxxhdpi/dd_ic_map_white_24dp.png
diff --git a/debugdrawer-location/src/main/res/layout/debug_drawer_module_location.xml b/debugdrawer-location/src/main/res/layout/dd_debug_drawer_module_location.xml
similarity index 88%
rename from debugdrawer-location/src/main/res/layout/debug_drawer_module_location.xml
rename to debugdrawer-location/src/main/res/layout/dd_debug_drawer_module_location.xml
index 1eef39f..5764c48 100644
--- a/debugdrawer-location/src/main/res/layout/debug_drawer_module_location.xml
+++ b/debugdrawer-location/src/main/res/layout/dd_debug_drawer_module_location.xml
@@ -21,7 +21,7 @@
         style="@style/Widget.DebugDrawer.Base.RowTitle"
         />
     <TextView
-        android:id="@+id/debug_location_latitude"
+        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"
@@ -33,7 +33,7 @@
         style="@style/Widget.DebugDrawer.Base.RowTitle"
         />
     <TextView
-        android:id="@+id/debug_location_longitude"
+        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"
@@ -45,7 +45,7 @@
         style="@style/Widget.DebugDrawer.Base.RowTitle"
         />
     <TextView
-        android:id="@+id/debug_location_accuracy"
+        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"
@@ -57,7 +57,7 @@
         style="@style/Widget.DebugDrawer.Base.RowTitle"
         />
     <TextView
-        android:id="@+id/debug_location_time"
+        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"
@@ -69,7 +69,7 @@
         style="@style/Widget.DebugDrawer.Base.RowTitle"
         />
     <TextView
-        android:id="@+id/debug_location_provider"
+        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"
@@ -81,11 +81,11 @@
         style="@style/Widget.DebugDrawer.Base.RowTitle"
         />
     <ImageView
-        android:id="@+id/debug_location_map"
+        android:id="@+id/dd_debug_location_map"
         android:layout_width="0dp"
         android:layout_gravity="start|center|fill_horizontal"
         style="@style/Widget.DebugDrawer.Base.RowValue"
-        android:src="@drawable/ic_map_white_24dp"
+        android:src="@drawable/dd_ic_map_white_24dp"
         />
 
 </GridLayout>
diff --git a/debugdrawer-location/src/main/res/values/strings.xml b/debugdrawer-location/src/main/res/values/strings.xml
index a8d7d4a..e42a636 100644
--- a/debugdrawer-location/src/main/res/values/strings.xml
+++ b/debugdrawer-location/src/main/res/values/strings.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="debug_drawer_location_google_play_unavailable">Google Play Service Unavailable</string>
-    <string name="debug_drawer_location_no_permission">Location permission is not granted</string>
-    <string name="debug_drawer_location_empty">-</string>
-    <string name="debug_drawer_location_no_provider">None</string>
-    <string name="debug_drawer_location_not_found">No location set</string>
-    <string name="debug_drawer_location_map_not_found">Could not find app that opens a map</string>
+    <string name="dd_debug_drawer_location_google_play_unavailable">Google Play Service Unavailable</string>
+    <string name="dd_debug_drawer_location_no_permission">Location permission is not granted</string>
+    <string name="dd_debug_drawer_location_empty">-</string>
+    <string name="dd_debug_drawer_location_no_provider">None</string>
+    <string name="dd_debug_drawer_location_not_found">No location set</string>
+    <string name="dd_debug_drawer_location_map_not_found">Could not find app that opens a map</string>
 </resources>
\ No newline at end of file
diff --git a/debugdrawer-log/src/main/res/values/colors.xml b/debugdrawer-log/src/main/res/values/colors.xml
deleted file mode 100644
index 85c9eec..0000000
--- a/debugdrawer-log/src/main/res/values/colors.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="debug_log_background">#ffeeeeee</color>
-    <color name="debug_log_accent_debug">#2196F3</color>
-    <color name="debug_log_accent_info">#8BC34A</color>
-    <color name="debug_log_accent_warn">#FFC107</color>
-    <color name="debug_log_accent_error">#F44336</color>
-    <color name="debug_log_accent_unknown">#9C27B0</color>
-    <color name="debug_log_level_text">#ffffffff</color>
-</resources>
\ No newline at end of file
diff --git a/debugdrawer-no-op/build.gradle b/debugdrawer-no-op/build.gradle
index 583ac73..0d91930 100644
--- a/debugdrawer-no-op/build.gradle
+++ b/debugdrawer-no-op/build.gradle
@@ -20,6 +20,7 @@ android {
 
 dependencies {
     compile project(':debugdrawer-base')
+    compile 'com.android.support:appcompat-v7:23.1.1'
 }
 
 apply from: 'https://raw.github.com/chrisbanes/gradle-mvn-push/master/gradle-mvn-push.gradle'
\ 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 d3373cf..863c1e6 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
@@ -20,6 +20,7 @@
 import android.graphics.drawable.Drawable;
 import android.support.annotation.DrawableRes;
 import android.support.annotation.IntegerRes;
+import android.support.v4.widget.DrawerLayout;
 import android.view.ViewGroup;
 
 import io.palaima.debugdrawer.base.DebugModule;
@@ -55,6 +56,15 @@ public boolean isDrawerOpen() {
         return false;
     }
 
+    /**
+     * Enable or disable interaction with all drawers.
+     *
+     * @return
+     */
+    public void setDrawerLockMode(int lockMode) {
+
+    }
+
     /**
      * Calls modules {@link DebugModule#onResume()} method
      */
@@ -170,6 +180,10 @@ public Builder backgroundDrawableRes(@DrawableRes int sliderBackgroundDrawableRe
             return this;
         }
 
+        public Builder setDrawerListener(DrawerLayout.DrawerListener onDrawerListener) {
+            return this;
+        }
+
         /**
          * Add a initial DrawerItem or a DrawerItem Array  for the Drawer
          */
diff --git a/debugdrawer-okhttp/build.gradle b/debugdrawer-okhttp/build.gradle
index f754217..e443312 100644
--- a/debugdrawer-okhttp/build.gradle
+++ b/debugdrawer-okhttp/build.gradle
@@ -26,9 +26,8 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:23.1.1'
-    compile 'com.squareup.okhttp:okhttp:2.5.0'
     compile project(':debugdrawer-base')
+    provided 'com.squareup.okhttp:okhttp:2.5.0'
 }
 
 apply from: 'https://raw.github.com/chrisbanes/gradle-mvn-push/master/gradle-mvn-push.gradle'
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 8dda5f8..b5fae0f 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
@@ -13,48 +13,66 @@
 
 public class OkHttpModule implements DebugModule {
 
-    private final OkHttpClient mClient;
+    private static final boolean HAS_OKHTTP;
 
-    private TextView mOkHttpCacheMaxSizeView;
+    static {
+        boolean hasDependency;
 
-    private TextView mOkHttpCacheWriteErrorView;
+        try {
+            Class.forName("com.squareup.okhttp.OkHttpClient");
+            hasDependency = true;
+        } catch (ClassNotFoundException e) {
+            hasDependency = false;
+        }
+
+        HAS_OKHTTP = hasDependency;
+    }
+
+    private final OkHttpClient client;
 
-    private TextView mOkHttpCacheRequestCountView;
+    private TextView okHttpCacheMaxSizeView;
 
-    private TextView mOkHttpCacheNetworkCountView;
+    private TextView okHttpCacheWriteErrorView;
 
-    private TextView mOkHttpCacheHitCountView;
+    private TextView okHttpCacheRequestCountView;
 
-    public OkHttpModule(OkHttpClient client) {
-        mClient = client;
+    private TextView okHttpCacheNetworkCountView;
+
+    private TextView okHttpCacheHitCountView;
+
+    public OkHttpModule(@NonNull OkHttpClient client) {
+        if (!HAS_OKHTTP) {
+            throw new RuntimeException("OkHttp dependency is not found");
+        }
+        this.client = client;
     }
 
     @NonNull @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @NonNull ViewGroup parent) {
-        View view = inflater.inflate(R.layout.debug_drawer_module_okhttp, parent, false);
+        View view = inflater.inflate(R.layout.dd_debug_drawer_module_okhttp, parent, false);
 
-        mOkHttpCacheMaxSizeView = (TextView) view.findViewById(R.id.debug_okhttp_cache_max_size);
-        mOkHttpCacheWriteErrorView = (TextView) view.findViewById(R.id.debug_okhttp_cache_write_error);
-        mOkHttpCacheRequestCountView = (TextView) view.findViewById(R.id.debug_okhttp_cache_request_count);
-        mOkHttpCacheNetworkCountView = (TextView) view.findViewById(R.id.debug_okhttp_cache_network_count);
-        mOkHttpCacheHitCountView = (TextView) view.findViewById(R.id.debug_okhttp_cache_hit_count);
+        okHttpCacheMaxSizeView = (TextView) view.findViewById(R.id.dd_debug_okhttp_cache_max_size);
+        okHttpCacheWriteErrorView = (TextView) view.findViewById(R.id.dd_debug_okhttp_cache_write_error);
+        okHttpCacheRequestCountView = (TextView) view.findViewById(R.id.dd_debug_okhttp_cache_request_count);
+        okHttpCacheNetworkCountView = (TextView) view.findViewById(R.id.dd_debug_okhttp_cache_network_count);
+        okHttpCacheHitCountView = (TextView) view.findViewById(R.id.dd_debug_okhttp_cache_hit_count);
 
-        Cache cache = mClient.getCache(); // Shares the cache with apiClient, so no need to check both.
-        mOkHttpCacheMaxSizeView.setText(getSizeString(cache.getMaxSize()));
+        Cache cache = client.getCache(); // Shares the cache with apiClient, so no need to check both.
+        okHttpCacheMaxSizeView.setText(getSizeString(cache.getMaxSize()));
 
         refresh();
         return view;
     }
 
     private void refresh() {
-        Cache cache = mClient.getCache(); // Shares the cache with apiClient, so no need to check both.
+        Cache cache = client.getCache(); // Shares the cache with apiClient, so no need to check both.
         int writeTotal = cache.getWriteSuccessCount() + cache.getWriteAbortCount();
         int percentage = (int) ((1f * cache.getWriteAbortCount() / writeTotal) * 100);
-        mOkHttpCacheWriteErrorView.setText(
+        okHttpCacheWriteErrorView.setText(
                 cache.getWriteAbortCount() + " / " + writeTotal + " (" + percentage + "%)");
-        mOkHttpCacheRequestCountView.setText(String.valueOf(cache.getRequestCount()));
-        mOkHttpCacheNetworkCountView.setText(String.valueOf(cache.getNetworkCount()));
-        mOkHttpCacheHitCountView.setText(String.valueOf(cache.getHitCount()));
+        okHttpCacheRequestCountView.setText(String.valueOf(cache.getRequestCount()));
+        okHttpCacheNetworkCountView.setText(String.valueOf(cache.getNetworkCount()));
+        okHttpCacheHitCountView.setText(String.valueOf(cache.getHitCount()));
     }
 
     @Override
diff --git a/debugdrawer-okhttp/src/main/res/layout/debug_drawer_module_okhttp.xml b/debugdrawer-okhttp/src/main/res/layout/dd_debug_drawer_module_okhttp.xml
similarity index 88%
rename from debugdrawer-okhttp/src/main/res/layout/debug_drawer_module_okhttp.xml
rename to debugdrawer-okhttp/src/main/res/layout/dd_debug_drawer_module_okhttp.xml
index 4920b9e..b7bed52 100644
--- a/debugdrawer-okhttp/src/main/res/layout/debug_drawer_module_okhttp.xml
+++ b/debugdrawer-okhttp/src/main/res/layout/dd_debug_drawer_module_okhttp.xml
@@ -21,7 +21,7 @@
         style="@style/Widget.DebugDrawer.Base.RowTitle"
         />
     <TextView
-        android:id="@+id/debug_okhttp_cache_max_size"
+        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"
@@ -33,7 +33,7 @@
         style="@style/Widget.DebugDrawer.Base.RowTitle"
         />
     <TextView
-        android:id="@+id/debug_okhttp_cache_write_error"
+        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"
@@ -45,7 +45,7 @@
         style="@style/Widget.DebugDrawer.Base.RowTitle"
         />
     <TextView
-        android:id="@+id/debug_okhttp_cache_request_count"
+        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"
@@ -57,7 +57,7 @@
         style="@style/Widget.DebugDrawer.Base.RowTitle"
         />
     <TextView
-        android:id="@+id/debug_okhttp_cache_network_count"
+        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"
@@ -69,7 +69,7 @@
         style="@style/Widget.DebugDrawer.Base.RowTitle"
         />
     <TextView
-        android:id="@+id/debug_okhttp_cache_hit_count"
+        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"
diff --git a/debugdrawer-picasso/build.gradle b/debugdrawer-picasso/build.gradle
index 41187d8..621bfe9 100644
--- a/debugdrawer-picasso/build.gradle
+++ b/debugdrawer-picasso/build.gradle
@@ -19,9 +19,8 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:23.1.1'
-    compile 'com.squareup.picasso:picasso:2.5.2'
     compile project(':debugdrawer-base')
+    provided 'com.squareup.picasso:picasso:2.5.2'
 }
 
 apply from: 'https://raw.github.com/chrisbanes/gradle-mvn-push/master/gradle-mvn-push.gradle'
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 2e4c1e5..c43119e 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
@@ -15,49 +15,67 @@
 
 public class PicassoModule implements DebugModule {
 
-    private final Picasso mPicasso;
+    private static final boolean HAS_PICASSO;
 
-    private Switch mIndicator;
+    static {
+        boolean hasDependency;
 
-    private TextView mCache;
-    private TextView mCacheHits;
-    private TextView mCacheMisses;
+        try {
+            Class.forName("com.squareup.picasso.Picasso");
+            hasDependency = true;
+        } catch (ClassNotFoundException e) {
+            hasDependency = false;
+        }
+
+        HAS_PICASSO = hasDependency;
+    }
+
+    private final Picasso picasso;
 
-    private TextView mDecoded;
-    private TextView mDecodedTotal;
-    private TextView mDecodedAverage;
+    private Switch indicatorView;
 
-    private TextView mTransformed;
-    private TextView mTransformedTotal;
-    private TextView mTransformedAverage;
+    private TextView cacheLabel;
+    private TextView cacheHitsLabel;
+    private TextView cacheMissesLabel;
 
-    public PicassoModule(Picasso picasso) {
-        mPicasso = picasso;
+    private TextView decodedLabel;
+    private TextView decodedTotalLabel;
+    private TextView decodedAverageLabel;
+
+    private TextView transformedLabel;
+    private TextView transformedTotalLabel;
+    private TextView transformedAverageLabel;
+
+    public PicassoModule(@NonNull Picasso picasso) {
+        if (!HAS_PICASSO) {
+            throw new RuntimeException("Picasso dependency is not found");
+        }
+        this.picasso = picasso;
     }
 
     @NonNull @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @NonNull ViewGroup parent) {
 
-        View view = inflater.inflate(R.layout.debug_drawer_item_picasso, parent, false);
-        mIndicator = (Switch) view.findViewById(R.id.debug_picasso_indicators);
-        mCache = (TextView) view.findViewById(R.id.debug_picasso_cache_size);
-        mCacheHits = (TextView) view.findViewById(R.id.debug_picasso_cache_hit);
-        mCacheMisses = (TextView) view.findViewById(R.id.debug_picasso_cache_miss);
-        mDecoded = (TextView) view.findViewById(R.id.debug_picasso_decoded);
-        mDecodedTotal = (TextView) view.findViewById(R.id.debug_picasso_decoded_total);
-        mDecodedAverage = (TextView) view.findViewById(R.id.debug_picasso_decoded_avg);
-        mTransformed = (TextView) view.findViewById(R.id.debug_picasso_transformed);
-        mTransformedTotal = (TextView) view.findViewById(R.id.debug_picasso_transformed_total);
-        mTransformedAverage = (TextView) view.findViewById(R.id.debug_picasso_transformed_avg);
-
-
-        mPicasso.setIndicatorsEnabled(mPicasso.areIndicatorsEnabled());
-        mIndicator.setChecked(mPicasso.areIndicatorsEnabled());
-        mIndicator.setOnCheckedChangeListener(
+        View view = inflater.inflate(R.layout.dd_debug_drawer_item_picasso, parent, false);
+        indicatorView = (Switch) view.findViewById(R.id.dd_debug_picasso_indicators);
+        cacheLabel = (TextView) view.findViewById(R.id.dd_debug_picasso_cache_size);
+        cacheHitsLabel = (TextView) view.findViewById(R.id.dd_debug_picasso_cache_hit);
+        cacheMissesLabel = (TextView) view.findViewById(R.id.dd_debug_picasso_cache_miss);
+        decodedLabel = (TextView) view.findViewById(R.id.dd_debug_picasso_decoded);
+        decodedTotalLabel = (TextView) view.findViewById(R.id.dd_debug_picasso_decoded_total);
+        decodedAverageLabel = (TextView) view.findViewById(R.id.dd_debug_picasso_decoded_avg);
+        transformedLabel = (TextView) view.findViewById(R.id.dd_debug_picasso_transformed);
+        transformedTotalLabel = (TextView) view.findViewById(R.id.dd_debug_picasso_transformed_total);
+        transformedAverageLabel = (TextView) view.findViewById(R.id.dd_debug_picasso_transformed_avg);
+
+
+        picasso.setIndicatorsEnabled(picasso.areIndicatorsEnabled());
+        indicatorView.setChecked(picasso.areIndicatorsEnabled());
+        indicatorView.setOnCheckedChangeListener(
                 new CompoundButton.OnCheckedChangeListener() {
                     @Override
                     public void onCheckedChanged(CompoundButton button, boolean isChecked) {
-                        mPicasso.setIndicatorsEnabled(isChecked);
+                        picasso.setIndicatorsEnabled(isChecked);
                     }
                 });
 
@@ -86,19 +104,19 @@ public void onPause() {
     }
 
     private void refresh() {
-        StatsSnapshot snapshot = mPicasso.getSnapshot();
+        StatsSnapshot snapshot = picasso.getSnapshot();
         String size = getSizeString(snapshot.size);
         String total = getSizeString(snapshot.maxSize);
         int percentage = (int) ((1f * snapshot.size / snapshot.maxSize) * 100);
-        mCache.setText(size + " / " + total + " (" + percentage + "%)");
-        mCacheHits.setText(String.valueOf(snapshot.cacheHits));
-        mCacheMisses.setText(String.valueOf(snapshot.cacheMisses));
-        mDecoded.setText(String.valueOf(snapshot.originalBitmapCount));
-        mDecodedTotal.setText(getSizeString(snapshot.totalOriginalBitmapSize));
-        mDecodedAverage.setText(getSizeString(snapshot.averageOriginalBitmapSize));
-        mTransformed.setText(String.valueOf(snapshot.transformedBitmapCount));
-        mTransformedTotal.setText(getSizeString(snapshot.totalTransformedBitmapSize));
-        mTransformedAverage.setText(getSizeString(snapshot.averageTransformedBitmapSize));
+        cacheLabel.setText(size + " / " + total + " (" + percentage + "%)");
+        cacheHitsLabel.setText(String.valueOf(snapshot.cacheHits));
+        cacheMissesLabel.setText(String.valueOf(snapshot.cacheMisses));
+        decodedLabel.setText(String.valueOf(snapshot.originalBitmapCount));
+        decodedTotalLabel.setText(getSizeString(snapshot.totalOriginalBitmapSize));
+        decodedAverageLabel.setText(getSizeString(snapshot.averageOriginalBitmapSize));
+        transformedLabel.setText(String.valueOf(snapshot.transformedBitmapCount));
+        transformedTotalLabel.setText(getSizeString(snapshot.totalTransformedBitmapSize));
+        transformedAverageLabel.setText(getSizeString(snapshot.averageTransformedBitmapSize));
     }
 
     @Override
diff --git a/debugdrawer-picasso/src/main/res/layout/debug_drawer_item_picasso.xml b/debugdrawer-picasso/src/main/res/layout/dd_debug_drawer_item_picasso.xml
similarity index 88%
rename from debugdrawer-picasso/src/main/res/layout/debug_drawer_item_picasso.xml
rename to debugdrawer-picasso/src/main/res/layout/dd_debug_drawer_item_picasso.xml
index da7d339..c613755 100644
--- a/debugdrawer-picasso/src/main/res/layout/debug_drawer_item_picasso.xml
+++ b/debugdrawer-picasso/src/main/res/layout/dd_debug_drawer_item_picasso.xml
@@ -21,7 +21,7 @@
         style="@style/Widget.DebugDrawer.Base.RowTitle"
         />
     <Switch
-        android:id="@+id/debug_picasso_indicators"
+        android:id="@+id/dd_debug_picasso_indicators"
         android:layout_gravity="start|center_vertical"
         style="@style/Widget.DebugDrawer.Base.RowWidget"
         />
@@ -32,7 +32,7 @@
         style="@style/Widget.DebugDrawer.Base.RowTitle"
         />
     <TextView
-        android:id="@+id/debug_picasso_cache_size"
+        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"
@@ -44,7 +44,7 @@
         style="@style/Widget.DebugDrawer.Base.RowTitle"
         />
     <TextView
-        android:id="@+id/debug_picasso_cache_hit"
+        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"
@@ -56,7 +56,7 @@
         style="@style/Widget.DebugDrawer.Base.RowTitle"
         />
     <TextView
-        android:id="@+id/debug_picasso_cache_miss"
+        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"
@@ -68,7 +68,7 @@
         style="@style/Widget.DebugDrawer.Base.RowTitle"
         />
     <TextView
-        android:id="@+id/debug_picasso_decoded"
+        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"
@@ -80,7 +80,7 @@
         style="@style/Widget.DebugDrawer.Base.RowTitle"
         />
     <TextView
-        android:id="@+id/debug_picasso_decoded_total"
+        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"
@@ -92,7 +92,7 @@
         style="@style/Widget.DebugDrawer.Base.RowTitle"
         />
     <TextView
-        android:id="@+id/debug_picasso_decoded_avg"
+        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"
@@ -104,7 +104,7 @@
         style="@style/Widget.DebugDrawer.Base.RowTitle"
         />
     <TextView
-        android:id="@+id/debug_picasso_transformed"
+        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"
@@ -116,7 +116,7 @@
         style="@style/Widget.DebugDrawer.Base.RowTitle"
         />
     <TextView
-        android:id="@+id/debug_picasso_transformed_total"
+        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"
@@ -128,7 +128,7 @@
         style="@style/Widget.DebugDrawer.Base.RowTitle"
         />
     <TextView
-        android:id="@+id/debug_picasso_transformed_avg"
+        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"
diff --git a/debugdrawer-scalpel/build.gradle b/debugdrawer-scalpel/build.gradle
index 83a2e2f..70c823b 100644
--- a/debugdrawer-scalpel/build.gradle
+++ b/debugdrawer-scalpel/build.gradle
@@ -19,9 +19,8 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:23.1.1'
-    compile 'com.jakewharton.scalpel:scalpel:1.1.2'
     compile project(':debugdrawer-base')
+    provided 'com.jakewharton.scalpel:scalpel:1.1.2'
 }
 
 apply from: 'https://raw.github.com/chrisbanes/gradle-mvn-push/master/gradle-mvn-push.gradle'
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 4673f58..310dbe8 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
@@ -17,47 +17,64 @@
 
 public class ScalpelModule implements DebugModule {
 
+    private static final boolean HAS_SCALPEL;
 
-    private final Context mContext;
-    private ViewGroup mRootView;
+    static {
+        boolean hasDependency;
 
-    public ScalpelModule(Activity activity) {
-        mContext = activity;
-        mRootView = (ViewGroup) activity.findViewById(android.R.id.content);
+        try {
+            Class.forName("com.jakewharton.scalpel.ScalpelFrameLayout");
+            hasDependency = true;
+        } catch (ClassNotFoundException e) {
+            hasDependency = false;
+        }
+
+        HAS_SCALPEL = hasDependency;
+    }
+
+    private final Context context;
+    private ViewGroup     rootView;
+
+    public ScalpelModule(@NonNull Activity activity) {
+        if (!HAS_SCALPEL) {
+            throw new RuntimeException("Scalpel dependency is not found");
+        }
+        context = activity;
+        rootView = (ViewGroup) activity.findViewById(android.R.id.content);
     }
 
     @NonNull @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @NonNull ViewGroup parent) {
 
-        ViewGroup contentView = (ViewGroup) mRootView.getChildAt(0);
+        ViewGroup contentView = (ViewGroup) rootView.getChildAt(0);
         ViewGroup scrimInsets = (ViewGroup) contentView.getChildAt(0);
         View contentRelativeView = scrimInsets.getChildAt(0);
 
         scrimInsets.removeView(contentRelativeView);
 
-        final ScalpelFrameLayout scalpelFrameLayout = new ScalpelFrameLayout(mContext);
+        final ScalpelFrameLayout scalpelFrameLayout = new ScalpelFrameLayout(context);
         scalpelFrameLayout.setLayoutParams(new LinearLayout.LayoutParams(
             LinearLayout.LayoutParams.MATCH_PARENT,
             LinearLayout.LayoutParams.MATCH_PARENT));
         scrimInsets.addView(scalpelFrameLayout);
         scalpelFrameLayout.addView(contentRelativeView);
 
-        View view = inflater.inflate(R.layout.debug_drawer_item_scalpel, parent, false);
-        Switch debugEnableScalpel = (Switch) view.findViewById(R.id.debug_enable_scalpel);
+        View view = inflater.inflate(R.layout.dd_debug_drawer_item_scalpel, parent, false);
+        Switch debugEnableScalpel = (Switch) view.findViewById(R.id.dd_debug_enable_scalpel);
         debugEnableScalpel.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
                 scalpelFrameLayout.setLayerInteractionEnabled(isChecked);
             }
         });
-        Switch debugDisableGraphics = (Switch) view.findViewById(R.id.debug_disable_graphics);
+        Switch debugDisableGraphics = (Switch) view.findViewById(R.id.dd_debug_disable_graphics);
         debugDisableGraphics.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
                 scalpelFrameLayout.setDrawViews(!isChecked);
             }
         });
-        Switch debugShowIds = (Switch) view.findViewById(R.id.debug_show_ids);
+        Switch debugShowIds = (Switch) view.findViewById(R.id.dd_debug_show_ids);
         debugShowIds.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
diff --git a/debugdrawer-scalpel/src/main/res/layout/debug_drawer_item_scalpel.xml b/debugdrawer-scalpel/src/main/res/layout/dd_debug_drawer_item_scalpel.xml
similarity index 91%
rename from debugdrawer-scalpel/src/main/res/layout/debug_drawer_item_scalpel.xml
rename to debugdrawer-scalpel/src/main/res/layout/dd_debug_drawer_item_scalpel.xml
index ea32278..8d636e7 100644
--- a/debugdrawer-scalpel/src/main/res/layout/debug_drawer_item_scalpel.xml
+++ b/debugdrawer-scalpel/src/main/res/layout/dd_debug_drawer_item_scalpel.xml
@@ -21,7 +21,7 @@
         style="@style/Widget.DebugDrawer.Base.RowTitle"
         />
     <Switch
-        android:id="@+id/debug_enable_scalpel"
+        android:id="@+id/dd_debug_enable_scalpel"
         android:layout_gravity="start|center_vertical"
         style="@style/Widget.DebugDrawer.Base.RowWidget"
         />
@@ -31,7 +31,7 @@
         style="@style/Widget.DebugDrawer.Base.RowTitle"
         />
     <Switch
-        android:id="@+id/debug_disable_graphics"
+        android:id="@+id/dd_debug_disable_graphics"
         android:layout_gravity="start|center_vertical"
         style="@style/Widget.DebugDrawer.Base.RowWidget"
         />
@@ -41,7 +41,7 @@
         style="@style/Widget.DebugDrawer.Base.RowTitle"
         />
     <Switch
-        android:id="@+id/debug_show_ids"
+        android:id="@+id/dd_debug_show_ids"
         android:layout_gravity="start|center_vertical"
         style="@style/Widget.DebugDrawer.Base.RowWidget"
         />
diff --git a/debugdrawer-log/.gitignore b/debugdrawer-timber/.gitignore
similarity index 100%
rename from debugdrawer-log/.gitignore
rename to debugdrawer-timber/.gitignore
diff --git a/debugdrawer-log/build.gradle b/debugdrawer-timber/build.gradle
similarity index 92%
rename from debugdrawer-log/build.gradle
rename to debugdrawer-timber/build.gradle
index 95ac828..9fc5a59 100644
--- a/debugdrawer-log/build.gradle
+++ b/debugdrawer-timber/build.gradle
@@ -19,9 +19,9 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:23.1.1'
-    compile 'com.jakewharton.timber:timber:4.1.0'
     compile project(':debugdrawer-base')
+    compile 'com.android.support:appcompat-v7:23.1.1'
+    provided 'com.jakewharton.timber:timber:4.1.0'
 }
 
 apply from: 'https://raw.github.com/chrisbanes/gradle-mvn-push/master/gradle-mvn-push.gradle'
diff --git a/debugdrawer-log/gradle.properties b/debugdrawer-timber/gradle.properties
similarity index 100%
rename from debugdrawer-log/gradle.properties
rename to debugdrawer-timber/gradle.properties
diff --git a/debugdrawer-log/src/main/AndroidManifest.xml b/debugdrawer-timber/src/main/AndroidManifest.xml
similarity index 74%
rename from debugdrawer-log/src/main/AndroidManifest.xml
rename to debugdrawer-timber/src/main/AndroidManifest.xml
index d59b472..0da8eb8 100644
--- a/debugdrawer-log/src/main/AndroidManifest.xml
+++ b/debugdrawer-timber/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.palaima.debugdrawer.log">
+    package="io.palaima.debugdrawer.timber">
 
     <application android:allowBackup="true"/>
 
diff --git a/debugdrawer-log/src/main/java/io/palaima/debugdrawer/log/LogModule.java b/debugdrawer-timber/src/main/java/io/palaima/debugdrawer/timber/TimberModule.java
similarity index 70%
rename from debugdrawer-log/src/main/java/io/palaima/debugdrawer/log/LogModule.java
rename to debugdrawer-timber/src/main/java/io/palaima/debugdrawer/timber/TimberModule.java
index d680486..ad2ae0c 100644
--- a/debugdrawer-log/src/main/java/io/palaima/debugdrawer/log/LogModule.java
+++ b/debugdrawer-timber/src/main/java/io/palaima/debugdrawer/timber/TimberModule.java
@@ -1,4 +1,4 @@
-package io.palaima.debugdrawer.log;
+package io.palaima.debugdrawer.timber;
 
 import android.support.annotation.NonNull;
 import android.view.LayoutInflater;
@@ -6,16 +6,16 @@
 import android.view.ViewGroup;
 
 import io.palaima.debugdrawer.base.DebugModule;
-import io.palaima.debugdrawer.log.ui.LogDialog;
+import io.palaima.debugdrawer.timber.ui.LogDialog;
 
-public class LogModule implements DebugModule {
+public class TimberModule implements DebugModule {
 
     @NonNull
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @NonNull final ViewGroup parent) {
-        View view = inflater.inflate(R.layout.debug_drawer_module_log, parent, false);
+        View view = inflater.inflate(R.layout.dd_debug_drawer_module_log, parent, false);
 
-        view.findViewById(R.id.button_log).setOnClickListener(new View.OnClickListener() {
+        view.findViewById(R.id.dd_button_log).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 new LogDialog(parent.getContext()).show();
diff --git a/debugdrawer-log/src/main/java/io/palaima/debugdrawer/log/data/LumberYard.java b/debugdrawer-timber/src/main/java/io/palaima/debugdrawer/timber/data/LumberYard.java
similarity index 76%
rename from debugdrawer-log/src/main/java/io/palaima/debugdrawer/log/data/LumberYard.java
rename to debugdrawer-timber/src/main/java/io/palaima/debugdrawer/timber/data/LumberYard.java
index c26d922..fb3cb1d 100644
--- a/debugdrawer-log/src/main/java/io/palaima/debugdrawer/log/data/LumberYard.java
+++ b/debugdrawer-timber/src/main/java/io/palaima/debugdrawer/timber/data/LumberYard.java
@@ -1,17 +1,40 @@
-package io.palaima.debugdrawer.log.data;
+package io.palaima.debugdrawer.timber.data;
 
 import android.content.Context;
-import io.palaima.debugdrawer.log.model.LogEntry;
-import timber.log.Timber;
+import android.support.annotation.NonNull;
 
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Deque;
+import java.util.List;
+import java.util.Locale;
+
+import io.palaima.debugdrawer.timber.model.LogEntry;
+import timber.log.Timber;
 
 public class LumberYard {
+
+    private static final boolean HAS_TIMBER;
+
+    static {
+        boolean hasDependency;
+
+        try {
+            Class.forName("timber.log.Timber");
+            hasDependency = true;
+        } catch (ClassNotFoundException e) {
+            hasDependency = false;
+        }
+
+        HAS_TIMBER = hasDependency;
+    }
+
     private static final int BUFFER_SIZE = 200;
 
     private static final DateFormat FILENAME_DATE = new SimpleDateFormat("yyyy-MM-dd hhmm a", Locale.US);
@@ -21,14 +44,17 @@ public class LumberYard {
 
     private static LumberYard sInstance;
 
-    private final Context mContext;
+    private final Context context;
 
     private final Deque<LogEntry> entries = new ArrayDeque<>(BUFFER_SIZE + 1);
 
-    private OnLogListener mOnLogListener;
+    private OnLogListener onLogListener;
 
-    public LumberYard(Context context) {
-        mContext = context.getApplicationContext();
+    public LumberYard(@NonNull Context context) {
+        if (!HAS_TIMBER) {
+            throw new RuntimeException("Timber dependency is not found");
+        }
+        this.context = context.getApplicationContext();
     }
 
     public static LumberYard getInstance(Context context) {
@@ -49,7 +75,7 @@ protected void log(int priority, String tag, String message, Throwable t) {
     }
 
     public void setOnLogListener(OnLogListener onLogListener) {
-        mOnLogListener = onLogListener;
+        this.onLogListener = onLogListener;
     }
 
     private synchronized void addEntry(LogEntry entry) {
@@ -120,12 +146,12 @@ public void cleanUp() {
     }
 
     private File getLogDir() {
-        return mContext.getExternalFilesDir(null);
+        return context.getExternalFilesDir(null);
     }
 
     private void onLog(LogEntry entry) {
-        if (mOnLogListener != null) {
-            mOnLogListener.onLog(entry);
+        if (onLogListener != null) {
+            onLogListener.onLog(entry);
         }
     }
 
diff --git a/debugdrawer-log/src/main/java/io/palaima/debugdrawer/log/model/LogEntry.java b/debugdrawer-timber/src/main/java/io/palaima/debugdrawer/timber/model/LogEntry.java
similarity index 60%
rename from debugdrawer-log/src/main/java/io/palaima/debugdrawer/log/model/LogEntry.java
rename to debugdrawer-timber/src/main/java/io/palaima/debugdrawer/timber/model/LogEntry.java
index fa9870f..5650b1e 100644
--- a/debugdrawer-log/src/main/java/io/palaima/debugdrawer/log/model/LogEntry.java
+++ b/debugdrawer-timber/src/main/java/io/palaima/debugdrawer/timber/model/LogEntry.java
@@ -1,42 +1,42 @@
-package io.palaima.debugdrawer.log.model;
+package io.palaima.debugdrawer.timber.model;
 
 import android.util.Log;
 
 public class LogEntry {
-    private final int mLevel;
-    private final String mTag;
-    private final String mMessage;
-    private final String mTimeStamp;
+    private final int    level;
+    private final String tag;
+    private final String message;
+    private final String timeStamp;
 
     public LogEntry(int level, String tag, String message, String timeStamp) {
-        mLevel = level;
-        mTag = tag;
-        mMessage = message;
-        mTimeStamp = timeStamp;
+        this.level = level;
+        this.tag = tag;
+        this.message = message;
+        this.timeStamp = timeStamp;
     }
 
     public int getLevel() {
-        return mLevel;
+        return level;
     }
 
     public String getTag() {
-        return mTag;
+        return tag;
     }
 
     public String getMessage() {
-        return mMessage;
+        return message;
     }
 
     public String getTimeStamp() {
-        return mTimeStamp;
+        return timeStamp;
     }
 
     public String prettyPrint() {
-        return String.format("%18s %18s %s %s", mTimeStamp, mTag, displayLevel(), mMessage);
+        return String.format("%18s %18s %s %s", timeStamp, tag, displayLevel(), message);
     }
 
     public String displayLevel() {
-        switch (mLevel) {
+        switch (level) {
             case Log.VERBOSE:
                 return "V";
             case Log.DEBUG:
diff --git a/debugdrawer-log/src/main/java/io/palaima/debugdrawer/log/ui/LogAdapter.java b/debugdrawer-timber/src/main/java/io/palaima/debugdrawer/timber/ui/LogAdapter.java
similarity index 82%
rename from debugdrawer-log/src/main/java/io/palaima/debugdrawer/log/ui/LogAdapter.java
rename to debugdrawer-timber/src/main/java/io/palaima/debugdrawer/timber/ui/LogAdapter.java
index d2c9ada..468d816 100644
--- a/debugdrawer-log/src/main/java/io/palaima/debugdrawer/log/ui/LogAdapter.java
+++ b/debugdrawer-timber/src/main/java/io/palaima/debugdrawer/timber/ui/LogAdapter.java
@@ -1,4 +1,4 @@
-package io.palaima.debugdrawer.log.ui;
+package io.palaima.debugdrawer.timber.ui;
 
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -6,8 +6,8 @@
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.TextView;
-import io.palaima.debugdrawer.log.R;
-import io.palaima.debugdrawer.log.model.LogEntry;
+import io.palaima.debugdrawer.timber.R;
+import io.palaima.debugdrawer.timber.model.LogEntry;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -36,7 +36,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
         ViewHolder viewHolder;
 
         if (convertView == null) {
-            convertView = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_log_entry, parent, false);
+            convertView = LayoutInflater.from(parent.getContext()).inflate(R.layout.dd_item_log_entry, parent, false);
             viewHolder = new ViewHolder(convertView);
 
             convertView.setTag(viewHolder);
@@ -69,9 +69,9 @@ static class ViewHolder {
 
         ViewHolder(View view) {
             mRootView = view;
-            mLogLevelTextView = (TextView) view.findViewById(R.id.text_log_level);
-            mLogTagTextView = (TextView) view.findViewById(R.id.text_log_tag);
-            mLogMessageTextView = (TextView) view.findViewById(R.id.text_log_message);
+            mLogLevelTextView = (TextView) view.findViewById(R.id.dd_text_log_level);
+            mLogTagTextView = (TextView) view.findViewById(R.id.dd_text_log_tag);
+            mLogMessageTextView = (TextView) view.findViewById(R.id.dd_text_log_message);
         }
 
         void fillData(LogEntry entry) {
@@ -86,16 +86,16 @@ public static int backgroundForLevel(int level) {
         switch (level) {
             case Log.VERBOSE:
             case Log.DEBUG:
-                return R.color.debug_log_accent_debug;
+                return R.color.dd_debug_log_accent_debug;
             case Log.INFO:
-                return R.color.debug_log_accent_info;
+                return R.color.dd_debug_log_accent_info;
             case Log.WARN:
-                return R.color.debug_log_accent_warn;
+                return R.color.dd_debug_log_accent_warn;
             case Log.ERROR:
             case Log.ASSERT:
-                return R.color.debug_log_accent_error;
+                return R.color.dd_debug_log_accent_error;
             default:
-                return R.color.debug_log_accent_unknown;
+                return R.color.dd_debug_log_accent_unknown;
         }
     }
 }
diff --git a/debugdrawer-log/src/main/java/io/palaima/debugdrawer/log/ui/LogDialog.java b/debugdrawer-timber/src/main/java/io/palaima/debugdrawer/timber/ui/LogDialog.java
similarity index 82%
rename from debugdrawer-log/src/main/java/io/palaima/debugdrawer/log/ui/LogDialog.java
rename to debugdrawer-timber/src/main/java/io/palaima/debugdrawer/timber/ui/LogDialog.java
index fd8c019..f7ce526 100644
--- a/debugdrawer-log/src/main/java/io/palaima/debugdrawer/log/ui/LogDialog.java
+++ b/debugdrawer-timber/src/main/java/io/palaima/debugdrawer/timber/ui/LogDialog.java
@@ -1,4 +1,4 @@
-package io.palaima.debugdrawer.log.ui;
+package io.palaima.debugdrawer.timber.ui;
 
 
 import android.content.Context;
@@ -10,26 +10,27 @@
 import android.support.v7.app.AlertDialog;
 import android.widget.ListView;
 import android.widget.Toast;
-import io.palaima.debugdrawer.log.data.LumberYard;
-import io.palaima.debugdrawer.log.model.LogEntry;
-import io.palaima.debugdrawer.log.util.Intents;
 
 import java.io.File;
 
+import io.palaima.debugdrawer.timber.data.LumberYard;
+import io.palaima.debugdrawer.timber.model.LogEntry;
+import io.palaima.debugdrawer.timber.util.Intents;
+
 public class LogDialog extends AlertDialog {
 
-    private final LogAdapter mAdapter;
+    private final LogAdapter adapter;
 
-    private final Handler mHandler = new Handler(Looper.getMainLooper());
+    private final Handler handler = new Handler(Looper.getMainLooper());
 
     public LogDialog(Context context) {
         super(context);
 
-        mAdapter = new LogAdapter();
+        adapter = new LogAdapter();
 
         ListView listView = new ListView(context);
         listView.setTranscriptMode(ListView.TRANSCRIPT_MODE_NORMAL);
-        listView.setAdapter(mAdapter);
+        listView.setAdapter(adapter);
 
         setTitle("Logs");
         setView(listView);
@@ -53,7 +54,7 @@ protected void onStart() {
 
         LumberYard lumberYard = LumberYard.getInstance(getContext());
 
-        mAdapter.setLogs(lumberYard.bufferedLogs());
+        adapter.setLogs(lumberYard.bufferedLogs());
 
         lumberYard.setOnLogListener(new LumberYard.OnLogListener() {
             @Override
@@ -65,10 +66,10 @@ public void onLog(LogEntry logEntry) {
     }
 
     private void addLogEntry(final LogEntry logEntry) {
-        mHandler.post(new Runnable() {
+        handler.post(new Runnable() {
             @Override
             public void run() {
-                mAdapter.addLog(logEntry);
+                adapter.addLog(logEntry);
             }
         });
     }
diff --git a/debugdrawer-log/src/main/java/io/palaima/debugdrawer/log/util/Intents.java b/debugdrawer-timber/src/main/java/io/palaima/debugdrawer/timber/util/Intents.java
similarity index 96%
rename from debugdrawer-log/src/main/java/io/palaima/debugdrawer/log/util/Intents.java
rename to debugdrawer-timber/src/main/java/io/palaima/debugdrawer/timber/util/Intents.java
index f2a2a1e..269d728 100644
--- a/debugdrawer-log/src/main/java/io/palaima/debugdrawer/log/util/Intents.java
+++ b/debugdrawer-timber/src/main/java/io/palaima/debugdrawer/timber/util/Intents.java
@@ -1,4 +1,4 @@
-package io.palaima.debugdrawer.log.util;
+package io.palaima.debugdrawer.timber.util;
 
 import android.content.Context;
 import android.content.Intent;
diff --git a/debugdrawer-log/src/main/res/layout/debug_drawer_module_log.xml b/debugdrawer-timber/src/main/res/layout/dd_debug_drawer_module_log.xml
similarity index 90%
rename from debugdrawer-log/src/main/res/layout/debug_drawer_module_log.xml
rename to debugdrawer-timber/src/main/res/layout/dd_debug_drawer_module_log.xml
index dd651c6..6898dd6 100644
--- a/debugdrawer-log/src/main/res/layout/debug_drawer_module_log.xml
+++ b/debugdrawer-timber/src/main/res/layout/dd_debug_drawer_module_log.xml
@@ -11,11 +11,11 @@
     <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="Logs"
+            android:text="Timber"
             style="@style/Widget.DebugDrawer.Base.Header"
             />
     <Button
-            android:id="@+id/button_log"
+            android:id="@+id/dd_button_log"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="Show logs"
diff --git a/debugdrawer-log/src/main/res/layout/item_log_entry.xml b/debugdrawer-timber/src/main/res/layout/dd_item_log_entry.xml
similarity index 73%
rename from debugdrawer-log/src/main/res/layout/item_log_entry.xml
rename to debugdrawer-timber/src/main/res/layout/dd_item_log_entry.xml
index 411e55e..7fdf36f 100644
--- a/debugdrawer-log/src/main/res/layout/item_log_entry.xml
+++ b/debugdrawer-timber/src/main/res/layout/dd_item_log_entry.xml
@@ -8,25 +8,25 @@
         >
 
     <TextView
-            android:id="@+id/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/debug_log_level_text"
+            android:textColor="@color/dd_debug_log_level_text"
             android:textSize="10sp"
             android:textStyle="bold"
             tools:text="Log level"
             />
 
     <TextView
-            android:id="@+id/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/text_log_level"
-            android:layout_toRightOf="@id/text_log_level"
-            android:background="@color/debug_log_background"
+            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"
@@ -37,13 +37,13 @@
             />
 
     <TextView
-            android:id="@+id/text_log_message"
+            android:id="@+id/dd_text_log_message"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@id/text_log_level"
+            android:layout_below="@id/dd_text_log_level"
             android:layout_marginLeft="2dp"
             android:layout_marginStart="2dp"
-            android:background="@color/debug_log_background"
+            android:background="@color/dd_debug_log_background"
             android:padding="4dp"
             android:textColor="?android:attr/textColorPrimary"
             android:textStyle="bold"
diff --git a/debugdrawer-timber/src/main/res/values/colors.xml b/debugdrawer-timber/src/main/res/values/colors.xml
new file mode 100644
index 0000000..19a9007
--- /dev/null
+++ b/debugdrawer-timber/src/main/res/values/colors.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="dd_debug_log_background">#ffeeeeee</color>
+    <color name="dd_debug_log_accent_debug">#2196F3</color>
+    <color name="dd_debug_log_accent_info">#8BC34A</color>
+    <color name="dd_debug_log_accent_warn">#FFC107</color>
+    <color name="dd_debug_log_accent_error">#F44336</color>
+    <color name="dd_debug_log_accent_unknown">#9C27B0</color>
+    <color name="dd_debug_log_level_text">#ffffffff</color>
+</resources>
\ 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 2d57124..31fd653 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
@@ -9,7 +9,7 @@
 
 public class DebugView extends LinearLayout {
 
-    private DebugModule[] mDrawerItems;
+    private DebugModule[] drawerItems;
 
     public DebugView(Context context) {
         super(context);
@@ -30,8 +30,8 @@ public DebugView(Context context, AttributeSet attrs, int defStyleAttr) {
      * Calls modules {@link DebugModule#onResume()} method
      */
     public void onResume() {
-        if (mDrawerItems != null) {
-            for (DebugModule drawerItem : mDrawerItems) {
+        if (drawerItems != null) {
+            for (DebugModule drawerItem : drawerItems) {
                 drawerItem.onResume();
             }
         }
@@ -41,8 +41,8 @@ public void onResume() {
      * Calls modules {@link DebugModule#onPause()} method
      */
     public void onPause() {
-        if (mDrawerItems != null) {
-            for (DebugModule drawerItem : mDrawerItems) {
+        if (drawerItems != null) {
+            for (DebugModule drawerItem : drawerItems) {
                 drawerItem.onPause();
             }
         }
@@ -52,8 +52,8 @@ public void onPause() {
      * Starts all modules and calls their {@link DebugModule#onStart()} method
      */
     public void onStart() {
-        if (mDrawerItems != null) {
-            for (DebugModule drawerItem : mDrawerItems) {
+        if (drawerItems != null) {
+            for (DebugModule drawerItem : drawerItems) {
                 drawerItem.onStart();
             }
         }
@@ -63,20 +63,20 @@ public void onStart() {
      * Removes all modules and calls their {@link DebugModule#onStop()} method
      */
     public void onStop() {
-        if (mDrawerItems != null) {
-            for (DebugModule drawerItem : mDrawerItems) {
+        if (drawerItems != null) {
+            for (DebugModule drawerItem : drawerItems) {
                 drawerItem.onStop();
             }
         }
     }
 
     public void modules(DebugModule... drawerItems) {
-        mDrawerItems = drawerItems;
-        if (this.mDrawerItems != null && this.mDrawerItems.length != 0) {
+        this.drawerItems = drawerItems;
+        if (this.drawerItems != null && this.drawerItems.length != 0) {
             LayoutInflater inflater = LayoutInflater.from(getContext());
             DebugModule drawerItem;
-            for (int i = 0; i < this.mDrawerItems.length; i++) {
-                drawerItem = this.mDrawerItems[i];
+            for (int i = 0; i < this.drawerItems.length; i++) {
+                drawerItem = this.drawerItems[i];
                 addView(drawerItem.onCreateView(inflater, this));
             }
         }
diff --git a/debugdrawer/src/main/java/io/palaima/debugdrawer/DebugDrawer.java b/debugdrawer/src/main/java/io/palaima/debugdrawer/DebugDrawer.java
index 0b781a2..e964136 100644
--- a/debugdrawer/src/main/java/io/palaima/debugdrawer/DebugDrawer.java
+++ b/debugdrawer/src/main/java/io/palaima/debugdrawer/DebugDrawer.java
@@ -36,29 +36,29 @@
 
 public class DebugDrawer {
 
-    private final DrawerLayout mDrawerLayout;
+    private final DrawerLayout drawerLayout;
 
-    private ScrollView mSliderLayout;
-    private DebugView mDebugView;
+    private ScrollView sliderLayout;
+    private DebugView  debugView;
 
-    private int mDrawerGravity;
+    private int drawerGravity;
 
     private DebugDrawer(Builder builder) {
-        mDrawerLayout = builder.mDrawerLayout;
-        mDrawerGravity = builder.mDrawerGravity;
-        mSliderLayout = builder.mSliderLayout;
-        mDebugView = builder.mDebugView;
+        drawerLayout = builder.drawerLayout;
+        drawerGravity = builder.drawerGravity;
+        sliderLayout = builder.sliderLayout;
+        debugView = builder.debugView;
     }
 
     /**
      * Open the drawer
      */
     public void openDrawer() {
-        if (mDrawerLayout != null && mSliderLayout != null) {
-            if (mDrawerGravity != 0) {
-                mDrawerLayout.openDrawer(mDrawerGravity);
+        if (drawerLayout != null && sliderLayout != null) {
+            if (drawerGravity != 0) {
+                drawerLayout.openDrawer(drawerGravity);
             } else {
-                mDrawerLayout.openDrawer(mSliderLayout);
+                drawerLayout.openDrawer(sliderLayout);
             }
         }
     }
@@ -67,11 +67,11 @@ public void openDrawer() {
      * close the drawer
      */
     public void closeDrawer() {
-        if (mDrawerLayout != null) {
-            if (mDrawerGravity != 0) {
-                mDrawerLayout.closeDrawer(mDrawerGravity);
+        if (drawerLayout != null) {
+            if (drawerGravity != 0) {
+                drawerLayout.closeDrawer(drawerGravity);
             } else {
-                mDrawerLayout.closeDrawer(mSliderLayout);
+                drawerLayout.closeDrawer(sliderLayout);
             }
         }
     }
@@ -83,85 +83,96 @@ public void closeDrawer() {
      * @return
      */
     public boolean isDrawerOpen() {
-        if (mDrawerLayout != null && mSliderLayout != null) {
-            return mDrawerLayout.isDrawerOpen(mSliderLayout);
+        if (drawerLayout != null && sliderLayout != null) {
+            return drawerLayout.isDrawerOpen(sliderLayout);
         }
         return false;
     }
 
+    /**
+     * Enable or disable interaction with all drawers.
+     *
+     * @return
+     */
+    public void setDrawerLockMode(int lockMode) {
+        if (drawerLayout != null && sliderLayout != null) {
+            drawerLayout.setDrawerLockMode(lockMode);
+        }
+    }
+
     /**
      * Calls modules {@link DebugModule#onResume()} method
      */
     public void onResume() {
-        mDebugView.onResume();
+        debugView.onResume();
     }
 
     /**
      * Calls modules {@link DebugModule#onPause()} method
      */
     public void onPause() {
-        mDebugView.onPause();
+        debugView.onPause();
     }
 
     /**
      * Starts all modules and calls their {@link DebugModule#onStart()} method
      */
     public void onStart() {
-        mDebugView.onStart();
+        debugView.onStart();
     }
 
     /**
      * Removes all modules and calls their {@link DebugModule#onStop()} method
      */
     public void onStop() {
-        mDebugView.onStop();
+        debugView.onStop();
     }
 
     public static class Builder {
 
-        private ViewGroup mRootView;
+        private ViewGroup rootView;
 
-        private Activity mActivity;
+        private Activity activity;
 
-        private DrawerLayout mDrawerLayout;
+        private DrawerLayout drawerLayout;
 
-        private ScrollView mSliderLayout;
+        private ScrollView sliderLayout;
 
-        private int mDrawerGravity = Gravity.END;
+        private int drawerGravity = Gravity.END;
 
         //the width of the drawer
-        private int mDrawerWidth = -1;
+        private int drawerWidth = -1;
 
-        private DebugModule[] mDrawerItems;
+        private DebugModule[] drawerItems;
 
-        private DrawerLayout.DrawerListener mOnDrawerListener;
+        private DrawerLayout.DrawerListener onDrawerListener;
 
-        private int mSliderBackgroundColor = 0;
+        private int sliderBackgroundColor = 0;
 
-        private int mSliderBackgroundColorRes = -1;
+        private int sliderBackgroundColorRes = -1;
 
-        private Drawable mSliderBackgroundDrawable;
+        private Drawable sliderBackgroundDrawable;
 
-        private int mSliderBackgroundDrawableRes = -1;
+        private int sliderBackgroundDrawableRes = -1;
 
-        private DebugView mDebugView;
+        private DebugView debugView;
 
-        private ScrimInsetsFrameLayout mDrawerContentRoot;
+        private ScrimInsetsFrameLayout drawerContentRoot;
 
         /**
          * Pass the activity you use the drawer in ;)
          * This is required if you want to set any values by resource
          */
         public Builder(Activity activity) {
-            this.mRootView = (ViewGroup) activity.findViewById(android.R.id.content);
-            this.mActivity = activity;
+            this.rootView = (ViewGroup) activity.findViewById(android.R.id.content);
+            this.activity = activity;
         }
 
         /**
          * Pass the rootView of the Drawer which will be used to inflate the DrawerLayout in
          */
         public Builder rootView(ViewGroup rootView) {
-            this.mRootView = rootView;
+            this.rootView = rootView;
             return this;
         }
 
@@ -170,18 +181,18 @@ public Builder rootView(ViewGroup rootView) {
          * DrawerLayout in
          */
         public Builder rootView(int rootViewRes) {
-            if (mActivity == null) {
+            if (activity == null) {
                 throw new RuntimeException("please pass an activity first to use this call");
             }
 
-            return rootView((ViewGroup) mActivity.findViewById(rootViewRes));
+            return rootView((ViewGroup) activity.findViewById(rootViewRes));
         }
 
         /**
          * Set the gravity for the drawer. START, LEFT | RIGHT, END
          */
         public Builder gravity(int gravity) {
-            this.mDrawerGravity = gravity;
+            this.drawerGravity = gravity;
             return this;
         }
 
@@ -189,7 +200,7 @@ public Builder gravity(int gravity) {
          * Set the Drawer width with a pixel value
          */
         public Builder widthPx(int drawerWidthPx) {
-            this.mDrawerWidth = drawerWidthPx;
+            this.drawerWidth = drawerWidthPx;
             return this;
         }
 
@@ -197,11 +208,11 @@ public Builder widthPx(int drawerWidthPx) {
          * Set the Drawer width with a dp value
          */
         public Builder widthDp(int drawerWidthDp) {
-            if (mActivity == null) {
+            if (activity == null) {
                 throw new RuntimeException("please pass an activity first to use this call");
             }
-            this.mDrawerWidth = (int) TypedValue.applyDimension(1, drawerWidthDp,
-                    mActivity.getResources().getDisplayMetrics());
+            this.drawerWidth = (int) TypedValue.applyDimension(1, drawerWidthDp,
+                    activity.getResources().getDisplayMetrics());
             return this;
         }
 
@@ -209,11 +220,11 @@ public Builder widthDp(int drawerWidthDp) {
          * Set the Drawer width with a dimension resource
          */
         public Builder widthRes(int drawerWidthRes) {
-            if (mActivity == null) {
+            if (activity == null) {
                 throw new RuntimeException("please pass an activity first to use this call");
             }
 
-            this.mDrawerWidth = mActivity.getResources().getDimensionPixelSize(drawerWidthRes);
+            this.drawerWidth = activity.getResources().getDimensionPixelSize(drawerWidthRes);
             return this;
         }
 
@@ -222,7 +233,7 @@ public Builder widthRes(int drawerWidthRes) {
          * This is the view containing the list.
          */
         public Builder backgroundColor(int sliderBackgroundColor) {
-            this.mSliderBackgroundColor = sliderBackgroundColor;
+            this.sliderBackgroundColor = sliderBackgroundColor;
             return this;
         }
 
@@ -231,7 +242,7 @@ public Builder backgroundColor(int sliderBackgroundColor) {
          * This is the view containing the list.
          */
         public Builder backgroundColorRes(@IntegerRes int sliderBackgroundColorRes) {
-            this.mSliderBackgroundColorRes = sliderBackgroundColorRes;
+            this.sliderBackgroundColorRes = sliderBackgroundColorRes;
             return this;
         }
 
@@ -241,7 +252,7 @@ public Builder backgroundColorRes(@IntegerRes int sliderBackgroundColorRes) {
          * This is the view containing the list.
          */
         public Builder backgroundDrawable(Drawable sliderBackgroundDrawable) {
-            this.mSliderBackgroundDrawable = sliderBackgroundDrawable;
+            this.sliderBackgroundDrawable = sliderBackgroundDrawable;
             return this;
         }
 
@@ -251,15 +262,20 @@ public Builder backgroundDrawable(Drawable sliderBackgroundDrawable) {
          * This is the view containing the list.
          */
         public Builder backgroundDrawableRes(@DrawableRes int sliderBackgroundDrawableRes) {
-            this.mSliderBackgroundDrawableRes = sliderBackgroundDrawableRes;
+            this.sliderBackgroundDrawableRes = sliderBackgroundDrawableRes;
+            return this;
+        }
+
+        public Builder setDrawerListener(DrawerLayout.DrawerListener onDrawerListener) {
+            this.onDrawerListener = onDrawerListener;
             return this;
         }
 
         /**
-         * Add a initial DrawerItem or a DrawerItem Array  for the Drawer
+         * Add a initial DrawerItem or a DrawerItem Array for the Drawer
          */
         public Builder modules(DebugModule... drawerItems) {
-            mDrawerItems = drawerItems;
+            this.drawerItems = drawerItems;
             return this;
         }
 
@@ -269,33 +285,33 @@ public Builder modules(DebugModule... drawerItems) {
          * @return
          */
         public DebugDrawer build() {
-            if (mActivity == null) {
+            if (activity == null) {
                 throw new RuntimeException("please pass an activity");
             }
 
-            if (mRootView == null || mRootView.getChildCount() == 0) {
+            if (rootView == null || rootView.getChildCount() == 0) {
                 throw new RuntimeException(
                         "You have to set your layout for this activity with setContentView() first.");
             }
 
 
-            mDrawerLayout = (DrawerLayout) mActivity.getLayoutInflater()
-                    .inflate(R.layout.debug_drawer, mRootView, false);
+            drawerLayout = (DrawerLayout) activity.getLayoutInflater()
+                    .inflate(R.layout.dd_debug_drawer, rootView, false);
 
             //get the content view
-            View contentView = mRootView.getChildAt(0);
+            View contentView = rootView.getChildAt(0);
             boolean alreadyInflated = contentView instanceof DrawerLayout;
 
             //get the drawer root
-            mDrawerContentRoot = (ScrimInsetsFrameLayout) mDrawerLayout.getChildAt(0);
+            drawerContentRoot = (ScrimInsetsFrameLayout) drawerLayout.getChildAt(0);
 
             //only add the new layout if it wasn't done before
             if (!alreadyInflated) {
                 // remove the contentView
-                mRootView.removeView(contentView);
+                rootView.removeView(contentView);
             } else {
                 //if it was already inflated we have to clean up again
-                mRootView.removeAllViews();
+                rootView.removeAllViews();
             }
 
             //create the layoutParams to use for the contentView
@@ -305,29 +321,29 @@ public DebugDrawer build() {
             );
 
             //add the contentView to the drawer content frameLayout
-            mDrawerContentRoot.addView(contentView, layoutParamsContentView);
+            drawerContentRoot.addView(contentView, layoutParamsContentView);
 
             //add the drawerLayout to the root
-            mRootView.addView(mDrawerLayout, new ViewGroup.LayoutParams(
+            rootView.addView(drawerLayout, new ViewGroup.LayoutParams(
                     ViewGroup.LayoutParams.MATCH_PARENT,
                     ViewGroup.LayoutParams.MATCH_PARENT
             ));
 
-            mDrawerLayout.setDrawerListener(new DrawerLayout.DrawerListener() {
+            drawerLayout.setDrawerListener(new DrawerLayout.DrawerListener() {
                 @Override
                 public void onDrawerSlide(View drawerView, float slideOffset) {
-                    if (mOnDrawerListener != null) {
-                        mOnDrawerListener.onDrawerSlide(drawerView, slideOffset);
+                    if (onDrawerListener != null) {
+                        onDrawerListener.onDrawerSlide(drawerView, slideOffset);
                     }
                 }
 
                 @Override
                 public void onDrawerOpened(View drawerView) {
-                    if (mOnDrawerListener != null) {
-                        mOnDrawerListener.onDrawerOpened(drawerView);
+                    if (onDrawerListener != null) {
+                        onDrawerListener.onDrawerOpened(drawerView);
                     }
-                    if (mDrawerItems != null && mDrawerItems.length != 0) {
-                        for (DebugModule drawerItem : mDrawerItems) {
+                    if (drawerItems != null && drawerItems.length != 0) {
+                        for (DebugModule drawerItem : drawerItems) {
                             drawerItem.onOpened();
                         }
                     }
@@ -335,11 +351,11 @@ public void onDrawerOpened(View drawerView) {
 
                 @Override
                 public void onDrawerClosed(View drawerView) {
-                    if (mOnDrawerListener != null) {
-                        mOnDrawerListener.onDrawerClosed(drawerView);
+                    if (onDrawerListener != null) {
+                        onDrawerListener.onDrawerClosed(drawerView);
                     }
-                    if (mDrawerItems != null && mDrawerItems.length != 0) {
-                        for (DebugModule drawerItem : mDrawerItems) {
+                    if (drawerItems != null && drawerItems.length != 0) {
+                        for (DebugModule drawerItem : drawerItems) {
                             drawerItem.onClosed();
                         }
                     }
@@ -351,40 +367,40 @@ public void onDrawerStateChanged(int newState) {
                 }
             });
 
-            mSliderLayout = (ScrollView) mDrawerLayout.findViewById(R.id.slider_layout);
-            mDebugView = (DebugView) mSliderLayout.findViewById(R.id.debug_view);
+            sliderLayout = (ScrollView) drawerLayout.findViewById(R.id.dd_slider_layout);
+            debugView = (DebugView) sliderLayout.findViewById(R.id.dd_debug_view);
 
             // get the layout params
-            DrawerLayout.LayoutParams params = (DrawerLayout.LayoutParams) mSliderLayout.getLayoutParams();
+            DrawerLayout.LayoutParams params = (DrawerLayout.LayoutParams) sliderLayout.getLayoutParams();
             if (params != null) {
                 // if we've set a custom gravity set it
-                if (mDrawerGravity != 0) {
-                    params.gravity = mDrawerGravity;
+                if (drawerGravity != 0) {
+                    params.gravity = drawerGravity;
                 }
                 // if this is a drawer from the right, change the margins :D
                 params = processDrawerLayoutParams(params);
                 // set the new layout params
-                mSliderLayout.setLayoutParams(params);
+                sliderLayout.setLayoutParams(params);
             }
 
             // set the background
-            if (mSliderBackgroundColor != 0) {
-                mSliderLayout.setBackgroundColor(mSliderBackgroundColor);
-            } else if (mSliderBackgroundColorRes != -1) {
-                mSliderLayout.setBackgroundColor(mActivity.getResources().getColor(mSliderBackgroundColorRes));
-            } else if (mSliderBackgroundDrawable != null) {
-                UIUtils.setBackground(mSliderLayout, mSliderBackgroundDrawable);
-            } else if (mSliderBackgroundDrawableRes != -1) {
-                UIUtils.setBackground(mSliderLayout, mSliderBackgroundColorRes);
+            if (sliderBackgroundColor != 0) {
+                sliderLayout.setBackgroundColor(sliderBackgroundColor);
+            } else if (sliderBackgroundColorRes != -1) {
+                sliderLayout.setBackgroundColor(activity.getResources().getColor(sliderBackgroundColorRes));
+            } else if (sliderBackgroundDrawable != null) {
+                UIUtils.setBackground(sliderLayout, sliderBackgroundDrawable);
+            } else if (sliderBackgroundDrawableRes != -1) {
+                UIUtils.setBackground(sliderLayout, sliderBackgroundColorRes);
             }
 
-            mDebugView.modules(mDrawerItems);
+            debugView.modules(drawerItems);
 
             //create the result object
             DebugDrawer result = new DebugDrawer(this);
 
             //forget the reference to the activity
-            mActivity = null;
+            activity = null;
 
 
             return result;
@@ -398,22 +414,22 @@ public void onDrawerStateChanged(int newState) {
          */
         private DrawerLayout.LayoutParams processDrawerLayoutParams(DrawerLayout.LayoutParams params) {
             if (params != null) {
-                if (mDrawerGravity != 0 && (mDrawerGravity == Gravity.RIGHT || mDrawerGravity == Gravity.END)) {
+                if (drawerGravity != 0 && (drawerGravity == Gravity.RIGHT || drawerGravity == Gravity.END)) {
                     params.rightMargin = 0;
                     if (Build.VERSION.SDK_INT >= 17) {
                         params.setMarginEnd(0);
                     }
 
-                    params.leftMargin = mActivity.getResources().getDimensionPixelSize(R.dimen.debug_drawer_margin);
+                    params.leftMargin = activity.getResources().getDimensionPixelSize(R.dimen.dd_debug_drawer_margin);
                     if (Build.VERSION.SDK_INT >= 17) {
-                        params.setMarginEnd(mActivity.getResources().getDimensionPixelSize(R.dimen.debug_drawer_margin));
+                        params.setMarginEnd(activity.getResources().getDimensionPixelSize(R.dimen.dd_debug_drawer_margin));
                     }
                 }
 
-                if (mDrawerWidth > -1) {
-                    params.width = mDrawerWidth;
+                if (drawerWidth > -1) {
+                    params.width = drawerWidth;
                 } else {
-                    params.width = UIUtils.getOptimalDrawerWidth(mActivity);
+                    params.width = UIUtils.getOptimalDrawerWidth(activity);
                 }
             }
 
diff --git a/debugdrawer/src/main/java/io/palaima/debugdrawer/util/UIUtils.java b/debugdrawer/src/main/java/io/palaima/debugdrawer/util/UIUtils.java
index 2c04efd..c71ab44 100644
--- a/debugdrawer/src/main/java/io/palaima/debugdrawer/util/UIUtils.java
+++ b/debugdrawer/src/main/java/io/palaima/debugdrawer/util/UIUtils.java
@@ -94,7 +94,7 @@ public static int getScreenWidth(Context context) {
     public static int getOptimalDrawerWidth(Context context) {
         int possibleMinDrawerWidth = UIUtils.getScreenWidth(context) - UIUtils.getActionBarHeight(context);
         int maxDrawerWidth = context.getResources().getDimensionPixelSize(
-                R.dimen.debug_drawer_width);
+                R.dimen.dd_debug_drawer_width);
         return Math.min(possibleMinDrawerWidth, maxDrawerWidth);
     }
 
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 f3a7e46..c2252b1 100644
--- a/debugdrawer/src/main/java/io/palaima/debugdrawer/view/ScrimInsetsFrameLayout.java
+++ b/debugdrawer/src/main/java/io/palaima/debugdrawer/view/ScrimInsetsFrameLayout.java
@@ -35,13 +35,13 @@
  * (status and navigation bars, overlay action bars).
  */
 public class ScrimInsetsFrameLayout extends FrameLayout {
-    private Drawable mInsetForeground;
+    private Drawable insetForeground;
 
-    private Rect mInsets;
-    private Rect mTempRect = new Rect();
-    private OnInsetsCallback mOnInsetsCallback;
+    private Rect insets;
+    private Rect tempRect = new Rect();
+    private OnInsetsCallback onInsetsCallback;
 
-    private boolean mEnabled = true;
+    private boolean enabled = true;
 
     public ScrimInsetsFrameLayout(Context context) {
         super(context);
@@ -60,11 +60,11 @@ public ScrimInsetsFrameLayout(Context context, AttributeSet attrs, int defStyle)
 
     private void init(Context context, AttributeSet attrs, int defStyle) {
         final TypedArray a = context.obtainStyledAttributes(attrs,
-                R.styleable.ScrimInsetsView, defStyle, 0);
+                R.styleable.DebugDrawerScrimInsetsView, defStyle, 0);
         if (a == null) {
             return;
         }
-        mInsetForeground = a.getDrawable(R.styleable.ScrimInsetsView_siv_insetForeground);
+        insetForeground = a.getDrawable(R.styleable.DebugDrawerScrimInsetsView_dd_siv_insetForeground);
         a.recycle();
 
         setWillNotDraw(true);
@@ -72,11 +72,11 @@ private void init(Context context, AttributeSet attrs, int defStyle) {
 
     @Override
     protected boolean fitSystemWindows(Rect insets) {
-        mInsets = new Rect(insets);
-        setWillNotDraw(mInsetForeground == null);
+        this.insets = new Rect(insets);
+        setWillNotDraw(insetForeground == null);
         ViewCompat.postInvalidateOnAnimation(this);
-        if (mOnInsetsCallback != null) {
-            mOnInsetsCallback.onInsetsChanged(insets);
+        if (onInsetsCallback != null) {
+            onInsetsCallback.onInsetsChanged(insets);
         }
         return true; // consume insets
     }
@@ -87,29 +87,29 @@ public void draw(Canvas canvas) {
 
         int width = getWidth();
         int height = getHeight();
-        if (mInsets != null && mInsetForeground != null) {
+        if (insets != null && insetForeground != null) {
             int sc = canvas.save();
             canvas.translate(getScrollX(), getScrollY());
 
             // Top
-            mTempRect.set(0, 0, width, mInsets.top);
-            mInsetForeground.setBounds(mTempRect);
-            mInsetForeground.draw(canvas);
+            tempRect.set(0, 0, width, insets.top);
+            insetForeground.setBounds(tempRect);
+            insetForeground.draw(canvas);
 
             // Bottom
-            mTempRect.set(0, height - mInsets.bottom, width, height);
-            mInsetForeground.setBounds(mTempRect);
-            mInsetForeground.draw(canvas);
+            tempRect.set(0, height - insets.bottom, width, height);
+            insetForeground.setBounds(tempRect);
+            insetForeground.draw(canvas);
 
             // Left
-            mTempRect.set(0, mInsets.top, mInsets.left, height - mInsets.bottom);
-            mInsetForeground.setBounds(mTempRect);
-            mInsetForeground.draw(canvas);
+            tempRect.set(0, insets.top, insets.left, height - insets.bottom);
+            insetForeground.setBounds(tempRect);
+            insetForeground.draw(canvas);
 
             // Right
-            mTempRect.set(width - mInsets.right, mInsets.top, width, height - mInsets.bottom);
-            mInsetForeground.setBounds(mTempRect);
-            mInsetForeground.draw(canvas);
+            tempRect.set(width - insets.right, insets.top, width, height - insets.bottom);
+            insetForeground.setBounds(tempRect);
+            insetForeground.draw(canvas);
 
             canvas.restoreToCount(sc);
         }
@@ -118,41 +118,41 @@ public void draw(Canvas canvas) {
     @Override
     protected void onAttachedToWindow() {
         super.onAttachedToWindow();
-        if (mInsetForeground != null) {
-            mInsetForeground.setCallback(this);
+        if (insetForeground != null) {
+            insetForeground.setCallback(this);
         }
     }
 
     @Override
     protected void onDetachedFromWindow() {
         super.onDetachedFromWindow();
-        if (mInsetForeground != null) {
-            mInsetForeground.setCallback(null);
+        if (insetForeground != null) {
+            insetForeground.setCallback(null);
         }
     }
 
 
     public boolean isEnabled() {
-        return mEnabled;
+        return enabled;
     }
 
     public void setEnabled(boolean enabled) {
-        this.mEnabled = enabled;
+        this.enabled = enabled;
         //setWillNotDraw(false);
         invalidate();
     }
 
 
     public Drawable getInsetForeground() {
-        return mInsetForeground;
+        return insetForeground;
     }
 
     public void setInsetForeground(Drawable mInsetForeground) {
-        this.mInsetForeground = mInsetForeground;
+        this.insetForeground = mInsetForeground;
     }
 
     public void setInsetForeground(int mInsetForegroundColor) {
-        this.mInsetForeground = new ColorDrawable(mInsetForegroundColor);
+        this.insetForeground = new ColorDrawable(mInsetForegroundColor);
     }
 
     /**
@@ -162,7 +162,7 @@ public void setInsetForeground(int mInsetForegroundColor) {
      * clipToPadding to false.
      */
     public void setOnInsetsCallback(OnInsetsCallback onInsetsCallback) {
-        mOnInsetsCallback = onInsetsCallback;
+        this.onInsetsCallback = onInsetsCallback;
     }
 
     public static interface OnInsetsCallback {
diff --git a/debugdrawer/src/main/res/drawable-hdpi/debug_drawer_header_bg.9.png b/debugdrawer/src/main/res/drawable-hdpi/debug_drawer_header_bg.9.png
deleted file mode 100644
index ed26c7201aec2eb62c5255745e1de2705a23fa69..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 149
zcmeAS@N?(olHy`uVBq!ia0vp^%s|Y}!3HGH?)<(INGT+H1o<*BRH-sBG&D0X{QM83
zUotS18Za=tN?>5Hn!&&zo<Ax6s2fnNfv1aONX4y`o{hW=3Ot8-o_{b1FPv<B!E5R(
v&54T_FnI(WoXXbVn>?-f{{3sSy?7W{9fVqo=3O@h>SgeB^>bP0l+XkKCnhZH

diff --git a/debugdrawer/src/main/res/drawable-hdpi/ic_battery_unknown_white_24dp.png b/debugdrawer/src/main/res/drawable-hdpi/ic_battery_unknown_white_24dp.png
deleted file mode 100644
index 2561b83bb96674d8254786da470aa11ef93848f1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 263
zcmV+i0r>ujP)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD0002aNkl<Zcmd_p
zF-kL07=__e{^%59&<%*o&{Se2(LGEtf}knHy;upsR^kFI-Gp60;h${cu}$M8<Q9hU
zJ^j;seEG9kEu}?i+XG$c{nXNAeW+KeUmq&xSE0GF#y=-sYM=*M+5M)_T*SzYTL&WM
zn?Yl-Zvnm>iqp-YMqC4!ik<qaaVMI3XkjESYoSj^V$Vk%)H@ct-l>DmMZ8i6y@@!Z
z7MhB9w9+uXpC_%>tR8AbbXx??bUM#Nx!O{x|La2&eSx_sK=m6i^bPm=0p64(2Y~<p
N002ovPDHLkV1l9-aMS<*

diff --git a/debugdrawer/src/main/res/drawable-hdpi/ic_delete_white_24dp.png b/debugdrawer/src/main/res/drawable-hdpi/ic_delete_white_24dp.png
deleted file mode 100644
index 4a9f769475ae98c44086a5498057c799cdc1eb2e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 161
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K8hNp{Th{y5d1PNA=hW|4Ewf~tb
z9PIip^F(s<V|%L`j#~m9sykVEozEz|Iu^#9=rPC9r6I7{jaSMv<H~}CsTb^<p8Zih
zx1gAX*UEX0quKxc4@{q3uGdcLuAlk;rv>-FKmRW+J}dc&f#K)gg?ihMxz_^iWbkzL
Kb6Mw<&;$SheLUU(

diff --git a/debugdrawer/src/main/res/drawable-hdpi/ic_developer_mode_white_24dp.png b/debugdrawer/src/main/res/drawable-hdpi/ic_developer_mode_white_24dp.png
deleted file mode 100644
index 282c96ebf9e9bf4f263f1d8275f457e0dedee3ed..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 300
zcmV+{0n`48P)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD0002<Nkl<ZcmciE
zKTgCj6om1l3dh=#KS|C*5r+pH2SF%cq1<DI>Z5QqLVB7ac&5rz^jk$<TkifX^vo0@
z>B>w`r|r=8Y&hBIb7;oRltTqKC5Hkx(G<E6NiRMWbV;KrbRq~&GPB;ve)sOrY+{jT
z19}E_r5O1E0w3aunpc^=>B4I>=7T}z181dj=usJ$vKXPhoPTztOzjolLLC4-IGgs9
zft*>BPZR3Q;4=c{lrY6uexWv*z6+B=O6^?B?1mj!j4dKvgsHvdUMCHXk+vsf<HO%b
yQ)tCaIqDKI9&@dEq0gX7O%x(&VN|9<2lW>yZCM+DYoBuf0000<MNUMnLSTaU!FyQ%

diff --git a/debugdrawer/src/main/res/drawable-hdpi/ic_info_outline_white_24dp.png b/debugdrawer/src/main/res/drawable-hdpi/ic_info_outline_white_24dp.png
deleted file mode 100644
index c7b1113cfef22bcec86ead7ae67be12326276cab..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 485
zcmV<B0UG{^P)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD00053Nkl<Zcmd_s
zK}sWE5C`CAx5mX^4Q|E5xDiCrg^NfKZz9sTP|yJlM(_gSUuBLV9>W+#V#f>U=9~3v
zy5k#|%`o-bRp5gvNWBjKU}@RX_o(#cOX<;tO*2A$>f4JBeW<IkLOT`eDov`9&i7F6
z3c!;itCqC1ELnAI0H80Q1m%7L26kjZC7G@v;7;BQT>-BBCp2Wv4dAi~>H>ZU-{cI?
zse=}k;97{XqEJ|gdQ)z}NLv+h2nN-m6riYd=e>Y~D%A1;c7!A-*ac%VF|-AqWJ2?3
zQF6~<BZm6mNRXZr(2Jo*uqsH;8hD7I5-bVHqXo<0J%+wOOGsXJFbh8aI24VR2t}hM
zEIWb{mwf?_e+xPV=P|Si2C`%*Hw5d|zsMMLlc7COnvS8M07G+0(1KU6FI1tn5x7Y@
zBlqCVyecH<0M1Manlq&b*ls$teZZ~xMrOf1pf~CG-vM6i$_3Tm_q+oBmrZ_-E&)6{
zv1Zw<S<BX(8UpCazJDM)Mkdvp?bIi`?Z8-FmG<lR7c^zYhMouSK7D%k;M}_Dw2z2{
b{5{Yw40E*CJGBE$00000NkvXXu0mjfPuAE+

diff --git a/debugdrawer/src/main/res/drawable-hdpi/ic_location_on_white_24dp.png b/debugdrawer/src/main/res/drawable-hdpi/ic_location_on_white_24dp.png
deleted file mode 100644
index 7c281c3f52a13ac89d34337cddbe47c904b8b19c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 371
zcmV-(0gV2MP)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD0003xNkl<ZNDbw|
z&nv@m9LMojJ4}=B^5gVvSN;d(x@5^2cSFQDbCnZkm-!#aN;ye#z=7o-P~2>4ao7(}
z6!qS+&*!^2?(vX%5dm3_d8A5}M~+xvK%FASCM8<EkRzt(NODFyrv!?Iey(u2B%vtC
z<8vTCCh+@UTt1x8ti~<ZRB3i3H%6#q6$tf(kOEeXLAfx4bx&MBh*QLxmJ6F$OEOr*
z+K>y|SZNugv9{#G8dg>YOIWLNVG8S>xPH*b1J<Nm7^Z<$Ak-I9oMJT?k{cH^t8&9F
zHJY8vhZUk&mJdlP_*4kw$38xLih_`LT;2#34ZFDPC@KP;Y3GSR(J@aubLtEQ{&J#D
zk)lki5-D|#Ia<xCI~-!=)h+rd^6QR-y2lu=d@D1m{~<$zIvM>RIo8$7J^{$2H}FUq
Rr&0g_002ovPDHLkV1h^dopb;I

diff --git a/debugdrawer/src/main/res/drawable-hdpi/ic_settings_white_24dp.png b/debugdrawer/src/main/res/drawable-hdpi/ic_settings_white_24dp.png
deleted file mode 100644
index 97ded33b5558a0efbd7812296a52325b4170076e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 460
zcmV;-0W<!IP)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD0004#Nkl<ZNDbw|
zKWkG_9LM2rn&J)EKcX)|QBxA7DuOQcHHaV%A}Aykq)R{@96NOoL5d)CX~99T;JZjm
zkfPwyrL&^snmhHL^kWIaIX(SdXz$wRkxnK)5?WPR>=4>kIV21T<&3Kg>clSSXlU}7
zNsTbZb7CDT8exhj%*e(#KY#)6xy}u?uzckjH(4PAzEPEh1-w0q?BPAtVVvU+$MuUd
zim^-?Z*&k19JY)eT?W{4>I$)hC8bSG`$%Zf$FisplYAzY(o}#3ePW-OP>dHiLTyE8
z5z6Vv#(lhunj$1*cz0EVJ9s@A*ucB3BFy1+WndHUmWuEIZ$P35H8Q+=vQXg_LqaV@
zm?z|TsTk9IA=am%09Qzftuv(%OIZ4}NVJa{^Q2f76=H@QTgC>PWY~7OsDpS*8Lt)N
zEWbIfpG@m8p5YBC;_%wCP~|(2vdmRx>0#;8WR`dQ1-2NIjXDoGtr048h%M+pCV0dp
z9SxU>omUy0Vn}G0s>)%9(6-8A4Tr<waO8Z@$@CACWH@6@>6%Lb0000<MNUMnLSTYt
CFvc?g

diff --git a/debugdrawer/src/main/res/drawable-mdpi/debug_drawer_header_bg.9.png b/debugdrawer/src/main/res/drawable-mdpi/debug_drawer_header_bg.9.png
deleted file mode 100644
index 74a6d95c1c90410ed614f2f1de47fea9530eaebb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 147
zcmeAS@N?(olHy`uVBq!ia0vp^%s|Y>!3H9qs_+0Qg=CK)Uj~LMRR)HJW(J0z|AF*N
z28L1t28LG&3=CE?7#PI!C&eFi1FF^Yba4!+xaD)^ASZ)@z>xzNi*jzPT9a8@!TwB?
r!$qiLk?LZu8Fp%GYUAEH3Y9ZVP!VcoF8bC8)XCuK>gTe~DWM4f$fqdr

diff --git a/debugdrawer/src/main/res/drawable-mdpi/ic_battery_unknown_white_24dp.png b/debugdrawer/src/main/res/drawable-mdpi/ic_battery_unknown_white_24dp.png
deleted file mode 100644
index 68c7dd1297b6a13571b77e5178a63432e4d55a54..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 189
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+i7Ec$)5R21CFWYh*GLUF^cx>-3
z4kcNeZg#;Vey-{Kk5)K;6qx7hc;fM;g-RYqF83|@pFH;t{j2J%+ORq!=1M*L`_qbQ
zxoI(s1=m;lzO}vNkiKZEu*@ZgwXD&b_Za7#DLxQc;Kgo!(C~TG^=b2t-eVM-Wpg1y
nRHj#Fg6+M($Juv<*uP_4awI{>vq!rF=pF`7S3j3^P6<r_{M<*#

diff --git a/debugdrawer/src/main/res/drawable-mdpi/ic_delete_white_24dp.png b/debugdrawer/src/main/res/drawable-mdpi/ic_delete_white_24dp.png
deleted file mode 100644
index e2f5f35558db0965392b15b5d8950261a8c92aab..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 115
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1D^C~45R22v2@-!E>_7CM{eR+v
zgY~R6ULP4=Whfl~yJVLAs>BdxJ>K;jR@FB~H~;@Xea5N(zxh7d@H058PdfN2J>(P6
O6b4UMKbLh*2~7YiM=IO^

diff --git a/debugdrawer/src/main/res/drawable-mdpi/ic_developer_mode_white_24dp.png b/debugdrawer/src/main/res/drawable-mdpi/ic_developer_mode_white_24dp.png
deleted file mode 100644
index 58fa35f94f095f7bdf27c75977e3b091b85e5392..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 217
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+i1)eUBAr*{AFU4{lau8|0$o=@+
zl8}JgyF}|(t#i4u_vX5VA2^#B+XGm*)%431p65Pl54iO3Qn0{#wpGu%E>#*#d+9L4
zkL8M}=l7nadHfd4=6l~cShM*ZI1u%|%kfBq@~qXSN|qV+&$E=199{X$^b1Zja%`RX
zo|D;SR?a?U9f6%MN?EtHu)b<qVjcME-|6^IiB1<DGxPIvS=pz*I~ZQe<aOc19T~f)
RJwUfIc)I$ztaD0e0szr?RpI~u

diff --git a/debugdrawer/src/main/res/drawable-mdpi/ic_info_outline_white_24dp.png b/debugdrawer/src/main/res/drawable-mdpi/ic_info_outline_white_24dp.png
deleted file mode 100644
index 353e064951788a29a64eef439284fd97e904f374..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 320
zcmV-G0l)r<P)<h;3K|Lk000e1NJLTq000;O000;W1ONa4N`Cco00038Nkl<ZcmciA
zL2BY)6u|K>T_h)IX%8`!xx#?O($dW=BI;pgAmAMoJ&FVmpak^_M&10n8om%>Hp0CB
z>RbH6BfRjxN9M~)<?5=k^eGdX1<i(z+H>&M4Ia$ETJBLQ^<<<3g$He5hLhidW{F&l
zq78;P`5|=ls>YxRGDkGO4)Ha@UK+s{*1}DYDDe@&3c1kJ7>fuhJobWT>>{`#?O7?v
zaJd6ic<Kc&*ha9#s25BzkKhxfr02J8@E$?tfcz$yppr%qyrK3gboA31zuL!Fpq5Ko
z$2W1t->&m6Kxyn*Ci7xy1O7D6yV<~Ad#ZoSbb%oCVPWUuVr%YQDrkfL?gZZ)JBOfu
SH&bZ<0000<MNUMnLSTaQqmeiO

diff --git a/debugdrawer/src/main/res/drawable-mdpi/ic_location_on_white_24dp.png b/debugdrawer/src/main/res/drawable-mdpi/ic_location_on_white_24dp.png
deleted file mode 100644
index 933eb5148faeabee4ef4ad40ee14a4d6b0c08f5b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 265
zcmV+k0rvihP)<h;3K|Lk000e1NJLTq000;O000;W1ONa4N`Cco0002cNkl<ZI1$Cc
zJx&5q7>3a|xCz35tu8=!pb74Pgf&2o3m{S{%yP8DLQ4s(f;*M`-GcClx!hzzz8R?W
z9O=)IFkptqGv$ez%F$*?-h!5j(Pqc79WB{NSYr96DhmUmIYUM`qP{H52<9Z(qmCn(
z$bu&r>VTABBMWPSkq$@+R<bZ5aMZQOB^kk&EW8joQc^OaXIZ$V$c=1#V);-J9<Vf3
zj5m(Gstnh7@;p~6$0K<?ox%n0L}MyCjRqON91Wd^d$w%3)A{Jq(LebCMxb)bn9vP?
P00000NkvXXu0mjfUde3^

diff --git a/debugdrawer/src/main/res/drawable-mdpi/ic_settings_white_24dp.png b/debugdrawer/src/main/res/drawable-mdpi/ic_settings_white_24dp.png
deleted file mode 100644
index 8909c3553600d7e8148df21f8ef8a8ca655ade7b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 326
zcmV-M0lEH(P)<h;3K|Lk000e1NJLTq000;O000;W1ONa4N`Cco0003ENkl<Zcmc)I
zJxT*n6i4wpNjg7T5pflw;3`BAEewjd0}BI!jR+#i6hc5O1TlrKKnq3CLL2Kaq>>O6
zS70QgNAU8v+(?*#6#o9*V@~mgC;x#Rf^DRK!rxsIH1Y+{1W$v50*~CV#54`Q2vW|N
zVwqbWh<vb#`o{Q^H7sD9ce1=PYQZ61lPWb5ynPGGbTLO15QHLi%m*tL2(z?NP4sh3
z64VPb{l9e=RYkDHs0uPDsO1ah>7Wvdgwql&RGT?0V4Y7)9ZgCcW4f$baDbN(6Vt-m
zvtW!jvUC`+K-kE98fAa!h<mPBV3Jc(f*vPKu*fxcL_<AqzYBu%d_jfucRjZ91b)K@
YKgwm|dz3YOX#fBK07*qoM6N<$f*NXnlK=n!

diff --git a/debugdrawer/src/main/res/drawable-xhdpi/debug_drawer_header_bg.9.png b/debugdrawer/src/main/res/drawable-xhdpi/debug_drawer_header_bg.9.png
deleted file mode 100644
index 81eaf88d08bca25fa6879fa21f052410f898f592..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 151
zcmeAS@N?(olHy`uVBq!ia0vp^%s|Y^!3HG1Z=QA&NGT+H1o<*BRH-sBG&D0X{QM83
zUotS18Za=tN?>5Hn!&&zo<Ax6s2fnNk*AAeNX4y|vm1FE3>c0aXfBMHv2w=AOd(E9
x*O;GAAB9dhIcZ(wfw#vKZQfrGTQmQZ1cSf>p-x8Wz!gB<44$rjF6*2Ung9)(FxdbA

diff --git a/debugdrawer/src/main/res/drawable-xhdpi/ic_battery_unknown_white_24dp.png b/debugdrawer/src/main/res/drawable-xhdpi/ic_battery_unknown_white_24dp.png
deleted file mode 100644
index 29c004287121ee043a68c1e13f323ce472de0938..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 311
zcmV-70m%M|P)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0002~Nkl<ZcmeI#
zF-pWx5XSK|nzgWXx7fmdSz*_`fS0iG3ijT>E<{jr0&ftWVDCx9R@5|!FU8+5ML;Do
zgf~Ux%~yRh#jgp3m&BRQ@N*Jf5_E~cK;}3+e@%;HJ|1vr#*GI&n(^ZS<@^^Q0yP<1
z(k`duG@*fKR^KjbUP1yjt6#ShKEnZ-v>62zAKZ~jzX=Cyr4@a@mA(rHq|&Osze_)`
z`%K@gfn2U<RzS&~Tpw+K2lnN54Hm!?Gr3%W1<-IT`wOrE?qz$(s}*o5+w=H87zWlX
zx@_!#g>07-1~x3a?1*2H9*97TX1w(Sq_liOc}k8HfI%Xl%@>4<x02H>8+!l%002ov
JPDHLkV1n|jfj|HN

diff --git a/debugdrawer/src/main/res/drawable-xhdpi/ic_delete_white_24dp.png b/debugdrawer/src/main/res/drawable-xhdpi/ic_delete_white_24dp.png
deleted file mode 100644
index 388b5b060af924493b057a63216fe7db75d4435a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 151
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0DI8PVHkch)?FC64-Fko=L=%?Iw
zv$u;+&1tXu2b~*Nwk`N$?;xkbvPe<$)w&zy|9BUkVz|Zlf5mTGpk6SDXXMMa|9v2f
u@g#fN+oPXnt4Z(ZaQ*pHX6dTRMUVWXo;a(XeY#{ZNU5i*pUXO@geCyi%r-Ls

diff --git a/debugdrawer/src/main/res/drawable-xhdpi/ic_developer_mode_white_24dp.png b/debugdrawer/src/main/res/drawable-xhdpi/ic_developer_mode_white_24dp.png
deleted file mode 100644
index c3850d7ab12aef67cdd2794d0026006900065e5d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 410
zcmV;L0cHM)P)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0004DNkl<ZSi|j@
z%SyvQ6hI640dZl4LLWQ-L2x7Z3$6BV-1rv-Ypni7MO?YEX_`c&4;O+9-TNq<E)2mk
zsl79kAe7v@ym!tCd0b{vDs5=6%^CMZM1+I{1O$v2;p5{oWQd1{$AAG3+;Pg54!+D7
z-FRY0F6dwq9l7AmNboKf7)Bw;L9i!GQ$b$+n;?kqZC?G$i`#T@QY#KFP1~v3W)AdJ
z1rFE1+)5GS0WOr98&~GE?C~krN%L2=l{sEf9A}QVQpoU%;v{ptkwOn|prD(~(if^C
zL4((1&H4Ivhs&gWyk0?r=cM0F|K?RiPpY8KOcSr8FvLq0)R-FLW5v~93aU&j@QR|Z
zRBtTtONuG=l(%PQiBG2fgxbnSY=@5(<(0KvLp;$>=G9;9i!}D8kuZz%LH2@ABmRe6
zaBC#!%LNB~YvaGz*BKT^JZj-X4)rHeMSMo9{Nrzx1>^y~3AKwdGXMYp07*qoM6N<$
Ef*IAhF#rGn

diff --git a/debugdrawer/src/main/res/drawable-xhdpi/ic_info_outline_white_24dp.png b/debugdrawer/src/main/res/drawable-xhdpi/ic_info_outline_white_24dp.png
deleted file mode 100644
index c571b2e3e776762bb90733f664f9d66e2c7f321c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 655
zcmV;A0&x9_P)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+00073Nkl<ZcmeI#
zK}*|y9LMqBza|xR7io#OO`pL~gi3uN!aR79mOg=v);<8;yeblKyDI(*y@=qm7#2^~
zDvDmzZlIz~F7F+_{GgD8B)<;Ez}M#*`i7(liTW43BEtf8nw-$Z$EV8)O;#zALB%cZ
zfN3_kA<8vhm@*GI?BEl}!zFJLSmq~5by-Rmu=!5E2X-k@AV-!gc?y)-<B@(YR?@&I
zM`&=$3L}IcSE7vuhm0l(*c_of^9c(TJ#4DH^d+qLz&EruA5aN4LkG=`3oN7kz(FP4
z1jlF}i4NfK3(-#T^OEQw?#V?5b`Z}ICr48uo27@?jtWfUBR->22NX4g$Gh;r2I3UU
zC}4AjSPu(ixIwI-i~@=>;)?%*fd#|^BPhd-@r0NU2I`1i6z1DU)PjK~qBKyTf@lN-
zCy2s8fg++640I7Wl<`GYIEcGoz(-^U3JfE>zYypm@_+0U8C+z9*+p(5%4UK1zv(Js
zZ=k^ch-xrUL_9KT9C*VMq7V#ZxJHzW0~N$&*uzfo7172v3S>D)tf9gJQ}~FgQJ{|K
z@irKcxri5LQU~VfAvRG_fjnJAhY3`QO>%*_Wjs2dSVB8ak(i`~wix%~<)U?%MJ3oA
z7ie3kxPZkW+6y&o6w%94r-ydHP_ma_Nr*Gbj78j570v<efRUuH?-nlo9@(ct5r<)h
zaVS!u!4v(q7)tj6vcx?}-Lh!%36*0Tk2pOx88`n3e9t;pM7d;5?po7;EW<oC8nn2>
p!{d$?4XPC6k!Bt+*lWOGzX87wDYF(rDzN|n002ovPDHLkV1ir08p{9x

diff --git a/debugdrawer/src/main/res/drawable-xhdpi/ic_location_on_white_24dp.png b/debugdrawer/src/main/res/drawable-xhdpi/ic_location_on_white_24dp.png
deleted file mode 100644
index 814ca8ddc442ae97d8a78693c841e33141f96759..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 456
zcmV;(0XP1MP)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0004xNkl<ZSPAXH
z%}P{p9LM4BQH)_wybD1$wJBRTj;#hQTSzw`;aboH@4!MA;kJk_K+N11zOBsM)M{!L
z>cU)w;|q9DKG7l=esh}n{m&d1g3lw}x)F$Y!~$C!5fk%^P39>QDGRhSL4_ngcut#I
zLoZ)x<O@AYj}cC3=7f^cVT2fun3BTL%PC$b^e7DN>=I&|Hick<P~-9=qC%)Lk-Qip
z$r1zP$WdUKBn5e~K)or|V1|0H<i!@&k_=X`Hsr+-)_@EKu@2=$jFpo?9_vD0oMYu=
zkjFZc7YA4c85FVh<i%&KWf`nueUcY1sW+n<%u;VoUX)0(!XSC_6j>!nNnYIHm{7mz
zkRR^}^-dvpNT_~=VTTYq3dJ)*j42cm-|_lJq;NdNYgFm5j>nqP;vSbYbIDz$$0E(V
zRx9XYpGNlRQfnBdkzuutxBSl=Wr0pAB>73FvcUslteE@C4ll5#l_erRQtN}VMmJ^t
yDbua&(MOfPs`Tl4@PsR_c&zKgB$K*z!~6l{P?%`6vDruf0000<MNUMnLSTaLi_1Fz

diff --git a/debugdrawer/src/main/res/drawable-xhdpi/ic_settings_white_24dp.png b/debugdrawer/src/main/res/drawable-xhdpi/ic_settings_white_24dp.png
deleted file mode 100644
index 5caedc8e57497ba9d32c3a1798f7394bd8ca7cff..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 562
zcmV-20?qx2P)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0005`Nkl<ZSPAXH
z&r6eW0LSsqNZUYNsmR>lpy;7r2s24Mgk2IZK^^iBh`<h8dMF~1I@F<4m+CMY+aD1L
zRv>hXFsLp$Hi^-XdC<l7?yw#9JkR(0IP`lFe7&S&M+6`7+mJgXF&UOCOk$FfD=c7g
zQ?9Ur$wRq90h7EAf>|o$nN|w}JYolv9aiaA3)AHJ#jL^+<vUHAEHc1#DunsTH3qrE
z7n;5iRT%Elu0|(nw9CkjBvlTpN>Vnw!iASI;~WiKXmD0RMEHO!?-j&6;kHOKLX;?@
zWGE7DPJUcs54$WqYC|tM?Dm*a5EB$J%My_f5ptOQ;JnO8utv}pJu;w=5<zbmk{w+<
z!7nWfmhgMb3GIgpUL&$#46m{}K^?ECEQsOtPo1ESS5y|n@T#d3RPY*=1><;?v>&>8
zhF?Y&EaUf-F4>V}ouDGUG9XTwpfwUQW0DePIU@2QLIJZP6AEI68g@DQ)P^_(>}pKO
zkE?_$vBVfLVvMs)nQ&JW#5%6Ll?i8P;6j~onehS_p38;=e>tq*49Si(?RM$JF6|Z-
zhLe1y=@Yj&%{<$LDKkeuxA{!dCfy3hWwyzZQVXYeKoyfe+#{|QF7lc(Gdc+Jm}KP&
zE12AuD=c7gL#~j*<bqsb7?VM{!v=oubnJ-u5AU{D#xB%{vj6}907*qoM6N<$g3Yb*
AWB>pF

diff --git a/debugdrawer/src/main/res/drawable-xxhdpi/ic_battery_unknown_white_24dp.png b/debugdrawer/src/main/res/drawable-xxhdpi/ic_battery_unknown_white_24dp.png
deleted file mode 100644
index 1249698f758fccf07097d83bc50268e0267944ba..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 428
zcmV;d0aN~oP)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0004VNkl<ZXx{DD
z%}N4c7zJPntc6h--GC{j&^APD)k26aLFoqC*3iE8-9g<zlrcz#(WX^IyTPuYWk2Ld
z5aDU_@n&g|AALX2IkS7`EFPG@cM=JPVLT3g2tfo9qzxz_L>HqZ#wixfah{=*CqpEJ
z&`sS8sH+W%t=_`F2|)xAM36C14-Hh2K@#JbM-69gK@pY*T1B*7fi935+MC3s3s5wi
zqeyMrpkDvQ!U_TeDECcDwm}V<rqPn=Ic8+uv<s@rwDo1)l=+5TP)07+_mtF`tX)u2
z&4K~YmO3-x%bVIeP*Js)`~Zd0-thr+jVaYl;od#y2Gi0#biaPwA}!55_xsQtW~I07
zenERhL0X$WY>d0oDdXKe=nZqKF^0&8o%%`|>wYZx2h!N*Uk5>2pjG75QSk$mlSZB(
zg0w&t<khjp$DSa92>M^3j<%;`26UngIyM7Zz@rxD;qz<v_oO=FkuWbfGR9#TMk^m&
WblqsYC1fxF0000<MNUMnLSTZ7)xPWi

diff --git a/debugdrawer/src/main/res/drawable-xxhdpi/ic_delete_white_24dp.png b/debugdrawer/src/main/res/drawable-xxhdpi/ic_delete_white_24dp.png
deleted file mode 100644
index 3fcdfdb55ebcba8d2fff8be03ea3518c137e3464..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 194
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhawIz3$+Lo)8Yy>yn>!GXc$q3uOx
zabB)cz0QC}ts}W53MuVBD%UsZPv&gw=#W`?Y0ciWQ2$4FyseJx>{`Oj#KIv^yWsd<
zb^!&41_nkD7m4wnX|34#N6cTv0=_gxaj*E+Smb+hj$`D9r9sI`%Q@~%Ssl3i>7S{h
gq0!eBm41aw^UfFNx4vv@4|EiRr>mdKI;Vst0RDqR&j0`b

diff --git a/debugdrawer/src/main/res/drawable-xxhdpi/ic_developer_mode_white_24dp.png b/debugdrawer/src/main/res/drawable-xxhdpi/ic_developer_mode_white_24dp.png
deleted file mode 100644
index e9419a3784fdd47b3548ace818229b5355554bb6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 461
zcmV;;0W$uHP)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0004$Nkl<ZcmeI&
zy-p%=6o&DshI_z-Z``Y!u$zsY3d)6P3z#h0%eUSDhFGYN<z$LK2lqW86Y_sf`xd_h
zNG3oMJHbfF7_ntvUli}Na38!eA|oZS&Kz*Y6tAXKRZyC9oJgq#%J8nIfkt>Y(Lh_g
z+i4*Gh@fB*6hVn_5fniYbj0%qUC=#f_lv*B01bf+9dmciD=^SOHV0r$d+)Bx3xGkA
zK|}IZw1T@f8vuhOgKjBy7hK*`Y@mZ|&NH>(w#Mv#Ng~IeByfzY8zcdAV{lwaGRGjz
ze@fCg{v-o5usHrConv2v#o;7@qmjx6>X+*!>wCSaXVm;T21q9voNM7@A0X8=jsOx#
zCdUBjB!hEBB7h9ioVw02Ksrh17$AdWJ;D|_I>;a`XasjnmgHTM=pc)<q`7z3Vx4nT
zkWE_AGIt#|21f+t_lNdDyDmKve~|yh?}s8Ng31rli=YS!7D4Z2`<eU!@5UPFH{N9$
zsKOJT{Ug=?uJh=~sd_vyR_HNdhtiHQ8R-c=!bZ?H9z!cUspvIm00000NkvXXu0mjf
DjIYNh

diff --git a/debugdrawer/src/main/res/drawable-xxhdpi/ic_info_outline_white_24dp.png b/debugdrawer/src/main/res/drawable-xxhdpi/ic_info_outline_white_24dp.png
deleted file mode 100644
index c41a5fcffa8c4dc3684252fbfd61623837e19d50..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 953
zcmV;q14jIbP)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj000AkNkl<ZcmeI&
z-%C_!9LMn|ta0niXvoYO-HLy}(l08pXtxHu3D%4Lijq@=;-3(-f(i=Dn!|47)=e@J
zLBUj#$P)VxEMs1!HH<@d&6%P1diUkwcz(<|&jVh}>+=u1!Si^=c~o6pU56D8MW!jS
z$u@O7JnC$-Nr`E0Z~~QViq1F4UDojk)8rj4KiUtv${KCrYEfp?UeGn(lf*h#%m<z3
zZ_;?oDU(6B_)1z0#?1uvvdF=9dBOxmh8Q5TzX66QGQkR;IoKSTv_XAT@T)V&IaJ8b
zGtVA=ugIneD)29$`-F>wiZO?K>;SqC6p{w@`EooS#EOw+c}UBbluHuSO9kD3{Dexd
zGgQ&NCewM)0=iXlsD$fh4c%;~LATKTP7f-@j<SUA*G_^?^A$Zu8JM2bU@(5r3LsYL
zF%r~684!QQ4Z5a3%8}0wBJx?P0%9~?(0ha@Co4se>@01>+c-g20r3E3BuF*`h>_@^
zHN+<z<3Txg5vx%_gR~JY%2<%>KB7e-Jm@Z>j$<V#%O2uRc+fgx4rOTzh&N$D4j$s1
zwV;cLZyXN}Dk64K)^>y%;(Bn<G~x-$;+`U=f`dwk39CUa;!$wWCZcFHXbiCt9JGxX
zLdgsrd)Y8zD>$f*7_b_YN7RCYJVeH7P%ol+c!LiAkL*xA)X9%M!t}A%e=*t&auG}M
zUL7k|gPtKKgM)4$K3fdZU#`Cd2c5t}oVOJe{qaNg4l!>nXc19Cg$22YJsc}RIU0!D
zQ6KVKh<jFoCJ`R_@E}DQu|w8)P#<3q&rwl9qkwp5JZKgHmx6<2>xdR-j0Rnxtv}Fl
zg03K-O24t7lYB&c=W=+E>@fn$hQ5wD$_oT6qv8ggqJe-vjQr`djDR|Y=pflR=t-%+
z(kr36+3A;_^XSU-C(b#^3v@H6PJ=SMLRaN%qMQqSME8<o@q=VJKA>wcL$0HkK4xj7
z`v)iS)q*bxcDYYB<~wVOFW}3`r@4H|@fyE97P!cfkP~%@MH=|M#7TQSm0^y9)p&}_
z7{lc0-Cv$z#&CH?jf4HhF*6r<<1|RC&P|h7oP+#Da^G2|VEz(#l(!^NVZ`1w`3S4D
zh|A+Sm+k)}L4iBGp-Gr;RJbh%++L9EIM<ot5gTk#qq)BtTWqkzBtP>5D%liv*A40h
bb%Xu~a~|hNXxfgr00000NkvXXu0mjfV)nVh

diff --git a/debugdrawer/src/main/res/drawable-xxhdpi/ic_location_on_white_24dp.png b/debugdrawer/src/main/res/drawable-xxhdpi/ic_location_on_white_24dp.png
deleted file mode 100644
index 078b10d4fb334b98e6a51010ca48513017046656..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 675
zcmV;U0$lxxP)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0007NNkl<ZXa()T
zy-U<_0LSr<be9j4g9xTA1)@ud35J7_e?UQyR1{+7YBV%P<Z!z6;1VefL2zhP4n;^0
zIMkZ?fJhKXi{67eoJxo1I|74{`~L3X`~BS+-0LNkl$0D;l+(o^lPnS^Ns>5=yyhNf
zDOaJ<#uyuztn-9ZDim6oA{*~$k>99dgcRA@;Q<x$4^7OIt63W54?0*QA2CkLJv!JV
zUkTdf7EP>SBSxd#p^ABIeWOCIFoFyB<p!;!aAAj&a)Bvac`JLg;Zmz?F-9g4!h{GB
zCQ2rcWruP$@UlV=0qr43FROT2<FIVdg_l|Cv=2v^!%L@ZFo@X-bxMPJBADHk4JI+`
zkpX>}y_5|WF^Le60YRdeEXW3NOv3WOI3`iqAc;vx9vH&pmu#?wNk|?T#v~~l{KO<I
z4@_VZmkqvR5+x`Dg2XVHl?}!*>y-ihn7xn<ZezB}5v4%`QOxeh250axN4@r;fd#yD
z$p)2d;Uz*JLG2+(KT*7FQzbjRB9kcN3^B|EF*120TU^7XUfH6WZCu%=TK0H`E6?Qu
z9k|jdH<-bN8M(q0T(~M%IK+2s{U9KB=)=}^xkP{^Y%CFwTU@}#MY+dk^7Tc2pq*Xv
zu}i!B!5H~?D!))eoLt4Jk$>nXS2yG*%J@hwKFMz!W0P!ca$NpnfNTw@5Gdn4+4w-2
z3WEmL$z+|QDjd4Wq+5l>C|*WYXjHO*$vl-RJeo<6PJ(6?2bW3bl8T2%?DtT`M1X1j
zHBCUpMJ>zxwM?ywj}{XAk>G?52F{Zr#W@`u+~TH6N=p6<zX3gRU&CF+9VP$(002ov
JPDHLkV1fwZCz1dF

diff --git a/debugdrawer/src/main/res/drawable-xxhdpi/ic_settings_white_24dp.png b/debugdrawer/src/main/res/drawable-xxhdpi/ic_settings_white_24dp.png
deleted file mode 100644
index eabb0a2ba41bbe0e109263ee9b0d6ada40a6e792..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 843
zcmV-R1GM~!P)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0009LNkl<ZXa()T
zU1-&10LSs)^c<zM(B^cK9+!xvA|hQVk`NJe7X*z&5}8<-kX?8y<iedZLlNIngu$Q`
zW<vCKnW#x<(WXO^5G1!|`JSHR@$Jv~cC*1@JpbqApbuW0&qu1Ot9wc@pFz?L@Umi~
z1Dnl?jl<X+RBZHN^Q&T`h|NvKMKdmqiizd8ELBXb!DW?VB9BYE9xujlglp_)u|{D$
zAMrOX1FU1bM&VTsaFs(eC=_cM@f&NIpkb_F0AH7QPs5nVhy2cn)e6J&T%p=+zF-l}
z{79(pnaX1JbBAh|nWzwK!=y|t%9s@7kGVYLNxRQ%`Qis+_(pzsi&)-}8yWr}mVU;{
zg-?iSz3iC6En>RPWZAHfP!)RVB2S(!`lt|Um(uYf2_cGfFjG~?QJ_SKM>Hu7Qz_%`
zC^KY0j^p?%F-hrI#t?oEkx>e=^x$WZC9-20$8bAJMiyi_f!j|s$&C!#uq!e{4&*3d
z*U4D<;$4cQ>yQUJNq3uf6oz@6$E?Ckd0-Y5%+4`a;aG`TuRL)UvsTrDjhJ=G6Wy3?
zP%Zcjv%EY}z-*IhK|5x7d7^;XCe?zCn03h$-I#4qEm(<JpFGizS*yaafIl&-kdp^m
zs9<)Uc?!b{N~9~u16xT~q*cDivJ<-!IXTcm8N2Od<i>P<#_c#+Sul>1xE*7f>{!k}
z_~{|56pZ6*{0y;7>1g5}{!WmS0WF-w-(4mv4bw>oQKFMsszM7}DHGx$Q<RQ9gsO0s
zZVD9Wrk@I-cF2YoxIs+Um?S$sCZ=_AA;URhIl~ya@g}jnE<b!r3`gXPIXvJ=yT?oN
z$LE-os6`Qz4u#-3{-xS2cCvsbz9ZCO8d=D0{-fFu6BLFujQEAsJfmT>auHt_cw57G
zmNrf?VwFPCz(EGt%|eYrmJb-f<uBUEXcQK)m&<%fgB~yPxU?%K+HiSaG4UEMOB55$
zxHKv*?qG9MvC)goX~jklHeV?=wqWzAV&fGql8}&)kdTm&kdTn@hzrb7U0vN%>VG|Z
VF?y~eTbBR;002ovPDHLkV1i=jh>-vQ

diff --git a/debugdrawer/src/main/res/drawable-xxxhdpi/ic_battery_unknown_white_24dp.png b/debugdrawer/src/main/res/drawable-xxxhdpi/ic_battery_unknown_white_24dp.png
deleted file mode 100644
index 56090507f2cec6408f5569a74dac6282ca5a1e04..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 572
zcmV-C0>k}@P)<h;3K|Lk000e1NJLTq003YB003YJ1ONa4NRhv@00065Nkl<ZcmeI(
zy=qiZ6vgpt?wCZPFEA<*5o|M)G(Nz9t<_*e{3t9HC5@dn5kyGiD+Dp##y7CC5Df~F
zO3WA$Eb@Vk2Jgt<lxO2e26H@fHmtSFvsdv8+&ROLTf~f_D2k%6Uy8U>5PJj|dIS(a
z00CyH*y14BWQEqK0N3dgBQ;k>0hpyvtkks911e(XS$e=0F|(Z>5Id!JKqDGJ009IL
zKmY**SZ9$AO~&`8NrwmY`~Z4%8T(^@jEih|04y{0*UnL%<PLbWZ*M7Q!155iLp;qD
z&|_+-<}p6!3Fw;hBP_7W?%urN4wL5WQjUOi^T{*K8e!gZGB_>ylpkQx{PouWEP;t&
z<6(Y)PH?uspxh2N&gTbc24|}b%Ijd`M1Fwr;B1#c`5tUcc>FT=BWNG?2zV8=Pk98~
z4BB0PfVbu;sk{L`a6IUqrSA*y(cZ(n08fA()28_tJOMU1ZF={?6W}XnOzReS0{rBh
z>D&NcfP1EKfnUA=Uzjv^?>F!TxNG*GgEN46d|TiRuxYlJ`~lvX?U(v-R{#OL0lLft
zGw%;DW47lK0|XF200HKi3+D3w1n43YKmY**5I_I{O5gu}zeAB4utLmK=>ctOVx^{?
z9#C*C5~1emC||?c;UL+jqCM&t;Yu3+IA!`5;o^?~u15d?1o#cwst5@<rm8jo0000<
KMNUMnLSTYdK>4@;

diff --git a/debugdrawer/src/main/res/drawable-xxxhdpi/ic_delete_white_24dp.png b/debugdrawer/src/main/res/drawable-xxxhdpi/ic_delete_white_24dp.png
deleted file mode 100644
index 8d322aa9baba09c58b0058760fb7d53a392b63a1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 243
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%xcgc6quuhE&{od*w9mAp-%|!1oIz
zUAkW?IxdlN5p^sPGLtM@^D{+9cy9DT>q|G5dQ4KuY+ck{{`y~aU3Uxr^X+awlIm)m
zLim6tF)Yw+SYp*L31Z?03ltA1m;Rr_zhgPmvYG>yq8FYs_ibEqHvUn-r*1=DgDFx+
z?bd02*59bTR4g&(=Y(kztIpQ%Z4JJY^zZNE9?f4`+x0ysZP__5=_$iXi`hvQAj>>m
L{an^LB{Ts5t^ZVx

diff --git a/debugdrawer/src/main/res/drawable-xxxhdpi/ic_developer_mode_white_24dp.png b/debugdrawer/src/main/res/drawable-xxxhdpi/ic_developer_mode_white_24dp.png
deleted file mode 100644
index 2a0dfac6e28e0b34ae681041702d78b14bad83d6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 667
zcmV;M0%ZM(P)<h;3K|Lk000e1NJLTq003YB003YJ1ONa4NRhv@0007FNkl<ZcmeI&
zJ!_L;6vpv1t2QF|6$DWPw>FEDi_pyojt)AzsMYvVi*5V@F5==_eGP(J@&QbPAUF%+
z)=rkRv*i*FnH~b|-TQx^207O?A9DSm)BUuTmPjO`x-O`rHFd3@tRJl(#(i&nXMH>F
zn)QwK^|-IBFRd^1Ol{4pmfF;Vi~6aO`JwYA0e4hBySh;da8+KpQUY*7BY9;@$9X_o
zo>}ApLwV*a57?1swt0Ye0uX=z1Rwy@4QRo22h`vOAOHafz<&;CRZ0U|mEr*Zx&fN%
zX*T)lnEINV20&9gk_Kud&L2t|<r9$kmUT4}=Zhdv^T&k5`2c~NKPIHjw`}JS!1<Q`
zo_Bp&C;~J;;m=`CBa+}fA1840QwD$petsTdo(J&rQG)+`nBYGjCgjhzAHxYv8o<wo
z2>$b7Le6~qfx{;7^Lauhpr=WBsv6wqnv`BXprL^#<t93RNs}_rY(9V|fb$KILAZs?
zf0#Z$5nzOMoB+%>z@ZWz<jprgHsSVx=ikqrZvdXa&!+$+;T|#H01#nOwS>0Q=R*J^
z3^NJTd;|Cs?qc%|;7vg18vrGA_Pl#S&Nl!^SlQQI2bm85st>h~_kFiY%{Kr<SWdcI
zW#$_IAv{XHTOsBH03%#G(B1W<`SF#qTPZ!ITWNf$pKd?^0uX=zblJv#?oK%%009U<
z0Cwe>zdT@5p4s35U*wt3Jm9iCbBPDk^<7^1raBC;p3;^)@<%62J*%A4Z<Wq3oh|t;
zbX3dQRH<xeNk_^*Y|ZG57Sw{fpwpU(m$?AA_a7Ea!@djX)ky#V002ovPDHLkV1jU%
BE*t;=

diff --git a/debugdrawer/src/main/res/drawable-xxxhdpi/ic_info_outline_white_24dp.png b/debugdrawer/src/main/res/drawable-xxxhdpi/ic_info_outline_white_24dp.png
deleted file mode 100644
index 3a82cab3b4f2cfe77333cee6121d867353753d5e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1279
zcmV<b1OWSqP)<h;3K|Lk000e1NJLTq003YB003YJ1ONa4NRhv@000EWNkl<ZcmeI(
z$!ip89Eb7OG)THTi(nQ5BF0G^my6;}aPTq{CF4q?k|BcsfJ^A8aRsl6-hvv9%%JFm
zc=Zssi-d`I6*6ON6XHr-(uomA?Rw_?d%N0Nx~g7f`t$t<>XA;<CGV?BN=iyfN`k{Y
zS~<ui?lQ~-AIXv9BNGgBhh7fSN<AvbDS}xADK3z~jS+g-O7dF?D5I5rKH$|1eXOU<
zY(N!h#wf-p9aNeLNOFXC1mO)`B%%&z=NUm7r!BgGMcgI~11yXpU>DPbB};p_0dfAo
z$vAy<v6&S#5GO{AI1Q|13y0|ADNZg>9#+6S9#ELYJ@(Lqa#%C_802gIqArYp#f(wN
zJ5D-2x}I^0EQMtFA?SeRyu{vHx_o|<S8;?%>^)~`kO7MeJbsRD=Aw#N4d<{5Bs2vT
z(7+gW9<dq~z}D~>I~nSN2#E6lJC{kK0$L^4urow?@d3Y+FGmL|;O)mE-^F4Bc9HL2
zQm7ENoloT3SxmqprfnYoS5!#bXp=BSqyK>0=yIe`A#Mj2x&gld?d0n~g}ejgYx5J3
z<QcllDA&^|*ZULQI0^3ohtWME8A(7D8Fc%-22}ADDaUG5Bms(_u#jF;;VmGIt{W9u
zfT9Q8UM~SL#*p4JH`0JwvPe%Tb05%(t_u}ufZ{m17WV=DNbjhOJfNB^(p9$s6?{NC
ziHbZxaT@7833mZ0B#S1Lfh|F|$z8w&q<bhs8$vqkE+B)n$5=ob>2Egy^UyUJ3s{D(
z);XXRX&hy6FOb$b2OLD|GaAs3)ae{>38~9yz)_?g=YYFNn~esfkZw5#3?r>T`I=7o
z+A5@n&H)oh4MqdzBfWAC_=prY8jwJmaSq5K#f%2TkiLBX0pHn2D2X)lKlmdaMq2s3
zeU08h+F~>yg>=(7pcm<o(STz}=ZpF=XCUA@Qri2^>8C~mULv(P2h^i$HWskl&kK!W
z1ZkhKfKETJl!_jtL1O{;k-FUlY(=tYHWIKD-3E67NoJ5v83{OpG)>%HfT9m6OI73n
zbC^cDf^r+M9^H}115Tj(#eF~-qezp~L>f@f6jFv+?gJDZ=*~qN(2H(2%1b~cZ;&k3
zL>90X-2_Q*0g5hkkEx6#pqf#1X_VK11mozgMH0}DZj8A107V=5_M<}HVe)PBd(>b6
zoyB%ki2Dr--3^rAfQ4kyePSajq;2Lix=9xJ4^Xs&O~Q_l{`EhTudUbvPZ!B&aUg`x
zzD2%ssA2=k8N$vrDp3KgnttpIGQ0QyMI9OJJZ23lfURW|J0sKtb?mZ<=h(66p%zud
z>bZoyXEX+R@O5c{1jurnYLt)7;RI9Id&-iaj~+Mi1PVr+=0}fjTW6S}kP#ZgIQ(7D
z5MMJynq@Bjr=gSke9a&=VI99OrxzzL=;tUYRxzIhF=8Z{&ni+J<2o;Ka+cZQUVzxi
z6k(a9Es85BjSLWm8!U+K5>OlC1Zk9QQD4JKaDdkYVS+SqGZ*11*vk`&kzqGU(^nB&
zxXOFHn&t{WGwWNq44PmQXZZ&=hUsR5_|TXQ5UXPyo%C>vhrD8jFMMH!S3Kk<=SkB-
pEh@+<Os^DRa;1P$Kq;UU@E-(*#@c1Rm*W5c002ovPDHLkV1iCcH*Wv{

diff --git a/debugdrawer/src/main/res/drawable-xxxhdpi/ic_location_on_white_24dp.png b/debugdrawer/src/main/res/drawable-xxxhdpi/ic_location_on_white_24dp.png
deleted file mode 100644
index 8bcb6f620d5eef21f9322626451aedf0e83cb510..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 869
zcmV-r1DgDaP)<h;3K|Lk000e1NJLTq003YB003YJ1ONa4NRhv@0009lNkl<ZcmeIf
zPiWV59LMoj^Y_oysTBJCHh#>Dc<7|j?+~JR6cP7BJ9WuR#t(JNE_n+Xh!9jnve-o(
z8xD7l2u8RrBP273Aafhbu+|S*Zt?s5<hN&Z2x7Q>KHEO;@AvzI@8cn*QmIrb6%ae9
zaDfq~nWIjN7Io&BW`uXCutUj3jw+KZv5_Tiae|zZhFuI%$Jd`+;w2>o&vTg-Hfxz7
zx)neASzxQ?Ij%TS;B&U?GxCZDz1$^)JCqbX_AyT=v+Py0*vB7)^gDYM9eSB3v{{OZ
z1_kb7;SPC4fnltCDtq)}>6mQs0t;B0rCXM`jI~R$!){iv_JkK@g(0HwfozbYP81f&
z$^upVHMmBVGFh^esd9q`{*KE6llU5^q&4Va0$&pfj|_j|qs<wugBopoJf=&bQNhm{
zZGaknUR7vZz{j{8n83$?LSqEC1|>PrOB1(Yg~l{)*W`gw+`d+5%;8p*2TtPlK%r5`
ztt=1p;kKyIXyKNX2lBWz6&iozmX!zcxV01-3%Hf#fjziAR%m>OTU8!7h1<^xjjwRK
zArFk<Hl@(Gid%yoIZ&pF+pt38G(K+1fk}MS6dJGKr=|^X4nGxzMi)=;(Wa(#aGo|k
zmdPqSzQET6y;_4Zllb~l7I+(fO-4CMA9?cZ;S^&u@pn!Zc$qfQ=#ve;Aqq3H!XQx?
zlofW-z*>vlvco9WZpjj_W9^7+aSuyB$Qo~9>9nkoVGb(`<YbR`uyS5eAkRZA{6<01
z;4Bu-Dk@~TPiPOwDLTACXm2W7%n;JIJf~=JkdO{4dW;duxZ*&OB|=!HNAX~g5Z+T<
z$Z(JC`ksv9Lxncm(dIS9ix1h3j}$j{a-XgGg>J=<!>qCus~lD`@G)EQiIRc>KeAar
zu~W&xep+lsivvm)F0vW#D{1Ir3SU!nDS0Tdh>t}|N+yo7ipwfTm0VoG<%*Jw47b_H
zZ8AzWiacUHk0>hnIK)$)<tc~M85rPM2GlvY&RW;iNhmPG|IJWPXQ9MH{_`tEbsi3|
v!oOD7ug*k2ZQ7hr=VFinrBbO>DrM#$_M_4W`lPlN00000NkvXXu0mjf?1GW8

diff --git a/debugdrawer/src/main/res/drawable-xxxhdpi/ic_settings_white_24dp.png b/debugdrawer/src/main/res/drawable-xxxhdpi/ic_settings_white_24dp.png
deleted file mode 100644
index 507c5edd44bfb5efe41327d5cef511a108d35f13..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1074
zcmV-21kL-2P)<h;3K|Lk000e1NJLTq003YB003YJ1ONa4NRhv@000B|Nkl<ZcmeIf
zTTIqv0LSs)%P~*Q*2Gt$Oc{5%2^vlgvdq@9n&w3{E0>+t)}?IPi4`?n-BcG{I5ur-
z(S>O`4876<#~6}k=`>Up4hWM~CUltm-)|Ri1Ni>m=Xw7B>2vXZK2lazR#sM4OxVB`
zGWm@s<ST|TF-$@}q8L+m%SY5<YPEdCi<o*vK4J%^K9rBxgQ<P;5kFw+C;5nLm>MM^
z-;l({UGfbz*r=0l*o=*rbn~#1)BM5?7AY+r;d^YHV6D>PUbfT6IjR&Lx6#YE6o*+)
zuBKoO-MHxHK}|s}>p4WgxIShmD&AzWe%_@-6DZ+pqS#BZCQ!mV^fOt5qM?`(rW@k`
zYsq0Fe-hOnJV_2~IlvgxjZ&g0_?+}E6PL@R*DQCeAjPd$B{wAK#0SSo$OW75#b()K
zHUs$LSLVnT+wsW<vcn?&#V7w!DjV#@H~VFd2k_AvnIV@`_~<mbGQq1vmEs6nsHTVl
z3Ybp~^?XZ;s9uu^ekO`BcCuJEKq*ZGMA0J?bmQ&}<qE+v&f@NbOi;lfZVob288C}h
z+zhfzW=PV8y@TY*0Qt0H?>mw*M;;$z=L|Dth}oRO&PU|Q78@DG)EG-;f#n348sTZV
zVF~9kvs0GXg_$1ilRM_pLS`uz%MxXz$ZS8iD;g5KO+dIKazGp50^T5@IM7A7EpotC
z!W~mwxJ0;WIiQwsy^0H?ge#H*l7zdexR6PK98gHOKye|H0y&_NaDn2&2;t_-0ZGDL
zRb044xEeWN72z%_E_4yDUJlqsxMPX~IW&?Y+)+88op1pSBoqyIaEQ!Ol*$riq{ys=
zxpK!+dNI=^OYFwX1(wJSoA?`3V^qijl?0d?Wut77&!^Zq%PbjU4n5fUgnXH!m=5f<
zk}m_~a~ON=BxQz5hH%r$Y-PY44&!E!3Yp*}?#{7XA*iGWcbzi9S)vHoMVW4ZGIkRX
z#g8(<%S4r;jjhy@q>w_AtYRDOq=;&>OpwD#d~}?I%ut7qs$`Bm_@-GlSja#4WRw!w
z;XQoPAY06$A7At_L-u$UUpyrjB<R2gZF0r^q`1`r%H@vFNN<3+43J)vqF@2nnC?1X
z@em0%FicceSVw|~*~fLJyGoIw;dLhK<1H3w0`vKjD868xCQwWRmzb<xQBlZ6#s#$S
zC^?#fS~_siPPL{Wm&f^rfN?$KD>^DU#RVF<M`^K|E^KsCr?gne`<$nna@{;UkBw*K
z8)~qzLcSr1jXUKZ{=(Gn@)0L7)g>RX2UE@R5j!x|C?D|xrk<0JScR#T@)5<DnkPST
s1rvkv73&xxlOY~cR#sM4R#r^@2T4_fd+}U(w*UYD07*qoM6N<$g0!>nxBvhE

diff --git a/debugdrawer/src/main/res/layout/debug_drawer.xml b/debugdrawer/src/main/res/layout/dd_debug_drawer.xml
similarity index 83%
rename from debugdrawer/src/main/res/layout/debug_drawer.xml
rename to debugdrawer/src/main/res/layout/dd_debug_drawer.xml
index 47f95f8..97823b3 100644
--- a/debugdrawer/src/main/res/layout/debug_drawer.xml
+++ b/debugdrawer/src/main/res/layout/dd_debug_drawer.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.v4.widget.DrawerLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/drawer_layout"
+    android:id="@+id/dd_drawer_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
@@ -12,9 +12,9 @@
         -->
     <io.palaima.debugdrawer.view.ScrimInsetsFrameLayout
         android:clickable="true"
-        android:id="@+id/content_layout"
+        android:id="@+id/dd_content_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>
 
-    <include layout="@layout/debug_drawer_slider" />
+    <include layout="@layout/dd_debug_drawer_slider" />
 </android.support.v4.widget.DrawerLayout>
\ No newline at end of file
diff --git a/debugdrawer/src/main/res/layout/debug_drawer_slider.xml b/debugdrawer/src/main/res/layout/dd_debug_drawer_slider.xml
similarity index 70%
rename from debugdrawer/src/main/res/layout/debug_drawer_slider.xml
rename to debugdrawer/src/main/res/layout/dd_debug_drawer_slider.xml
index 2787eeb..8a61f7e 100644
--- a/debugdrawer/src/main/res/layout/debug_drawer_slider.xml
+++ b/debugdrawer/src/main/res/layout/dd_debug_drawer_slider.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/slider_layout"
+    android:id="@+id/dd_slider_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_gravity="start"
     android:elevation="8dp"
     android:orientation="vertical"
-    android:layout_marginRight="@dimen/debug_drawer_margin"
-    android:layout_marginEnd="@dimen/debug_drawer_margin"
+    android:layout_marginRight="@dimen/dd_debug_drawer_margin"
+    android:layout_marginEnd="@dimen/dd_debug_drawer_margin"
     android:background="#ee212121">
 
         <io.palaima.debugdrawer.view.DebugView
-            android:id="@+id/debug_view"
+            android:id="@+id/dd_debug_view"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"/>
 </ScrollView>
\ No newline at end of file
diff --git a/debugdrawer/src/main/res/layout/debug_drawer_module_build.xml b/debugdrawer/src/main/res/layout/debug_drawer_module_build.xml
deleted file mode 100644
index d807425..0000000
--- a/debugdrawer/src/main/res/layout/debug_drawer_module_build.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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"
-    tools:ignore="UselessParent">
-    <TextView
-        android:layout_columnSpan="2"
-        android:layout_width="0dp"
-        android:layout_gravity="start|fill_horizontal"
-        android:text="Build Information"
-        style="@style/Widget.DebugDrawer.Header"
-        />
-
-    <TextView
-        android:layout_gravity="start|center_vertical"
-        android:text="Version"
-        style="@style/Widget.DebugDrawer.RowTitle"
-        />
-    <TextView
-        android:id="@+id/debug_build_code"
-        android:layout_width="0dp"
-        android:layout_gravity="start|center_vertical|fill_horizontal"
-        style="@style/Widget.DebugDrawer.RowValue"
-        />
-
-    <TextView
-        android:layout_gravity="start|center_vertical"
-        android:text="Name"
-        style="@style/Widget.DebugDrawer.RowTitle"
-        />
-    <TextView
-        android:id="@+id/debug_build_name"
-        android:layout_width="0dp"
-        android:layout_gravity="start|center_vertical|fill_horizontal"
-        style="@style/Widget.DebugDrawer.RowValue"
-        />
-
-    <TextView
-        android:layout_gravity="start|center_vertical"
-        android:text="Package"
-        style="@style/Widget.DebugDrawer.RowTitle"
-        />
-    <TextView
-        android:id="@+id/debug_build_package"
-        android:layout_width="0dp"
-        android:layout_gravity="start|center_vertical|fill_horizontal"
-        style="@style/Widget.DebugDrawer.RowValue"
-        />
-
-</GridLayout>
diff --git a/debugdrawer/src/main/res/layout/debug_drawer_module_device.xml b/debugdrawer/src/main/res/layout/debug_drawer_module_device.xml
deleted file mode 100644
index 5f1eb4a..0000000
--- a/debugdrawer/src/main/res/layout/debug_drawer_module_device.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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"
-    tools:ignore="UselessParent">
-    <TextView
-        android:layout_columnSpan="2"
-        android:layout_width="0dp"
-        android:layout_gravity="start|fill_horizontal"
-        android:text="Device Information"
-        style="@style/Widget.DebugDrawer.Header"
-        />
-
-    <TextView
-        android:layout_gravity="start|center_vertical"
-        android:text="Make"
-        style="@style/Widget.DebugDrawer.RowTitle"
-        />
-    <TextView
-        android:id="@+id/debug_device_make"
-        android:layout_width="0dp"
-        android:layout_gravity="start|center_vertical|fill_horizontal"
-        style="@style/Widget.DebugDrawer.RowValue"
-        />
-
-    <TextView
-        android:layout_gravity="start|center_vertical"
-        android:text="Model"
-        style="@style/Widget.DebugDrawer.RowTitle"
-        />
-    <TextView
-        android:id="@+id/debug_device_model"
-        android:layout_width="0dp"
-        android:layout_gravity="start|center_vertical|fill_horizontal"
-        style="@style/Widget.DebugDrawer.RowValue"
-        />
-
-    <TextView
-        android:layout_gravity="start|center_vertical"
-        android:text="Resolution"
-        style="@style/Widget.DebugDrawer.RowTitle"
-        />
-    <TextView
-        android:id="@+id/debug_device_resolution"
-        android:layout_width="0dp"
-        android:layout_gravity="start|center_vertical|fill_horizontal"
-        style="@style/Widget.DebugDrawer.RowValue"
-        />
-
-    <TextView
-        android:layout_gravity="start|center_vertical"
-        android:text="Density"
-        style="@style/Widget.DebugDrawer.RowTitle"
-        />
-    <TextView
-        android:id="@+id/debug_device_density"
-        android:layout_width="0dp"
-        android:layout_gravity="start|center_vertical|fill_horizontal"
-        style="@style/Widget.DebugDrawer.RowValue"
-        />
-
-    <TextView
-        android:layout_gravity="start|center_vertical"
-        android:text="Release"
-        style="@style/Widget.DebugDrawer.RowTitle"
-        />
-    <TextView
-        android:id="@+id/debug_device_release"
-        android:layout_width="0dp"
-        android:layout_gravity="start|center_vertical|fill_horizontal"
-        style="@style/Widget.DebugDrawer.RowValue"
-        android:text="sdgsdgf"
-        />
-
-    <TextView
-        android:layout_gravity="start|center_vertical"
-        android:text="API"
-        style="@style/Widget.DebugDrawer.RowTitle"
-        />
-    <TextView
-        android:id="@+id/debug_device_api"
-        android:layout_width="0dp"
-        android:layout_gravity="start|center_vertical|fill_horizontal"
-        style="@style/Widget.DebugDrawer.RowValue"
-        />
-
-</GridLayout>
diff --git a/debugdrawer/src/main/res/layout/debug_drawer_module_divider.xml b/debugdrawer/src/main/res/layout/debug_drawer_module_divider.xml
deleted file mode 100644
index 787c062..0000000
--- a/debugdrawer/src/main/res/layout/debug_drawer_module_divider.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingTop="@dimen/debug_drawer_padding"
-                android:paddingBottom="@dimen/debug_drawer_padding">
-    <View
-        android:id="@+id/divider"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"/>
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="hello"/>
-</RelativeLayout>
diff --git a/debugdrawer/src/main/res/layout/debug_drawer_module_network.xml b/debugdrawer/src/main/res/layout/debug_drawer_module_network.xml
deleted file mode 100644
index 58ca292..0000000
--- a/debugdrawer/src/main/res/layout/debug_drawer_module_network.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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"
-    tools:ignore="UselessParent">
-    <TextView
-        android:layout_columnSpan="2"
-        android:layout_width="0dp"
-        android:layout_gravity="start|fill_horizontal"
-        android:text="Network"
-        style="@style/Widget.DebugDrawer.Header"
-        />
-
-    <TextView
-        android:layout_gravity="start|center_vertical"
-        android:text="Wifi"
-        style="@style/Widget.DebugDrawer.RowTitle"
-        />
-    <Switch
-        android:id="@+id/debug_network_wifi"
-        android:layout_gravity="start|center_vertical"
-        style="@style/Widget.DebugDrawer.RowWidget"
-        />
-
-    <TextView
-        android:layout_gravity="start|center_vertical"
-        android:text="Mobile"
-        style="@style/Widget.DebugDrawer.RowTitle"
-        />
-    <Switch
-        android:id="@+id/debug_network_mobile"
-        android:layout_gravity="start|center_vertical"
-        style="@style/Widget.DebugDrawer.RowWidget"
-        />
-
-    <TextView
-        android:layout_gravity="start|center_vertical"
-        android:text="Bluetooth"
-        style="@style/Widget.DebugDrawer.RowTitle"
-        />
-    <Switch
-        android:id="@+id/debug_network_bluetooth"
-        android:layout_gravity="start|center_vertical"
-        style="@style/Widget.DebugDrawer.RowWidget"
-        />
-
-</GridLayout>
diff --git a/debugdrawer/src/main/res/layout/debug_drawer_module_settings.xml b/debugdrawer/src/main/res/layout/debug_drawer_module_settings.xml
deleted file mode 100644
index 03ba32d..0000000
--- a/debugdrawer/src/main/res/layout/debug_drawer_module_settings.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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"
-    tools:ignore="UselessParent">
-
-    <TextView
-        android:layout_columnSpan="2"
-        android:layout_width="0dp"
-        android:layout_gravity="start|fill_horizontal"
-        android:text="Settings"
-        style="@style/Widget.DebugDrawer.Header"
-        />
-
-    <TextView
-        android:id="@+id/debug_settings_developer_title"
-        android:layout_gravity="start|center_vertical"
-        android:text="Developer"
-        style="@style/Widget.DebugDrawer.RowTitle"
-        />
-    <ImageView
-        android:id="@+id/debug_settings_developer"
-        android:layout_width="0dp"
-        android:layout_gravity="start|center|fill_horizontal"
-        style="@style/Widget.DebugDrawer.RowValue"
-        android:src="@drawable/ic_developer_mode_white_24dp"
-        />
-
-    <TextView
-        android:id="@+id/debug_settings_batery_title"
-        android:layout_gravity="start|center_vertical"
-        android:text="Battery"
-        style="@style/Widget.DebugDrawer.RowTitle"
-        />
-    <ImageView
-        android:id="@+id/debug_settings_batery"
-        android:layout_width="0dp"
-        android:layout_gravity="start|center|fill_horizontal"
-        style="@style/Widget.DebugDrawer.RowValue"
-        android:src="@drawable/ic_battery_unknown_white_24dp"
-        />
-
-    <TextView
-        android:id="@+id/debug_location_settings_title"
-        android:layout_gravity="start|center_vertical"
-        android:text="Location"
-        style="@style/Widget.DebugDrawer.RowTitle"
-        />
-    <ImageView
-        android:id="@+id/debug_location_settings"
-        android:layout_width="0dp"
-        android:layout_gravity="start|center|fill_horizontal"
-        style="@style/Widget.DebugDrawer.RowValue"
-        android:src="@drawable/ic_location_on_white_24dp"
-        />
-
-    <TextView
-        android:id="@+id/debug_settings_settings_title"
-        android:layout_gravity="start|center_vertical"
-        android:text="Settings"
-        style="@style/Widget.DebugDrawer.RowTitle"
-        />
-    <ImageView
-        android:id="@+id/debug_settings_settings"
-        android:layout_width="0dp"
-        android:layout_gravity="start|center|fill_horizontal"
-        style="@style/Widget.DebugDrawer.RowValue"
-        android:src="@drawable/ic_settings_white_24dp"
-        />
-
-    <TextView
-        android:id="@+id/debug_settings_info_title"
-        android:layout_gravity="start|center_vertical"
-        android:text="App info"
-        style="@style/Widget.DebugDrawer.RowTitle"
-        />
-    <ImageView
-        android:id="@+id/debug_settings_info"
-        android:layout_width="0dp"
-        android:layout_gravity="start|center|fill_horizontal"
-        style="@style/Widget.DebugDrawer.RowValue"
-        android:src="@drawable/ic_info_outline_white_24dp"
-        />
-
-    <TextView
-        android:id="@+id/debug_settings_delete_title"
-        android:layout_gravity="start|center_vertical"
-        android:text="Uninstall"
-        style="@style/Widget.DebugDrawer.RowTitle"
-        />
-    <ImageView
-        android:id="@+id/debug_settings_delete"
-        android:layout_width="0dp"
-        android:layout_gravity="start|center|fill_horizontal"
-        style="@style/Widget.DebugDrawer.RowValue"
-        android:src="@drawable/ic_delete_white_24dp"
-        />
-
-</GridLayout>
diff --git a/debugdrawer/src/main/res/values/attrs.xml b/debugdrawer/src/main/res/values/attrs.xml
index f4106ea..5e9634a 100644
--- a/debugdrawer/src/main/res/values/attrs.xml
+++ b/debugdrawer/src/main/res/values/attrs.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <declare-styleable name="ScrimInsetsView">
-        <attr name="siv_insetForeground" format="reference|color"/>
+    <declare-styleable name="DebugDrawerScrimInsetsView">
+        <attr name="dd_siv_insetForeground" format="reference|color"/>
     </declare-styleable>
 </resources>
\ No newline at end of file
diff --git a/debugdrawer/src/main/res/values/dimens.xml b/debugdrawer/src/main/res/values/dimens.xml
index ddf55d8..38c2282 100644
--- a/debugdrawer/src/main/res/values/dimens.xml
+++ b/debugdrawer/src/main/res/values/dimens.xml
@@ -3,13 +3,13 @@
     <!-- Debug Drawer Dimens -->
     <!-- ********************** -->
     <!-- General drawer width https://medium.com/sebs-top-tips/material-navigation-drawer-sizing-558aea1ad266 -->
-    <dimen name="debug_drawer_width">320dp</dimen>
+    <dimen name="dd_debug_drawer_width">320dp</dimen>
     <!-- Definition for the Drawer Slider margin right -->
-    <dimen name="debug_drawer_margin">0dp</dimen>
+    <dimen name="dd_debug_drawer_margin">0dp</dimen>
     <!-- General padding value -->
-    <dimen name="debug_drawer_padding">8dp</dimen>
+    <dimen name="dd_debug_drawer_padding">8dp</dimen>
     <!-- General vertical padding values -->
     <dimen name="debug_drawer_vertical_padding">16dp</dimen>
     <!-- Toolbar Padding -->
-    <dimen name="tool_bar_top_padding">0dp</dimen>
+    <dimen name="dd_tool_bar_top_padding">0dp</dimen>
 </resources>
diff --git a/debugdrawer/src/main/res/values/styles.xml b/debugdrawer/src/main/res/values/styles.xml
deleted file mode 100644
index 4607d1c..0000000
--- a/debugdrawer/src/main/res/values/styles.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="None">
-    </style>
-
-    <style name="Widget.DebugDrawer.Header" parent="None">
-        <item name="android:paddingBottom">2dp</item>
-        <item name="android:textColor">#ffffff</item>
-        <item name="android:textAllCaps">true</item>
-        <item name="android:textSize">13sp</item>
-        <item name="android:layout_marginTop">8dp</item>
-        <item name="android:layout_marginBottom">2dp</item>
-        <item name="android:background">@drawable/debug_drawer_header_bg</item>
-    </style>
-    <style name="Widget.DebugDrawer.RowWidget" parent="None">
-        <item name="android:minHeight">30dp</item>
-        <item name="android:layout_marginTop">4dp</item>
-    </style>
-    <style name="Widget.DebugDrawer.RowTitle" parent="Widget.DebugDrawer.RowWidget">
-        <item name="android:layout_marginRight">16dp</item>
-        <item name="android:textColor">#ffffff</item>
-        <item name="android:textSize">16sp</item>
-        <item name="android:gravity">center_vertical</item>
-    </style>
-    <style name="Widget.DebugDrawer.RowValue" parent="Widget.DebugDrawer.RowWidget">
-        <item name="android:textColor">#ffffff</item>
-        <item name="android:textSize">16sp</item>
-        <item name="android:gravity">center_vertical</item>
-    </style>
-</resources>
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index ce63669..57b81f0 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':app', ':debugdrawer', ':debugdrawer-picasso', ':debugdrawer-okhttp', ':debugdrawer-scalpel', ':debugdrawer-location', ':debugdrawer-log', ':debugdrawer-fps', ':debugdrawer-actions', ':debugdrawer-base', ':debugdrawer-commons', ':debugdrawer-view', ':debugdrawer-no-op', ':debugdrawer-view-no-op'
+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'