diff --git a/android/dependencies.gradle b/android/dependencies.gradle
index a06f0292d3..2dd8da5064 100644
--- a/android/dependencies.gradle
+++ b/android/dependencies.gradle
@@ -2,5 +2,6 @@ ext.libs = [
         junit      : "junit:junit:4.13",
         annotations: "org.jetbrains:annotations:16.0.1",
         javaxJson  : "javax.json:javax.json-api:1.1.4",
-        snakeyaml  : "org.yaml:snakeyaml:1.26"
+        snakeyaml  : "org.yaml:snakeyaml:1.26",
+        jsr305     : "com.google.code.findbugs:jsr305:3.0.2"
 ]
\ No newline at end of file
diff --git a/firmware/controllers/can/wideband_firmware b/firmware/controllers/can/wideband_firmware
index 635b5567e3..10cbc928b0 160000
--- a/firmware/controllers/can/wideband_firmware
+++ b/firmware/controllers/can/wideband_firmware
@@ -1 +1 @@
-Subproject commit 635b5567e3442b89aa3941d74622df9aceb7cab9
+Subproject commit 10cbc928b0367d1396662cd5f66b5b1f00de637e
diff --git a/java_console/logging-api/build.gradle b/java_console/logging-api/build.gradle
index ac70de7d36..4ebb4ddb34 100644
--- a/java_console/logging-api/build.gradle
+++ b/java_console/logging-api/build.gradle
@@ -2,6 +2,8 @@ plugins {
     id 'java'
 }
 
+apply from: '../../android/dependencies.gradle'
+
 dependencies {
-    implementation group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2'
+    implementation libs.jsr305
 }
\ No newline at end of file
diff --git a/java_console/logging/build.gradle b/java_console/logging/build.gradle
index 809904318d..0a69cd16ee 100644
--- a/java_console/logging/build.gradle
+++ b/java_console/logging/build.gradle
@@ -2,7 +2,9 @@ plugins {
     id 'java-library'
 }
 
+apply from: '../../android/dependencies.gradle'
+
 dependencies {
   implementation project(':logging-api')
-  implementation fileTree(dir: '../lib', include: 'annotations.jar')
+  implementation libs.annotations
 }
\ No newline at end of file
diff --git a/java_console/logging/settings.gradle b/java_console/logging/settings.gradle
deleted file mode 100644
index e2eed5b626..0000000000
--- a/java_console/logging/settings.gradle
+++ /dev/null
@@ -1,2 +0,0 @@
-include ':logging-api'
-project(':logging-api').projectDir = new File('../logging-api')
\ No newline at end of file
diff --git a/java_tools/bin2header/build.gradle b/java_tools/bin2header/build.gradle
index 96348f1489..8b3bc83530 100644
--- a/java_tools/bin2header/build.gradle
+++ b/java_tools/bin2header/build.gradle
@@ -2,15 +2,13 @@ plugins {
     id 'java-library'
 }
 
-repositories {
-    mavenCentral()
-}
-
 defaultTasks 'jar'
 
