diff --git a/libs/README.md b/libs/README.md
index 73df373e..504e763d 100644
--- a/libs/README.md
+++ b/libs/README.md
@@ -21,5 +21,3 @@ Some dependencies may have been modified or could be released by their author in
 
  - `JD-GUI`: Removed ASM, RSyntaxTextArea, ANTLR, and TreeLayout
  - `APKTool`: Recompiled with the newest dependency versions, removed prebuilt folder
- - `dx`: Just taken from build-tools without modifications
- - `Dex2Jar`: Compiled from scratch ([This fork](https://github.com/ThexXTURBOXx/dex2jar)); download the `all` artifact from [GitHub actions](https://github.com/ThexXTURBOXx/dex2jar/actions)
diff --git a/libs/com/github/skylot/JADX-Android/5.1bcv/JADX-Android-5.1bcv.jar b/libs/com/github/skylot/JADX-Android/5.1bcv/JADX-Android-5.1bcv.jar
deleted file mode 100644
index 873cf828..00000000
Binary files a/libs/com/github/skylot/JADX-Android/5.1bcv/JADX-Android-5.1bcv.jar and /dev/null differ
diff --git a/libs/com/github/skylot/JADX-Android/5.1bcv/JADX-Android-5.1bcv.jar.md5 b/libs/com/github/skylot/JADX-Android/5.1bcv/JADX-Android-5.1bcv.jar.md5
deleted file mode 100644
index 7e697c41..00000000
--- a/libs/com/github/skylot/JADX-Android/5.1bcv/JADX-Android-5.1bcv.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-e568c8d5c6a7039543c0bdc3a1193051
\ No newline at end of file
diff --git a/libs/com/github/skylot/JADX-Android/5.1bcv/JADX-Android-5.1bcv.jar.sha1 b/libs/com/github/skylot/JADX-Android/5.1bcv/JADX-Android-5.1bcv.jar.sha1
deleted file mode 100644
index bda08d29..00000000
--- a/libs/com/github/skylot/JADX-Android/5.1bcv/JADX-Android-5.1bcv.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3676997aa01d30e6e891ebdce10b5c54eb4f13f7
\ No newline at end of file
diff --git a/libs/com/github/skylot/JADX-Android/5.1bcv/JADX-Android-5.1bcv.pom b/libs/com/github/skylot/JADX-Android/5.1bcv/JADX-Android-5.1bcv.pom
deleted file mode 100644
index 239f328c..00000000
--- a/libs/com/github/skylot/JADX-Android/5.1bcv/JADX-Android-5.1bcv.pom
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.github.skylot</groupId>
-  <artifactId>JADX-Android</artifactId>
-  <version>5.1bcv</version>
-</project>
diff --git a/libs/com/github/skylot/JADX-Android/5.1bcv/JADX-Android-5.1bcv.pom.md5 b/libs/com/github/skylot/JADX-Android/5.1bcv/JADX-Android-5.1bcv.pom.md5
deleted file mode 100644
index f9014279..00000000
--- a/libs/com/github/skylot/JADX-Android/5.1bcv/JADX-Android-5.1bcv.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-d7b27d1753ca7601eaa99e854ab41c6f
\ No newline at end of file
diff --git a/libs/com/github/skylot/JADX-Android/5.1bcv/JADX-Android-5.1bcv.pom.sha1 b/libs/com/github/skylot/JADX-Android/5.1bcv/JADX-Android-5.1bcv.pom.sha1
deleted file mode 100644
index 31ba6f51..00000000
--- a/libs/com/github/skylot/JADX-Android/5.1bcv/JADX-Android-5.1bcv.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5b189b265dc135d196afd591d8e15a29687a2dd0
\ No newline at end of file
diff --git a/libs/com/github/skylot/JADX-Android/maven-metadata.xml b/libs/com/github/skylot/JADX-Android/maven-metadata.xml
deleted file mode 100644
index 13ae4455..00000000
--- a/libs/com/github/skylot/JADX-Android/maven-metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata>
-  <groupId>com.github.skylot</groupId>
-  <artifactId>JADX-Android</artifactId>
-  <versioning>
-    <release>5.1bcv</release>
-    <versions>
-      <version>5.1bcv</version>
-    </versions>
-    <lastUpdated>20210622185013</lastUpdated>
-  </versioning>
-</metadata>
diff --git a/libs/com/github/skylot/JADX-Android/maven-metadata.xml.md5 b/libs/com/github/skylot/JADX-Android/maven-metadata.xml.md5
deleted file mode 100644
index 7dd04ef1..00000000
--- a/libs/com/github/skylot/JADX-Android/maven-metadata.xml.md5
+++ /dev/null
@@ -1 +0,0 @@
-50a57c1046d73790f276afd2dcb18eaf
\ No newline at end of file
diff --git a/libs/com/github/skylot/JADX-Android/maven-metadata.xml.sha1 b/libs/com/github/skylot/JADX-Android/maven-metadata.xml.sha1
deleted file mode 100644
index 297853ee..00000000
--- a/libs/com/github/skylot/JADX-Android/maven-metadata.xml.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d8e384d276fc18322a9a28fbbe7c4c3fd5207ca5
\ No newline at end of file
diff --git a/libs/com/github/skylot/JADX-Core/1.0bcv/JADX-Core-1.0bcv.jar b/libs/com/github/skylot/JADX-Core/1.0bcv/JADX-Core-1.0bcv.jar
deleted file mode 100644
index b50c56c8..00000000
Binary files a/libs/com/github/skylot/JADX-Core/1.0bcv/JADX-Core-1.0bcv.jar and /dev/null differ
diff --git a/libs/com/github/skylot/JADX-Core/1.0bcv/JADX-Core-1.0bcv.jar.md5 b/libs/com/github/skylot/JADX-Core/1.0bcv/JADX-Core-1.0bcv.jar.md5
deleted file mode 100644
index 886b7dca..00000000
--- a/libs/com/github/skylot/JADX-Core/1.0bcv/JADX-Core-1.0bcv.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-b42c44e1a9bddb3345fd2f5a7ede523e
\ No newline at end of file
diff --git a/libs/com/github/skylot/JADX-Core/1.0bcv/JADX-Core-1.0bcv.jar.sha1 b/libs/com/github/skylot/JADX-Core/1.0bcv/JADX-Core-1.0bcv.jar.sha1
deleted file mode 100644
index 512b541c..00000000
--- a/libs/com/github/skylot/JADX-Core/1.0bcv/JADX-Core-1.0bcv.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7f0730479b29194e089f779592c30dde5f25777e
\ No newline at end of file
diff --git a/libs/com/github/skylot/JADX-Core/1.0bcv/JADX-Core-1.0bcv.pom b/libs/com/github/skylot/JADX-Core/1.0bcv/JADX-Core-1.0bcv.pom
deleted file mode 100644
index 44313408..00000000
--- a/libs/com/github/skylot/JADX-Core/1.0bcv/JADX-Core-1.0bcv.pom
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.github.skylot</groupId>
-  <artifactId>JADX-Core</artifactId>
-  <version>1.0bcv</version>
-</project>
diff --git a/libs/com/github/skylot/JADX-Core/1.0bcv/JADX-Core-1.0bcv.pom.md5 b/libs/com/github/skylot/JADX-Core/1.0bcv/JADX-Core-1.0bcv.pom.md5
deleted file mode 100644
index 2c1ebf56..00000000
--- a/libs/com/github/skylot/JADX-Core/1.0bcv/JADX-Core-1.0bcv.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-86e3f252dd8060389adab49197b87d7b
\ No newline at end of file
diff --git a/libs/com/github/skylot/JADX-Core/1.0bcv/JADX-Core-1.0bcv.pom.sha1 b/libs/com/github/skylot/JADX-Core/1.0bcv/JADX-Core-1.0bcv.pom.sha1
deleted file mode 100644
index 714dfe6a..00000000
--- a/libs/com/github/skylot/JADX-Core/1.0bcv/JADX-Core-1.0bcv.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-585bfb95013389f6791a949624c55ca77e6b9edb
\ No newline at end of file
diff --git a/libs/com/github/skylot/JADX-Core/maven-metadata.xml b/libs/com/github/skylot/JADX-Core/maven-metadata.xml
deleted file mode 100644
index 52dd4a7a..00000000
--- a/libs/com/github/skylot/JADX-Core/maven-metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata>
-  <groupId>com.github.skylot</groupId>
-  <artifactId>JADX-Core</artifactId>
-  <versioning>
-    <release>1.0bcv</release>
-    <versions>
-      <version>1.0bcv</version>
-    </versions>
-    <lastUpdated>20210622185012</lastUpdated>
-  </versioning>
-</metadata>
diff --git a/libs/com/github/skylot/JADX-Core/maven-metadata.xml.md5 b/libs/com/github/skylot/JADX-Core/maven-metadata.xml.md5
deleted file mode 100644
index 8e1abe83..00000000
--- a/libs/com/github/skylot/JADX-Core/maven-metadata.xml.md5
+++ /dev/null
@@ -1 +0,0 @@
-73243ac381a03becf824b78f91466e23
\ No newline at end of file
diff --git a/libs/com/github/skylot/JADX-Core/maven-metadata.xml.sha1 b/libs/com/github/skylot/JADX-Core/maven-metadata.xml.sha1
deleted file mode 100644
index 5e1a7f1d..00000000
--- a/libs/com/github/skylot/JADX-Core/maven-metadata.xml.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a989fc2ce008b7c7b6cf7ca18359d78018f19dbd
\ No newline at end of file
diff --git a/libs/com/googlecode/D2Jar-obf/2.1v19/D2Jar-obf-2.1v19.jar b/libs/com/googlecode/D2Jar-obf/2.1v19/D2Jar-obf-2.1v19.jar
deleted file mode 100644
index ed532202..00000000
Binary files a/libs/com/googlecode/D2Jar-obf/2.1v19/D2Jar-obf-2.1v19.jar and /dev/null differ
diff --git a/libs/com/googlecode/D2Jar-obf/2.1v19/D2Jar-obf-2.1v19.jar.md5 b/libs/com/googlecode/D2Jar-obf/2.1v19/D2Jar-obf-2.1v19.jar.md5
deleted file mode 100644
index 3efb59a6..00000000
--- a/libs/com/googlecode/D2Jar-obf/2.1v19/D2Jar-obf-2.1v19.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-470df084337b7ef8e5fd9ada8359973d
\ No newline at end of file
diff --git a/libs/com/googlecode/D2Jar-obf/2.1v19/D2Jar-obf-2.1v19.jar.sha1 b/libs/com/googlecode/D2Jar-obf/2.1v19/D2Jar-obf-2.1v19.jar.sha1
deleted file mode 100644
index 5519f23e..00000000
--- a/libs/com/googlecode/D2Jar-obf/2.1v19/D2Jar-obf-2.1v19.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8c993a8b2dd652532c11b57d917e49c8d33efa45
\ No newline at end of file
diff --git a/libs/com/googlecode/D2Jar-obf/2.1v19/D2Jar-obf-2.1v19.pom b/libs/com/googlecode/D2Jar-obf/2.1v19/D2Jar-obf-2.1v19.pom
deleted file mode 100644
index df20c99d..00000000
--- a/libs/com/googlecode/D2Jar-obf/2.1v19/D2Jar-obf-2.1v19.pom
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.googlecode</groupId>
-  <artifactId>D2Jar-obf</artifactId>
-  <version>2.1v19</version>
-</project>
diff --git a/libs/com/googlecode/D2Jar-obf/2.1v19/D2Jar-obf-2.1v19.pom.md5 b/libs/com/googlecode/D2Jar-obf/2.1v19/D2Jar-obf-2.1v19.pom.md5
deleted file mode 100644
index 07042337..00000000
--- a/libs/com/googlecode/D2Jar-obf/2.1v19/D2Jar-obf-2.1v19.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-a738eb686cce7603fda0d7225d911bbb
\ No newline at end of file
diff --git a/libs/com/googlecode/D2Jar-obf/2.1v19/D2Jar-obf-2.1v19.pom.sha1 b/libs/com/googlecode/D2Jar-obf/2.1v19/D2Jar-obf-2.1v19.pom.sha1
deleted file mode 100644
index 145cc0b3..00000000
--- a/libs/com/googlecode/D2Jar-obf/2.1v19/D2Jar-obf-2.1v19.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d65e7ca6e8c1db7e923e9520f08a2c88b654ff11
\ No newline at end of file
diff --git a/libs/com/googlecode/D2Jar-obf/maven-metadata.xml b/libs/com/googlecode/D2Jar-obf/maven-metadata.xml
deleted file mode 100644
index 05aa97a0..00000000
--- a/libs/com/googlecode/D2Jar-obf/maven-metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata>
-  <groupId>com.googlecode</groupId>
-  <artifactId>D2Jar-obf</artifactId>
-  <versioning>
-    <release>2.1v19</release>
-    <versions>
-      <version>2.1v19</version>
-    </versions>
-    <lastUpdated>20210812114713</lastUpdated>
-  </versioning>
-</metadata>
diff --git a/libs/com/googlecode/D2Jar-obf/maven-metadata.xml.md5 b/libs/com/googlecode/D2Jar-obf/maven-metadata.xml.md5
deleted file mode 100644
index 5c5ee98b..00000000
--- a/libs/com/googlecode/D2Jar-obf/maven-metadata.xml.md5
+++ /dev/null
@@ -1 +0,0 @@
-5e0be1e48a1190b21b4514f83a1a2167
\ No newline at end of file
diff --git a/libs/com/googlecode/D2Jar-obf/maven-metadata.xml.sha1 b/libs/com/googlecode/D2Jar-obf/maven-metadata.xml.sha1
deleted file mode 100644
index 7ce239c6..00000000
--- a/libs/com/googlecode/D2Jar-obf/maven-metadata.xml.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4c3d40803e18e8b752368e2140a4e61a570b09f6
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 2220a998..26f54757 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,6 +13,10 @@
     </properties>
 
     <repositories>
+        <repository>
+            <id>google</id>
+            <url>https://maven.google.com/</url>
+        </repository>
         <repository>
             <id>local-maven-repo</id>
             <url>file:///${project.basedir}/libs</url>
@@ -108,6 +112,17 @@
             <groupId>org.jboss.windup.decompiler</groupId>
             <artifactId>decompiler-fernflower</artifactId>
             <version>5.2.0.Final</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.jboss.windup.decompiler.fernflower</groupId>
+                    <artifactId>windup-fernflower</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.github.ThexXTURBOXx</groupId>
+            <artifactId>fernflower</artifactId>
+            <version>47afd82034</version>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
@@ -200,19 +215,29 @@
             <version>1.1.4c</version>
         </dependency>
         <dependency>
-            <groupId>com.github.skylot</groupId>
-            <artifactId>JADX-Core</artifactId>
-            <version>1.0bcv</version>
+            <groupId>com.github.skylot.jadx</groupId>
+            <artifactId>jadx-core</artifactId>
+            <version>c28e8142f4</version>
         </dependency>
         <dependency>
-            <groupId>com.github.skylot</groupId>
-            <artifactId>JADX-Android</artifactId>
-            <version>5.1bcv</version>
+            <groupId>com.github.skylot.jadx</groupId>
+            <artifactId>jadx-java-convert</artifactId>
+            <version>c28e8142f4</version>
         </dependency>
         <dependency>
-            <groupId>com.googlecode</groupId>
-            <artifactId>D2Jar-obf</artifactId>
-            <version>2.1v19</version>
+            <groupId>com.github.skylot.jadx</groupId>
+            <artifactId>jadx-dex-input</artifactId>
+            <version>c28e8142f4</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.skylot.jadx</groupId>
+            <artifactId>jadx-smali-input</artifactId>
+            <version>c28e8142f4</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.ThexXTURBOXx</groupId>
+            <artifactId>dex2jar</artifactId>
+            <version>v23</version>
         </dependency>
         <dependency>
             <groupId>com.github.weisj</groupId>
diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/JADXDecompiler.java b/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/JADXDecompiler.java
index 66d1874d..8d78af0d 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/JADXDecompiler.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/JADXDecompiler.java
@@ -60,10 +60,11 @@ public class JADXDecompiler extends InternalDecompiler
         }
 
         File fuckery = new File(fuckery(fileStart));
+        fuckery.mkdirs();
         
         try {
             JadxArgs args = new JadxArgs();
-            args.getInputFiles().add(tempClass);
+            args.setInputFile(tempClass);
             args.setOutDir(fuckery);
             args.setOutDirSrc(fuckery);
             args.setOutDirRes(fuckery);