diff --git a/.idea/modules/RootShell/PhoneProfilesPlus.RootShell.main.iml b/.idea/modules/RootShell/PhoneProfilesPlus.RootShell.main.iml
index 690411e91d..c336ad089c 100644
--- a/.idea/modules/RootShell/PhoneProfilesPlus.RootShell.main.iml
+++ b/.idea/modules/RootShell/PhoneProfilesPlus.RootShell.main.iml
@@ -19,13 +19,6 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$/../../../RootShell/build/generated/ap_generated_sources/debug/out">
       <sourceFolder url="file://$MODULE_DIR$/../../../RootShell/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../RootShell/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../RootShell/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../RootShell/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../RootShell/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../RootShell/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../RootShell/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../RootShell/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../RootShell/build/generated/res/resValues/debug">
       <sourceFolder url="file://$MODULE_DIR$/../../../RootShell/build/generated/res/resValues/debug" type="java-resource" />
diff --git a/.idea/modules/RootTools/PhoneProfilesPlus.RootTools.main.iml b/.idea/modules/RootTools/PhoneProfilesPlus.RootTools.main.iml
index 22887c1358..2916c47645 100644
--- a/.idea/modules/RootTools/PhoneProfilesPlus.RootTools.main.iml
+++ b/.idea/modules/RootTools/PhoneProfilesPlus.RootTools.main.iml
@@ -19,26 +19,12 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$/../../../RootTools/build/generated/ap_generated_sources/debug/out">
       <sourceFolder url="file://$MODULE_DIR$/../../../RootTools/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../RootTools/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../RootTools/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../RootTools/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../RootTools/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../RootTools/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../RootTools/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../RootTools/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../RootTools/build/generated/res/resValues/debug">
       <sourceFolder url="file://$MODULE_DIR$/../../../RootTools/build/generated/res/resValues/debug" type="java-resource" />
     </content>
     <content url="file://$MODULE_DIR$/../../../RootTools/build/generated/source/buildConfig/debug">
       <sourceFolder url="file://$MODULE_DIR$/../../../RootTools/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../RootTools/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../RootTools/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../RootTools/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../RootTools/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../RootTools/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../RootTools/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../RootTools/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../RootTools/src/debug" />
     <content url="file://$MODULE_DIR$/../../../RootTools/src/main">
diff --git a/.idea/modules/ToastCompat/PhoneProfilesPlus.ToastCompat.main.iml b/.idea/modules/ToastCompat/PhoneProfilesPlus.ToastCompat.main.iml
index 166798fc7d..8faeebf26d 100644
--- a/.idea/modules/ToastCompat/PhoneProfilesPlus.ToastCompat.main.iml
+++ b/.idea/modules/ToastCompat/PhoneProfilesPlus.ToastCompat.main.iml
@@ -19,26 +19,12 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$/../../../ToastCompat/build/generated/ap_generated_sources/debug/out">
       <sourceFolder url="file://$MODULE_DIR$/../../../ToastCompat/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../ToastCompat/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../ToastCompat/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../ToastCompat/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../ToastCompat/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../ToastCompat/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../ToastCompat/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../ToastCompat/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../ToastCompat/build/generated/res/resValues/debug">
       <sourceFolder url="file://$MODULE_DIR$/../../../ToastCompat/build/generated/res/resValues/debug" type="java-resource" />
     </content>
     <content url="file://$MODULE_DIR$/../../../ToastCompat/build/generated/source/buildConfig/debug">
       <sourceFolder url="file://$MODULE_DIR$/../../../ToastCompat/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../ToastCompat/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../ToastCompat/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../ToastCompat/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../ToastCompat/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../ToastCompat/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../ToastCompat/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../ToastCompat/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../ToastCompat/src/debug" />
     <content url="file://$MODULE_DIR$/../../../ToastCompat/src/main">