+apply from: '../../android/dependencies.gradle'
+
 dependencies {
-    implementation 'junit:junit:4.8.2'
-    implementation fileTree(dir: '../../java_console/lib', include: 'annotations.jar')
+    testImplementation libs.junit
+    implementation libs.annotations
 }
 
 jar {
diff --git a/java_tools/enum_to_string/build.gradle b/java_tools/enum_to_string/build.gradle
index 34208f2161..f80bce414b 100644
--- a/java_tools/enum_to_string/build.gradle
+++ b/java_tools/enum_to_string/build.gradle
@@ -5,20 +5,15 @@ plugins {
 
 apply from: '../../android/dependencies.gradle'
 
-repositories {
-    mavenCentral()
-}
-
 defaultTasks 'shadowJar'
 
 dependencies {
     // https://mvnrepository.com/artifact/com.google.code.findbugs/jsr305
-    implementation 'com.google.code.findbugs:jsr305:2.0.1'
+    implementation libs.jsr305
     implementation project(':logging')
     implementation project(':logging-api')
-    implementation fileTree(dir: '../../java_console/lib', include: 'annotations.jar')
-
-    implementation libs.junit
+    implementation libs.annotations
+    testImplementation libs.junit
 }
 
 /*
@@ -56,8 +51,8 @@ shadowJar {
      and loggin-api as in build.xml
     */
     dependencies {
-        exclude(dependency('com.google.code.findbugs:jsr305:.*'))
-        exclude(dependency('junit:junit:.*'))
-        exclude 'annotations.jar'
+        exclude(dependency(libs.jsr305))
+        exclude(dependency(libs.junit))
+        exclude(dependency(libs.annotations))
     }
 }
\ No newline at end of file
diff --git a/java_tools/enum_to_string/settings.gradle b/java_tools/enum_to_string/settings.gradle
deleted file mode 100644
index 86053a5a25..0000000000
--- a/java_tools/enum_to_string/settings.gradle
+++ /dev/null
@@ -1,4 +0,0 @@
-include ':logging'
-project(':logging').projectDir = new File('../../java_console/logging')
-include ':logging-api'
-project(':logging-api').projectDir = new File('../../java_console/logging-api')
\ No newline at end of file
diff --git a/java_tools/enum_to_string/src/main/java/com/rusefi/EnumToStringTest.java b/java_tools/enum_to_string/src/test/java/com/rusefi/EnumToStringTest.java
similarity index 100%
rename from java_tools/enum_to_string/src/main/java/com/rusefi/EnumToStringTest.java
rename to java_tools/enum_to_string/src/test/java/com/rusefi/EnumToStringTest.java
diff --git a/java_tools/enum_to_string/src/main/java/com/rusefi/util/test/LazyFileTest.java b/java_tools/enum_to_string/src/test/java/com/rusefi/util/test/LazyFileTest.java
similarity index 100%
rename from java_tools/enum_to_string/src/main/java/com/rusefi/util/test/LazyFileTest.java
rename to java_tools/enum_to_string/src/test/java/com/rusefi/util/test/LazyFileTest.java
diff --git a/java_tools/gcc_map_reader/build.gradle b/java_tools/gcc_map_reader/build.gradle
index 4b1b7bc451..dbdc6edf76 100644
--- a/java_tools/gcc_map_reader/build.gradle
+++ b/java_tools/gcc_map_reader/build.gradle
@@ -3,18 +3,12 @@ plugins {
     id 'application'
 }
 
-apply from: '../../android/dependencies.gradle'
-
-repositories {
-    mavenCentral()
-}
-
 defaultTasks 'jar'
 
 apply from: '../../android/dependencies.gradle'
 
 dependencies {
-    implementation libs.junit
+    testImplementation libs.junit
 }
 
 jar {
diff --git a/java_tools/gcc_map_reader/src/main/java/rusefi/GccMapReaderTest.java b/java_tools/gcc_map_reader/src/test/java/rusefi/GccMapReaderTest.java
similarity index 100%
rename from java_tools/gcc_map_reader/src/main/java/rusefi/GccMapReaderTest.java
rename to java_tools/gcc_map_reader/src/test/java/rusefi/GccMapReaderTest.java
diff --git a/java_tools/logicdata2c/build.gradle b/java_tools/logicdata2c/build.gradle
index eed9c52861..4c46d5e79d 100644
--- a/java_tools/logicdata2c/build.gradle
+++ b/java_tools/logicdata2c/build.gradle
@@ -2,10 +2,6 @@ plugins {
     id 'java-library'
 }
 
-repositories {
-    mavenCentral()
-}
-
 defaultTasks 'jar'
 
 apply from: '../../android/dependencies.gradle'
diff --git a/java_tools/version2header/build.gradle b/java_tools/version2header/build.gradle
index 121f978c04..a60b0bc017 100644
--- a/java_tools/version2header/build.gradle
+++ b/java_tools/version2header/build.gradle
@@ -2,14 +2,12 @@ plugins {
     id 'java-library'
 }
 
-repositories {
-    mavenCentral()
-}
-
 defaultTasks 'jar'
 
+apply from: '../../android/dependencies.gradle'
+
 dependencies {
-    implementation 'junit:junit:4.8.2'
+    testImplementation libs.junit
 }
 
 jar {