diff --git a/src/main/java/com/rarchives/ripme/ripper/DownloadFileThread.java b/src/main/java/com/rarchives/ripme/ripper/DownloadFileThread.java
index 498d081a..a6722971 100644
--- a/src/main/java/com/rarchives/ripme/ripper/DownloadFileThread.java
+++ b/src/main/java/com/rarchives/ripme/ripper/DownloadFileThread.java
@@ -24,7 +24,7 @@ import com.rarchives.ripme.utils.Utils;
  * Thread for downloading files. Includes retry logic, observer notifications,
  * and other goodies.
  */
-class DownloadFileThread extends Thread {
+class DownloadFileThread implements Runnable {
     private static final Logger logger = LogManager.getLogger(DownloadFileThread.class);
 
     private String referrer = "";
diff --git a/src/main/java/com/rarchives/ripme/ripper/DownloadThreadPool.java b/src/main/java/com/rarchives/ripme/ripper/DownloadThreadPool.java
index e3f9e79c..8ae43743 100644
--- a/src/main/java/com/rarchives/ripme/ripper/DownloadThreadPool.java
+++ b/src/main/java/com/rarchives/ripme/ripper/DownloadThreadPool.java
@@ -35,10 +35,10 @@ public class DownloadThreadPool {
     }
     /**
      * For adding threads to execution pool.
-     * @param t 
+     * @param t
      *      Thread to be added.
      */
-    public void addThread(Thread t) {
+    public void addThread(Runnable t) {
         threadPool.execute(t);
     }
 
diff --git a/src/main/java/com/rarchives/ripme/ripper/DownloadVideoThread.java b/src/main/java/com/rarchives/ripme/ripper/DownloadVideoThread.java
index 001e16ec..9430adce 100644
--- a/src/main/java/com/rarchives/ripme/ripper/DownloadVideoThread.java
+++ b/src/main/java/com/rarchives/ripme/ripper/DownloadVideoThread.java
@@ -20,15 +20,15 @@ import org.apache.logging.log4j.Logger;
  * Thread for downloading files.
  * Includes retry logic, observer notifications, and other goodies.
  */
-class DownloadVideoThread extends Thread {
+class DownloadVideoThread implements Runnable {
 
     private static final Logger logger = LogManager.getLogger(DownloadVideoThread.class);
 
-    private URL url;
-    private Path saveAs;
-    private String prettySaveAs;
-    private AbstractRipper observer;
-    private int retries;
+    private final URL url;
+    private final Path saveAs;
+    private final String prettySaveAs;
+    private final AbstractRipper observer;
+    private final int retries;
 
     public DownloadVideoThread(URL url, Path saveAs, AbstractRipper observer) {
         super();
@@ -43,6 +43,7 @@ class DownloadVideoThread extends Thread {
      * Attempts to download the file. Retries as needed.
      * Notifies observers upon completion/error/warn.
      */
+    @Override
     public void run() {
         try {
             observer.stopCheck();
diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/DeviantartRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/DeviantartRipper.java
index 99374ad1..d701f1f0 100644
--- a/src/main/java/com/rarchives/ripme/ripper/rippers/DeviantartRipper.java
+++ b/src/main/java/com/rarchives/ripme/ripper/rippers/DeviantartRipper.java
@@ -518,8 +518,8 @@ public class DeviantartRipper extends AbstractHTMLRipper {
 	 * @author MrPlaygon
 	 *
 	 */
-	private class DeviantartImageThread extends Thread {
-		private URL url;
+	private class DeviantartImageThread implements Runnable {
+		private final URL url;
 
 		public DeviantartImageThread(URL url) {
 			this.url = url;
diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/E621Ripper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/E621Ripper.java
index 21e0f866..13f75f22 100644
--- a/src/main/java/com/rarchives/ripme/ripper/rippers/E621Ripper.java
+++ b/src/main/java/com/rarchives/ripme/ripper/rippers/E621Ripper.java
@@ -193,10 +193,10 @@ public class E621Ripper extends AbstractHTMLRipper {
         return url;
     }
 
-    public class E621FileThread extends Thread {
+    public class E621FileThread implements Runnable {
 
-        private URL url;
-        private String index;
+        private final URL url;
+        private final String index;
 
         public E621FileThread(URL url, String index) {
             this.url = url;
diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/EHentaiRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/EHentaiRipper.java
index ba7e446d..97373e5e 100644
--- a/src/main/java/com/rarchives/ripme/ripper/rippers/EHentaiRipper.java
+++ b/src/main/java/com/rarchives/ripme/ripper/rippers/EHentaiRipper.java
@@ -206,7 +206,7 @@ public class EHentaiRipper extends AbstractHTMLRipper {
      * <p>
      * Handles case when site has IP-banned the user.
      */
-    private class EHentaiImageThread extends Thread {
+    private class EHentaiImageThread implements Runnable {
         private final URL url;
         private final int index;
         private final Path workingDir;
diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/HentaidudeRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/HentaidudeRipper.java
index 7950f0cf..2c7ae568 100644
--- a/src/main/java/com/rarchives/ripme/ripper/rippers/HentaidudeRipper.java
+++ b/src/main/java/com/rarchives/ripme/ripper/rippers/HentaidudeRipper.java
@@ -84,7 +84,7 @@ public class HentaidudeRipper extends AbstractSingleFileRipper {
         return hentaidudeThreadPool;
     }
 
-    private class HentaidudeDownloadThread extends Thread {
+    private class HentaidudeDownloadThread implements Runnable {
 
         private URL url;
 
diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/HqpornerRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/HqpornerRipper.java
index 8d13f113..17c379e3 100644
--- a/src/main/java/com/rarchives/ripme/ripper/rippers/HqpornerRipper.java
+++ b/src/main/java/com/rarchives/ripme/ripper/rippers/HqpornerRipper.java
@@ -130,7 +130,7 @@ public class HqpornerRipper extends AbstractHTMLRipper {
 		return true;
 	}
 
-	private class HqpornerDownloadThread extends Thread {
+	private class HqpornerDownloadThread implements Runnable {
 
 		private URL hqpornerVideoPageUrl;
 		//private int index;
diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/ImagebamRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/ImagebamRipper.java
index e233c03d..980f62b9 100644
--- a/src/main/java/com/rarchives/ripme/ripper/rippers/ImagebamRipper.java
+++ b/src/main/java/com/rarchives/ripme/ripper/rippers/ImagebamRipper.java
@@ -117,9 +117,9 @@ public class ImagebamRipper extends AbstractHTMLRipper {
      *
      * Handles case when site has IP-banned the user.
      */
-    private class ImagebamImageThread extends Thread {
-        private URL url; //link to "image page"
-        private int index; //index in album
+    private class ImagebamImageThread implements Runnable {
+        private final URL url; //link to "image page"
+        private final int index; //index in album
 
         ImagebamImageThread(URL url, int index) {
             super();
diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/ImagevenueRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/ImagevenueRipper.java
index f50a84a0..8e250ae9 100644
--- a/src/main/java/com/rarchives/ripme/ripper/rippers/ImagevenueRipper.java
+++ b/src/main/java/com/rarchives/ripme/ripper/rippers/ImagevenueRipper.java
@@ -79,9 +79,9 @@ public class ImagevenueRipper extends AbstractHTMLRipper {
      *
      * Handles case when site has IP-banned the user.
      */
-    private class ImagevenueImageThread extends Thread {
-        private URL url;
-        private int index;
+    private class ImagevenueImageThread implements Runnable {
+        private final URL url;
+        private final int index;
 
         ImagevenueImageThread(URL url, int index) {
             super();
diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/ListalRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/ListalRipper.java
index fed85531..e9f6deef 100644
--- a/src/main/java/com/rarchives/ripme/ripper/rippers/ListalRipper.java
+++ b/src/main/java/com/rarchives/ripme/ripper/rippers/ListalRipper.java
@@ -182,10 +182,10 @@ public class ListalRipper extends AbstractHTMLRipper {
         throw new MalformedURLException("Unable to fetch the gid for given url.");
     }
 
-    private class ListalImageDownloadThread extends Thread {
+    private class ListalImageDownloadThread implements Runnable {
 
-        private URL url;
-        private int index;
+        private final URL url;
+        private final int index;
 
         public ListalImageDownloadThread(URL url, int index) {
             super();
diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/LusciousRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/LusciousRipper.java
index 441fc10f..09fd8247 100644
--- a/src/main/java/com/rarchives/ripme/ripper/rippers/LusciousRipper.java
+++ b/src/main/java/com/rarchives/ripme/ripper/rippers/LusciousRipper.java
@@ -120,7 +120,7 @@ public class LusciousRipper extends AbstractHTMLRipper {
         }
     }
 
-    public class LusciousDownloadThread extends Thread {
+    public class LusciousDownloadThread implements Runnable {
         private final URL url;
         private final int index;
 
diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/MotherlessRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/MotherlessRipper.java
index 598cf5d4..46331c7b 100644
--- a/src/main/java/com/rarchives/ripme/ripper/rippers/MotherlessRipper.java
+++ b/src/main/java/com/rarchives/ripme/ripper/rippers/MotherlessRipper.java
@@ -152,9 +152,9 @@ public class MotherlessRipper extends AbstractHTMLRipper {
     /**
      * Helper class to find and download images found on "image" pages
      */
-    private class MotherlessImageThread extends Thread {
-        private URL url;
-        private int index;
+    private class MotherlessImageThread implements Runnable {
+        private final URL url;
+        private final int index;
 
         MotherlessImageThread(URL url, int index) {
             super();
diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/NfsfwRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/NfsfwRipper.java
index 86079edc..d0769138 100644
--- a/src/main/java/com/rarchives/ripme/ripper/rippers/NfsfwRipper.java
+++ b/src/main/java/com/rarchives/ripme/ripper/rippers/NfsfwRipper.java
@@ -196,10 +196,10 @@ public class NfsfwRipper extends AbstractHTMLRipper {
     /**
      * Helper class to find and download images found on "image" pages
      */
-    private class NfsfwImageThread extends Thread {
-        private URL url;
-        private String subdir;
-        private int index;
+    private class NfsfwImageThread implements Runnable {
+        private final URL url;
+        private final String subdir;
+        private final int index;
 
         NfsfwImageThread(URL url, String subdir, int index) {
             super();
diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/PornhubRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/PornhubRipper.java
index 0c0efd14..a215102e 100644
--- a/src/main/java/com/rarchives/ripme/ripper/rippers/PornhubRipper.java
+++ b/src/main/java/com/rarchives/ripme/ripper/rippers/PornhubRipper.java
@@ -126,9 +126,9 @@ public class PornhubRipper extends AbstractHTMLRipper {
      *
      * Handles case when site has IP-banned the user.
      */
-    private class PornhubImageThread extends Thread {
-        private URL url;
-        private int index;
+    private class PornhubImageThread implements Runnable {
+        private final URL url;
+        private final int index;
 
         PornhubImageThread(URL url, int index, Path workingDir) {
             super();