diff --git a/.idea/modules/android-betterpickers/PhoneProfilesPlus.android-betterpickers.main.iml b/.idea/modules/android-betterpickers/PhoneProfilesPlus.android-betterpickers.main.iml
index c656f326f9..fd10f651cd 100644
--- a/.idea/modules/android-betterpickers/PhoneProfilesPlus.android-betterpickers.main.iml
+++ b/.idea/modules/android-betterpickers/PhoneProfilesPlus.android-betterpickers.main.iml
@@ -19,13 +19,6 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$/../../../android-betterpickers/build/generated/ap_generated_sources/debug/out">
       <sourceFolder url="file://$MODULE_DIR$/../../../android-betterpickers/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../android-betterpickers/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../android-betterpickers/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../android-betterpickers/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../android-betterpickers/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../android-betterpickers/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../android-betterpickers/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../android-betterpickers/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../android-betterpickers/build/generated/res/resValues/debug">
       <sourceFolder url="file://$MODULE_DIR$/../../../android-betterpickers/build/generated/res/resValues/debug" type="java-resource" />
diff --git a/.idea/modules/common/PhoneProfilesPlus.common.main.iml b/.idea/modules/common/PhoneProfilesPlus.common.main.iml
index aebc08f89f..e262bba600 100644
--- a/.idea/modules/common/PhoneProfilesPlus.common.main.iml
+++ b/.idea/modules/common/PhoneProfilesPlus.common.main.iml
@@ -19,26 +19,12 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$/../../../common/build/generated/ap_generated_sources/debug/out">
       <sourceFolder url="file://$MODULE_DIR$/../../../common/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../common/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../common/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../common/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../common/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../common/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../common/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../common/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../common/build/generated/res/resValues/debug">
       <sourceFolder url="file://$MODULE_DIR$/../../../common/build/generated/res/resValues/debug" type="java-resource" />
     </content>
     <content url="file://$MODULE_DIR$/../../../common/build/generated/source/buildConfig/debug">
       <sourceFolder url="file://$MODULE_DIR$/../../../common/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../common/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../common/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../common/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../common/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../common/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../common/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../common/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../common/src/debug" />
     <content url="file://$MODULE_DIR$/../../../common/src/main">
diff --git a/.idea/modules/noobcameraflash/PhoneProfilesPlus.noobcameraflash.main.iml b/.idea/modules/noobcameraflash/PhoneProfilesPlus.noobcameraflash.main.iml
index be3b758323..9d51d22a23 100644
--- a/.idea/modules/noobcameraflash/PhoneProfilesPlus.noobcameraflash.main.iml
+++ b/.idea/modules/noobcameraflash/PhoneProfilesPlus.noobcameraflash.main.iml
@@ -32,13 +32,6 @@
     </content>
     <content url="file://$MODULE_DIR$/../../../noobcameraflash/build/generated/source/buildConfig/debug">
       <sourceFolder url="file://$MODULE_DIR$/../../../noobcameraflash/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../noobcameraflash/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../noobcameraflash/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../noobcameraflash/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../noobcameraflash/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../noobcameraflash/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../noobcameraflash/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../noobcameraflash/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../noobcameraflash/src/debug" />
     <content url="file://$MODULE_DIR$/../../../noobcameraflash/src/main">
diff --git a/.idea/modules/time-duration-picker/PhoneProfilesPlus.time-duration-picker.main.iml b/.idea/modules/time-duration-picker/PhoneProfilesPlus.time-duration-picker.main.iml
index 19b788447c..8141c7a08d 100644
--- a/.idea/modules/time-duration-picker/PhoneProfilesPlus.time-duration-picker.main.iml
+++ b/.idea/modules/time-duration-picker/PhoneProfilesPlus.time-duration-picker.main.iml
@@ -19,26 +19,12 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$/../../../time-duration-picker/build/generated/ap_generated_sources/debug/out">
       <sourceFolder url="file://$MODULE_DIR$/../../../time-duration-picker/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../time-duration-picker/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../time-duration-picker/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../time-duration-picker/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../time-duration-picker/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../time-duration-picker/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../time-duration-picker/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../time-duration-picker/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../time-duration-picker/build/generated/res/resValues/debug">
       <sourceFolder url="file://$MODULE_DIR$/../../../time-duration-picker/build/generated/res/resValues/debug" type="java-resource" />
     </content>
     <content url="file://$MODULE_DIR$/../../../time-duration-picker/build/generated/source/buildConfig/debug">
       <sourceFolder url="file://$MODULE_DIR$/../../../time-duration-picker/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../time-duration-picker/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../time-duration-picker/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../time-duration-picker/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../time-duration-picker/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../time-duration-picker/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../time-duration-picker/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../time-duration-picker/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../time-duration-picker/src/debug" />
     <content url="file://$MODULE_DIR$/../../../time-duration-picker/src/main">