diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 7e62176b7..178bd8e2f 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -1,6 +1,9 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
+    <inspection_tool class="AutoCloseableResource" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="METHOD_MATCHER_CONFIG" value="java.util.Formatter,format,java.io.Writer,append,com.google.common.base.Preconditions,checkNotNull,org.hibernate.Session,close,java.io.PrintWriter,printf,java.io.PrintStream,printf,java.util.concurrent.Executors,newSingleThreadScheduledExecutor" />
+    </inspection_tool>
     <inspection_tool class="DuplicatedCode" enabled="true" level="WEAK WARNING" enabled_by_default="true">
       <Languages>
         <language minSize="57" name="Java" />
diff --git a/CLI/src/main/java/cli/support/Constants.java b/CLI/src/main/java/cli/support/Constants.java
index bedd84087..cef32bd13 100644
--- a/CLI/src/main/java/cli/support/Constants.java
+++ b/CLI/src/main/java/cli/support/Constants.java
@@ -13,11 +13,15 @@ public class Constants extends support.Constants {
     public static final String HELP_FLAG = "--help";
     public static final String NAME_FLAG = "--name";
     public static final String VERSION_FLAG = "--version";
+    public static final String UPDATE_FLAG = "--update";
+    public static final String EARLY_ACCESS_FLAG = "--early-access";
     public static final String LOCATION_FLAG = "--location";
     public static final String BATCH_FLAG = "--batch";
     public static final String HELP_FLAG_SHORT = "-h";
     public static final String NAME_FLAG_SHORT = "-n";
     public static final String VERSION_FLAG_SHORT = "-v";
+    public static final String UPDATE_FLAG_SHORT = "-u";
+    public static final String EARLY_ACCESS_FLAG_SHORT = "-ea";
     public static final String LOCATION_FLAG_SHORT = "-l";
     public static final String BATCH_FLAG_SHORT = "-b";
     public static final String REMOVE_ALL_URL_CONFIRMATION = "Are you sure you wish to delete ALL links? (Y/N): ";
diff --git a/CLI/src/main/java/cli/updater/CLIUpdateExecutor.java b/CLI/src/main/java/cli/updater/CLIUpdateExecutor.java
new file mode 100644
index 000000000..1a52e96e2
--- /dev/null
+++ b/CLI/src/main/java/cli/updater/CLIUpdateExecutor.java
@@ -0,0 +1,28 @@
+package cli.updater;
+
+import java.io.File;
+
+public class CLIUpdateExecutor extends updater.UpdateExecutor {
+    public CLIUpdateExecutor(File currentExecutableFile, File latestExecutableFile) {
+        super(currentExecutableFile, latestExecutableFile);
+    }
+
+    @Override
+    public boolean execute() {
+        M.msgLogInfo("Setting executable permission for the latest version of Drifty...");
+        if (setLatestExecutablePermissions()) {
+            M.msgLogInfo("Executable permission set! Executing update...");
+        } else {
+            M.msgUpdateError("Failed to set executable permission for the latest version of Drifty!");
+            return false;
+        }
+        cleanup(true); // This will delete the old executable created previously
+        if (renameCurrentExecutable()) {
+            if (replaceCurrentExecutable()) {
+                cleanup(false);
+                return true;
+            }
+        }
+        return false;
+    }
+}
diff --git a/CLI/src/main/java/cli/utils/MessageBroker.java b/CLI/src/main/java/cli/utils/MessageBroker.java
index 1ee235869..bb97fc6f6 100644
--- a/CLI/src/main/java/cli/utils/MessageBroker.java
+++ b/CLI/src/main/java/cli/utils/MessageBroker.java
@@ -30,4 +30,8 @@ public void msgHistoryWarning(String message, boolean endWithNewLine) {
         this.endWithNewLine = endWithNewLine;
         sendMessage(message, MessageType.WARN, MessageCategory.HISTORY);
     }
+
+    public void msgUpdateWarning(String message) {
+        sendMessage(message, MessageType.WARN, MessageCategory.UPDATE);
+    }
 }
diff --git a/CLI/src/main/java/cli/utils/Utility.java b/CLI/src/main/java/cli/utils/Utility.java
index 54c60d8d5..331c3546f 100644
--- a/CLI/src/main/java/cli/utils/Utility.java
+++ b/CLI/src/main/java/cli/utils/Utility.java
@@ -22,28 +22,32 @@ public static String findFilenameInLink(String link) {
             for (String json : Objects.requireNonNull(linkMetadataList)) {
                 filename = Utility.getFilenameFromJson(json);
             }
+            if (filename.isEmpty()) {
+                msgBroker.msgFilenameError("Filename detection failed: No filename found in metadata!");
+                return null;
+            }
         } else {
             // Example: "example.com/file.txt" prints "Filename detected: file.txt"
             // example.com/file.json -> file.json
             String file = link.substring(link.lastIndexOf("/") + 1);
             if (file.isEmpty()) {
-                M.msgFilenameError(FILENAME_DETECTION_ERROR);
+                msgBroker.msgFilenameError(FILENAME_DETECTION_ERROR);
                 return null;
             }
             int index = file.lastIndexOf(".");
             if (index < 0) {
-                M.msgFilenameError(FILENAME_DETECTION_ERROR);
+                msgBroker.msgFilenameError(FILENAME_DETECTION_ERROR);
                 return null;
             }
             String extension = file.substring(index);
             // edge case 1: "example.com/."
             if (extension.length() == 1) {
-                M.msgFilenameError(FILENAME_DETECTION_ERROR);
+                msgBroker.msgFilenameError(FILENAME_DETECTION_ERROR);
                 return null;
             }
             // file.png?width=200 -> file.png
             filename = file.split("([?])")[0];
-            M.msgFilenameInfo(FILENAME_DETECTED + "\"" + filename + "\"");
+            msgBroker.msgFilenameInfo(FILENAME_DETECTED + "\"" + filename + "\"");
         }
         return filename;
     }
@@ -51,7 +55,7 @@ public static String findFilenameInLink(String link) {
     public boolean yesNoValidation(String input, String printMessage) {
         while (input.isEmpty()) {
             Environment.getMessageBroker().msgInputError(ENTER_Y_OR_N, true);
-            M.msgLogError(ENTER_Y_OR_N);
+            msgBroker.msgLogError(ENTER_Y_OR_N);
             Environment.getMessageBroker().msgInputInfo(printMessage, false);
             input = SC.nextLine().toLowerCase();
         }
@@ -62,7 +66,7 @@ public boolean yesNoValidation(String input, String printMessage) {
             return false;
         } else {
             Environment.getMessageBroker().msgInputError("Invalid input!", true);
-            M.msgLogError("Invalid input!");
+            msgBroker.msgLogError("Invalid input!");
             Environment.getMessageBroker().msgInputInfo(printMessage, false);
             input = SC.nextLine().toLowerCase();
             return yesNoValidation(input, printMessage);
@@ -82,26 +86,26 @@ public static String getSpotifyDownloadLink(String spotifyMetadataJson) {
         ArrayList<HashMap<String, Object>> searchResults = getYoutubeSearchResults(query, true);
         boolean searchedWithFilters = true;
         if (searchResults == null) {
-            M.msgLogError("Failed to get search results for the song with filters! Trying without filters ...");
+            msgBroker.msgLogError("Failed to get search results for the song with filters! Trying without filters ...");
             searchResults = getYoutubeSearchResults(query, false);
             searchedWithFilters = false;
             if (searchResults == null) {
-                M.msgDownloadError("Song is exclusive to Spotify and cannot be downloaded!");
+                msgBroker.msgDownloadError("Song is exclusive to Spotify and cannot be downloaded!");
                 return null;
             }
         }
         String matchedId = getMatchingVideoID(Objects.requireNonNull(searchResults), duration, artistNames);
         if (matchedId.isEmpty()) {
             if (searchedWithFilters) {
-                M.msgLogError("Failed to get a matching video ID for the song with filters! Trying without filters ...");
+                msgBroker.msgLogError("Failed to get a matching video ID for the song with filters! Trying without filters ...");
                 searchResults = getYoutubeSearchResults(query, false);
                 matchedId = getMatchingVideoID(Objects.requireNonNull(searchResults), duration, artistNames);
                 if (matchedId.isEmpty()) {
-                    M.msgDownloadError("Song is exclusive to Spotify and cannot be downloaded!");
+                    msgBroker.msgDownloadError("Song is exclusive to Spotify and cannot be downloaded!");
                     return null;
                 }
             } else {
-                M.msgDownloadError("Song is exclusive to Spotify and cannot be downloaded!");
+                msgBroker.msgDownloadError("Song is exclusive to Spotify and cannot be downloaded!");
                 return null;
             }
         }
@@ -114,7 +118,7 @@ public static Yaml getYamlParser() {
         loaderOptions.setAllowRecursiveKeys(false);
         loaderOptions.setProcessComments(false);
         Yaml yamlParser = new Yaml(new SafeConstructor(loaderOptions));
-        M.msgLogInfo("YAML parser initialized successfully");
+        msgBroker.msgLogInfo("YAML parser initialized successfully");
         return yamlParser;
     }
 }
diff --git a/CLI/src/main/java/main/Drifty_CLI.java b/CLI/src/main/java/main/Drifty_CLI.java
index 80283d3fa..c5609029e 100644
--- a/CLI/src/main/java/main/Drifty_CLI.java
+++ b/CLI/src/main/java/main/Drifty_CLI.java
@@ -2,6 +2,7 @@
 
 import backend.FileDownloader;
 import cli.init.Environment;
+import cli.updater.CLIUpdateExecutor;
 import cli.utils.MessageBroker;
 import cli.utils.ScannerFactory;
 import cli.utils.Utility;
@@ -16,6 +17,7 @@
 import properties.Program;
 import support.Job;
 import support.JobHistory;
+import updater.UpdateChecker;
 import utils.Logger;
 
 import java.io.*;
@@ -51,10 +53,11 @@ public static void main(String[] args) {
         LOGGER.log(MessageType.INFO, CLI_APPLICATION_STARTED);
         messageBroker = new MessageBroker(System.out);
         Environment.setCLIMessageBroker(messageBroker);
+        utility = new Utility();
+        checkAndUpdateDrifty(true);
         messageBroker.msgInitInfo("Initializing environment...");
         Environment.initializeEnvironment();
         messageBroker.msgInitInfo("Environment initialized successfully!");
-        utility = new Utility();
         jobHistory = AppSettings.GET.jobHistory();
         printBanner();
         if (args.length > 0) {
@@ -89,6 +92,19 @@ public static void main(String[] args) {
                         printVersion();
                         Environment.terminate(0);
                     }
+                    case UPDATE_FLAG, UPDATE_FLAG_SHORT -> {
+                        if (Utility.isOffline()) {
+                            messageBroker.msgUpdateError("Failed to check for updates! You are not connected to the internet.");
+                            Environment.terminate(1);
+                        } else {
+                            checkAndUpdateDrifty(false);
+                        }
+                    }
+                    case EARLY_ACCESS_FLAG, EARLY_ACCESS_FLAG_SHORT -> {
+                        AppSettings.SET.earlyAccess(!AppSettings.GET.earlyAccess());
+                        messageBroker.msgInitInfo("Early access mode " + (AppSettings.GET.earlyAccess() ? "enabled!" : "disabled!"));
+                        Environment.terminate(0);
+                    }
                     case ADD_FLAG -> {
                         setYamlFilePath();
                         if (i + 1 < args.length) {
@@ -200,10 +216,14 @@ public static void main(String[] args) {
                             } else {
                                 fileName = findFilenameInLink(link);
                             }
-                            if (!Objects.requireNonNull(fileName).isEmpty()) {
+                            if (fileName != null && !fileName.isEmpty()) {
                                 verifyJobAndDownload(false);
                             }
                         }
+                    } else {
+                        fileName = name;
+                        messageBroker.msgFilenameInfo("Filename provided : " + fileName);
+                        verifyJobAndDownload(false);
                     }
                 }
             }
@@ -266,7 +286,7 @@ public static void main(String[] args) {
                         } else {
                             messageBroker.msgFilenameError(FILENAME_DETECTION_ERROR);
                         }
-                        if (!Objects.requireNonNull(fileName).isEmpty()) {
+                        if (fileName != null && !fileName.isEmpty()) {
                             verifyJobAndDownload(true);
                         }
                     }
@@ -276,7 +296,7 @@ public static void main(String[] args) {
                     }
                     messageBroker.msgFilenameInfo("Retrieving filename from link...");
                     fileName = findFilenameInLink(link);
-                    if (!Objects.requireNonNull(fileName).isEmpty()) {
+                    if (fileName != null && !fileName.isEmpty()) {
                         verifyJobAndDownload(true);
                     } else {
                         messageBroker.msgFilenameError("Failed to retrieve filename from link!");
@@ -294,22 +314,120 @@ public static void main(String[] args) {
         Environment.terminate(0);
     }
 
+    private static void checkAndUpdateDrifty(boolean askForInstallingUpdate) {
+        if (!isDriftyUpdateChecked() || !askForInstallingUpdate) {
+            messageBroker.msgInitInfo("Checking for updates...");
+            if (Utility.isOffline()) {
+                messageBroker.msgUpdateWarning("Failed to check for updates! You are not connected to the internet.");
+                if (!askForInstallingUpdate) { // For the case when updates are checked in the background
+                    Environment.terminate(1);
+                }
+            } else if (UpdateChecker.isUpdateAvailable()) {
+                handleUpdateAvailable(askForInstallingUpdate);
+            } else {
+                messageBroker.msgUpdateInfo("Drifty is up to date!");
+                if (!askForInstallingUpdate) { // For the case when updates are checked in the background
+                    Environment.terminate(0);
+                }
+            }
+        }
+    }
+
+    private static void handleUpdateAvailable(boolean askForInstallingUpdate) {
+        messageBroker.msgUpdateInfo("Update available!");
+        messageBroker.msgUpdateInfo("Latest version : " + AppSettings.GET.latestDriftyVersionTag() + " (" + AppSettings.GET.newDriftyVersionName() + ")");
+        if (Environment.hasAdminPrivileges()) {
+            boolean choice = true;
+            if (askForInstallingUpdate) {
+                choice = getUserConfirmation();
+            }
+            if (!choice) {
+                messageBroker.msgUpdateInfo("Drifty update cancelled!");
+            } else {
+                downloadAndUpdate();
+            }
+        } else {
+            handleAdminPrivilegesRequired(askForInstallingUpdate);
+        }
+    }
+
+    private static boolean getUserConfirmation() {
+        messageBroker.msgUpdateInfo("Do you want to download the update? (Enter Y for yes and N for no) : ");
+        String choiceString = SC.nextLine().toLowerCase();
+        return utility.yesNoValidation(choiceString, "Do you want to download the update? (Enter Y for yes and N for no) : ");
+    }
+
+    private static void downloadAndUpdate() {
+        messageBroker.msgUpdateInfo("Downloading update...");
+        if (!downloadUpdate()) {
+            messageBroker.msgUpdateError("Failed to update Drifty!");
+            Environment.terminate(1);
+        } else {
+            messageBroker.msgUpdateInfo("Update successful!");
+            messageBroker.msgUpdateInfo("Please restart Drifty to see the changes!");
+            Environment.terminate(0);
+        }
+    }
+
+    private static void handleAdminPrivilegesRequired(boolean askForInstallingUpdate) {
+        if (askForInstallingUpdate) {
+            messageBroker.msgUpdateWarning("Drifty update requires administrator privileges!");
+            messageBroker.msgUpdateWarning("Please run Drifty with administrator privileges to update!");
+        } else {
+            messageBroker.msgUpdateError("Drifty update requires administrator privileges!");
+            messageBroker.msgUpdateError("Please run Drifty with administrator privileges to update!");
+            Environment.terminate(1);
+        }
+    }
+
+    private static boolean isDriftyUpdateChecked() {
+        long timeSinceLastUpdate = System.currentTimeMillis() - AppSettings.GET.lastDriftyUpdateTime();
+        return timeSinceLastUpdate <= ONE_DAY;
+    }
+
+    private static boolean downloadUpdate() {
+        try {
+            // "Current executable" means the executable currently running i.e., the one that is outdated.
+            File currentExecutableFile = new File(Drifty_CLI.class.getProtectionDomain().getCodeSource().getLocation().toURI());
+            // "Latest executable" means the executable that is to be downloaded and installed i.e., the latest version.
+            // "tmpFolder" is the temporary folder where the latest executable will be downloaded to.
+            File tmpFolder = Files.createTempDirectory("Drifty").toFile();
+            tmpFolder.deleteOnExit();
+            File latestExecutableFile = Paths.get(tmpFolder.getPath()).resolve(currentExecutableFile.getName()).toFile();
+            FileDownloader downloader = new FileDownloader(updateURL.toString(), currentExecutableFile.getName(), tmpFolder.toString(), false);
+            downloader.run();
+            if (latestExecutableFile.exists() && latestExecutableFile.isFile() && latestExecutableFile.length() > 0) {
+                // If the latest executable was successfully downloaded, set the executable permission and execute the update.
+                CLIUpdateExecutor updateExecutor = new CLIUpdateExecutor(currentExecutableFile, latestExecutableFile);
+                return updateExecutor.execute();
+            } else {
+                messageBroker.msgUpdateError("Failed to download update!");
+                return false;
+            }
+        } catch (IOException e) {
+            messageBroker.msgUpdateError("Failed to create temporary folder for downloading update! " + e.getMessage());
+        } catch (URISyntaxException e) {
+            messageBroker.msgUpdateError("Failed to get the location of the current executable! " + e.getMessage());
+        } catch (Exception e) {
+            messageBroker.msgUpdateError("Failed to update Drifty! " + e.getMessage());
+        }
+        return false;
+    }
+
     private static void printVersion() {
         System.out.println("\033[1m" + APPLICATION_NAME + " " + VERSION_NUMBER + ANSI_RESET);
         if (AppSettings.GET.ytDlpVersion().isEmpty()) {
             Utility.setYtDlpVersion().run();
         }
         System.out.println("yt-dlp version : " + AppSettings.GET.ytDlpVersion());
-        if (AppSettings.GET.isFfmpegWorking()) {
-            if (AppSettings.GET.ffmpegVersion().isEmpty()) {
-                Thread ffmpegVersion = new Thread(utils.Utility::setFfmpegVersion);
-                ffmpegVersion.start();
-                while (ffmpegVersion.isAlive()) {
-                    sleep(100);
-                }
+        if (AppSettings.GET.ffmpegVersion().isEmpty()) {
+            Thread ffmpegVersion = new Thread(utils.Utility::setFfmpegVersion);
+            ffmpegVersion.start();
+            while (ffmpegVersion.isAlive()) {
+                sleep(100);
             }
-            System.out.println("FFMPEG version : " + AppSettings.GET.ffmpegVersion());
         }
+        System.out.println("FFMPEG version : " + AppSettings.GET.ffmpegVersion());
     }
 
     private static void handleSpotifyPlaylist() {
@@ -437,7 +555,7 @@ private static void batchDownloader() {
                 }
                 if (isSpotifyLink && link.contains("playlist")) {
                     handleSpotifyPlaylist();
-                } else if (!Objects.requireNonNull(fileName).isEmpty()) {
+                } else if (fileName != null && !fileName.isEmpty()) {
                     verifyJobAndDownload(false);
                 }
             }
@@ -505,20 +623,22 @@ private static String getProperDownloadsFolder(String downloadsFolder) {
     }
 
     public static void help() {
-        System.out.println(ANSI_RESET + "\n\033[38;31;48;40;1m-----------------------==| DRIFTY CLI HELP |==----------------------" + ANSI_RESET);
+        System.out.println(ANSI_RESET + "\n\033[38;31;48;40;1m------------------------==| DRIFTY CLI HELP |==------------------------" + ANSI_RESET);
         System.out.println("\033[38;31;48;40;0m\t\t\t\t\t\t\t" + VERSION_NUMBER + ANSI_RESET);
         System.out.println("\033[31;1mRequired parameter: File URL" + ANSI_RESET);
         System.out.println("\033[33;1mOptional parameters:");
-        System.out.println("\033[97;1mName        ShortForm     Default                  Description" + ANSI_RESET);
-        System.out.println("--batch      -b            N/A                      The path to the yaml/yml file containing the links and other arguments");
-        System.out.println("--location   -l            Downloads                The location on your computer where file downloaded using Drifty are placed");
-        System.out.println("--name       -n            Source                   Filename of the downloaded file");
-        System.out.println("--help       -h            N/A                      Prints this help menu");
-        System.out.println("--version    -v            Current Version          Displays version number of Drifty");
-        System.out.println("--add        N/A           N/A                      Add URL(s) to the links queue");
-        System.out.println("--remove     N/A           N/A                      Remove URL(s) from the links queue");
-        System.out.println("--list       N/A           N/A                      List all the URLs in the links queue");
-        System.out.println("--get        N/A           N/A                      Download all the URLs in the links queue");
+        System.out.println("\033[97;1mName           ShortForm     Default                  Description" + ANSI_RESET);
+        System.out.println("--batch         -b            N/A                      The path to the YAML file containing the links and other arguments");
+        System.out.println("--location      -l            Downloads folder         The folder where the downloaded file(s) will be saved");
+        System.out.println("--name          -n            Source                   Filename of the downloaded file");
+        System.out.println("--help          -h            N/A                      Prints this help menu");
+        System.out.println("--version       -v            Current Version          Displays version number of Drifty");
+        System.out.println("--update        -u            N/A                      Updates Drifty CLI to the latest version");
+        System.out.println("--early-access  -ea           Disabled by default      Toggle early access mode");
+        System.out.println("--add           N/A           N/A                      Add URL(s) to the links queue");
+        System.out.println("--remove        N/A           N/A                      Remove URL(s) from the links queue");
+        System.out.println("--list          N/A           N/A                      List all the URLs in the links queue");
+        System.out.println("--get           N/A           N/A                      Download all the URLs in the links queue");
         System.out.println("\033[97;1mSee full documentation at https://github.com/SaptarshiSarkar12/Drifty#readme" + ANSI_RESET);
         System.out.println("For more information visit: ");
         System.out.println("\tProject Link - https://github.com/SaptarshiSarkar12/Drifty/");
diff --git a/CLI/src/main/resources/META-INF/native-image/jni-config.json b/CLI/src/main/resources/META-INF/native-image/jni-config.json
index 9e2ecec55..369030359 100644
--- a/CLI/src/main/resources/META-INF/native-image/jni-config.json
+++ b/CLI/src/main/resources/META-INF/native-image/jni-config.json
@@ -7,6 +7,10 @@
   "name":"java.lang.InternalError",
   "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
 },
+{
+  "name":"main.Drifty_CLI",
+  "methods":[{"name":"main","parameterTypes":["java.lang.String[]"] }]
+},
 {
   "name":"sun.instrument.InstrumentationImpl",
   "methods":[{"name":"<init>","parameterTypes":["long","boolean","boolean","boolean"] }, {"name":"loadClassAndCallAgentmain","parameterTypes":["java.lang.String","java.lang.String"] }, {"name":"loadClassAndCallPremain","parameterTypes":["java.lang.String","java.lang.String"] }, {"name":"transform","parameterTypes":["java.lang.Module","java.lang.ClassLoader","java.lang.String","java.lang.Class","java.security.ProtectionDomain","byte[]","boolean"] }]
diff --git a/CLI/src/main/resources/META-INF/native-image/reflect-config.json b/CLI/src/main/resources/META-INF/native-image/reflect-config.json
index 787625398..cbcb4727b 100644
--- a/CLI/src/main/resources/META-INF/native-image/reflect-config.json
+++ b/CLI/src/main/resources/META-INF/native-image/reflect-config.json
@@ -44,6 +44,10 @@
   "name":"com.sun.crypto.provider.GaloisCounterMode$AESGCM",
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+  "name":"com.sun.crypto.provider.HmacCore$HmacSHA256",
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
 {
   "name":"com.sun.crypto.provider.HmacCore$HmacSHA384",
   "methods":[{"name":"<init>","parameterTypes":[] }]
@@ -110,6 +114,14 @@
   "name":"java.util.concurrent.ForkJoinTask",
   "fields":[{"name":"aux"}, {"name":"status"}]
 },
+{
+  "name":"java.util.concurrent.atomic.AtomicBoolean",
+  "fields":[{"name":"value"}]
+},
+{
+  "name":"java.util.concurrent.atomic.AtomicReference",
+  "fields":[{"name":"value"}]
+},
 {
   "name":"java.util.concurrent.atomic.Striped64",
   "fields":[{"name":"base"}, {"name":"cellsBusy"}]
diff --git a/CLI/src/main/resources/META-INF/native-image/resource-config.json b/CLI/src/main/resources/META-INF/native-image/resource-config.json
index fda477614..c60492f05 100644
--- a/CLI/src/main/resources/META-INF/native-image/resource-config.json
+++ b/CLI/src/main/resources/META-INF/native-image/resource-config.json
@@ -6,6 +6,8 @@
     "pattern":"\\QMETA-INF/services/java.net.spi.InetAddressResolverProvider\\E"
   }, {
     "pattern":"\\QMETA-INF/services/java.net.spi.URLStreamHandlerProvider\\E"
+  }, {
+    "pattern":"\\QMETA-INF/services/java.nio.channels.spi.SelectorProvider\\E"
   }, {
     "pattern":"\\QMETA-INF/services/java.nio.charset.spi.CharsetProvider\\E"
   }, {
diff --git a/Core/src/main/java/init/Environment.java b/Core/src/main/java/init/Environment.java
index d5b118369..7708c040e 100644
--- a/Core/src/main/java/init/Environment.java
+++ b/Core/src/main/java/init/Environment.java
@@ -3,13 +3,17 @@
 import preferences.AppSettings;
 import properties.OS;
 import properties.Program;
+import updater.UpdateChecker;
 import utils.CopyExecutables;
 import utils.MessageBroker;
 import utils.Utility;
 
 import java.io.File;
 import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.file.AccessDeniedException;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
@@ -18,6 +22,7 @@
 
 public class Environment {
     private static MessageBroker msgBroker = Environment.getMessageBroker();
+    private static boolean isAdministrator;
 
     /*
     This method is called by both CLI.Main and GUI.Forms.Main classes.
@@ -27,6 +32,9 @@ public class Environment {
     */
     public static void initializeEnvironment() {
         msgBroker.msgLogInfo("OS : " + OS.getOSName());
+        Utility.initializeUtility(); // Lazy initialization of the MessageBroker in Utility class
+        isAdministrator = hasAdminPrivileges();
+        new Thread(() -> AppSettings.SET.driftyUpdateAvailable(UpdateChecker.isUpdateAvailable())).start();
         ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor();
         executor.scheduleAtFixedRate(Utility.setSpotifyAccessToken(), 0, 3480, java.util.concurrent.TimeUnit.SECONDS); // Thread to refresh Spotify access token every 58 minutes
         String ffmpegExecName = "";
@@ -49,7 +57,7 @@ public static void initializeEnvironment() {
         CopyExecutables copyExecutables = new CopyExecutables(new String[]{ytDlpExecName, ffmpegExecName});
         try {
             copyExecutables.start();
-            if (!isYtDLPUpdated()) {
+            if (!isYtDLPUpdated() && !Utility.isOffline()) {
                 checkAndUpdateYtDlp();
             }
         } catch (IOException e) {
@@ -107,6 +115,37 @@ public static boolean isYtDLPUpdated() {
         return timeSinceLastUpdate <= oneDay;
     }
 
+    public static boolean hasAdminPrivileges() {
+        try {
+            msgBroker.msgLogInfo("Determining current executable folder path...");
+            Path currentExecutableFolderPath = Paths.get(Utility.class.getProtectionDomain().getCodeSource().getLocation().toURI()).getParent();
+            msgBroker.msgLogInfo("Current executable folder path: " + currentExecutableFolderPath);
+
+            Path adminTestFilePath = currentExecutableFolderPath.resolve("adminTestFile.txt");
+            msgBroker.msgLogInfo("Creating test file at: " + adminTestFilePath);
+            Files.createFile(adminTestFilePath);
+
+            msgBroker.msgLogInfo("Deleting test file at: " + adminTestFilePath);
+            Files.deleteIfExists(adminTestFilePath);
+
+            msgBroker.msgLogInfo("Admin privileges confirmed.");
+            return true;
+        } catch (URISyntaxException e) {
+            msgBroker.msgInitError("Failed to get the current executable path! " + e.getMessage());
+            return false;
+        } catch (AccessDeniedException e) {
+            msgBroker.msgInitError("You are not running Drifty as an administrator! " + e.getMessage());
+            return false;
+        } catch (IOException e) {
+            msgBroker.msgInitError("Failed to create a file in the current executable folder! " + e.getMessage());
+            return false;
+        }
+    }
+
+    public static boolean isAdministrator() {
+        return isAdministrator;
+    }
+
     public static MessageBroker getMessageBroker() {
         return msgBroker;
     }
diff --git a/Core/src/main/java/module-info.java b/Core/src/main/java/module-info.java
index 2b78ba99b..565320af2 100644
--- a/Core/src/main/java/module-info.java
+++ b/Core/src/main/java/module-info.java
@@ -10,6 +10,7 @@
     exports preferences;
     exports properties;
     exports support;
+    exports updater;
     exports utils;
     opens support to com.google.gson;
 }
\ No newline at end of file
diff --git a/Core/src/main/java/preferences/Clear.java b/Core/src/main/java/preferences/Clear.java
index 8ed2250b0..51d107df2 100644
--- a/Core/src/main/java/preferences/Clear.java
+++ b/Core/src/main/java/preferences/Clear.java
@@ -38,4 +38,24 @@ public void ytDlpUpdating() {
     public void isFfmpegWorking() {
         preferences.remove(IS_FFMPEG_WORKING);
     }
+
+    public void earlyAccess() {
+        preferences.remove(EARLY_ACCESS);
+    }
+
+    public void newDriftyVersionName() {
+        preferences.remove(NEW_DRIFTY_VERSION_NAME);
+    }
+
+    public void lastDriftyUpdateTime() {
+        preferences.remove(LAST_DRIFTY_UPDATE_TIME);
+    }
+
+    public void latestDriftyVersionTag() {
+        preferences.remove(LATEST_DRIFTY_VERSION_TAG);
+    }
+
+    public void driftyUpdateAvailable() {
+        preferences.remove(DRIFTY_UPDATE_AVAILABLE);
+    }
 }
diff --git a/Core/src/main/java/preferences/Get.java b/Core/src/main/java/preferences/Get.java
index 567209e7d..77c2f5b04 100644
--- a/Core/src/main/java/preferences/Get.java
+++ b/Core/src/main/java/preferences/Get.java
@@ -101,4 +101,24 @@ public boolean ytDlpUpdating() {
     public boolean isFfmpegWorking() {
         return preferences.getBoolean(IS_FFMPEG_WORKING, false);
     }
+
+    public boolean earlyAccess() {
+        return preferences.getBoolean(EARLY_ACCESS, false);
+    }
+
+    public String newDriftyVersionName() {
+        return preferences.get(NEW_DRIFTY_VERSION_NAME, "");
+    }
+
+    public long lastDriftyUpdateTime() {
+        return preferences.getLong(LAST_DRIFTY_UPDATE_TIME, 1000L);
+    }
+
+    public String latestDriftyVersionTag() {
+        return preferences.get(LATEST_DRIFTY_VERSION_TAG, "");
+    }
+
+    public boolean driftyUpdateAvailable() {
+        return preferences.getBoolean(DRIFTY_UPDATE_AVAILABLE, false);
+    }
 }
diff --git a/Core/src/main/java/preferences/Labels.java b/Core/src/main/java/preferences/Labels.java
index 9c5733e38..23809afc0 100644
--- a/Core/src/main/java/preferences/Labels.java
+++ b/Core/src/main/java/preferences/Labels.java
@@ -11,4 +11,9 @@ public interface Labels {
     String SPOTIFY_ACCESS_TOKEN = "SPOTIFY_ACCESS_TOKEN";
     String IS_FFMPEG_WORKING = "IS_FFMPEG_WORKING";
     String FFMPEG_VERSION = "FFMPEG_VERSION";
+    String NEW_DRIFTY_VERSION_NAME = "NEW_DRIFTY_VERSION_NAME";
+    String LATEST_DRIFTY_VERSION_TAG = "LATEST_DRIFTY_VERSION_TAG";
+    String LAST_DRIFTY_UPDATE_TIME = "LAST_DRIFTY_UPDATE_TIME";
+    String EARLY_ACCESS = "EARLY_ACCESS";
+    String DRIFTY_UPDATE_AVAILABLE = "DRIFTY_UPDATE_AVAILABLE";
 }
diff --git a/Core/src/main/java/preferences/Set.java b/Core/src/main/java/preferences/Set.java
index 42feb7b30..b37e9dc41 100644
--- a/Core/src/main/java/preferences/Set.java
+++ b/Core/src/main/java/preferences/Set.java
@@ -99,4 +99,29 @@ public void isFfmpegWorking(boolean isWorking) {
         AppSettings.CLEAR.isFfmpegWorking();
         preferences.putBoolean(IS_FFMPEG_WORKING, isWorking);
     }
+
+    public void earlyAccess(boolean isEarlyAccess) {
+        AppSettings.CLEAR.earlyAccess();
+        preferences.putBoolean(EARLY_ACCESS, isEarlyAccess);
+    }
+
+    public void newDriftyVersionName(String versionName) {
+        AppSettings.CLEAR.newDriftyVersionName();
+        preferences.put(NEW_DRIFTY_VERSION_NAME, versionName);
+    }
+
+    public void lastDriftyUpdateTime(long value) {
+        AppSettings.CLEAR.lastDriftyUpdateTime();
+        preferences.putLong(LAST_DRIFTY_UPDATE_TIME, value);
+    }
+
+    public void latestDriftyVersionTag(String tag) {
+        AppSettings.CLEAR.latestDriftyVersionTag();
+        preferences.put(LATEST_DRIFTY_VERSION_TAG, tag);
+    }
+
+    public void driftyUpdateAvailable(boolean isUpdateAvailable) {
+        AppSettings.CLEAR.driftyUpdateAvailable();
+        preferences.putBoolean(DRIFTY_UPDATE_AVAILABLE, isUpdateAvailable);
+    }
 }
diff --git a/Core/src/main/java/properties/MessageCategory.java b/Core/src/main/java/properties/MessageCategory.java
index deabb5351..5a40e4ba4 100644
--- a/Core/src/main/java/properties/MessageCategory.java
+++ b/Core/src/main/java/properties/MessageCategory.java
@@ -1,5 +1,5 @@
 package properties;
 
 public enum MessageCategory {
-    LINK, DIRECTORY, DOWNLOAD, FILENAME, LOG, INITIALIZATION, BATCH, INPUT, STYLE, HISTORY
+    LINK, DIRECTORY, DOWNLOAD, FILENAME, LOG, INITIALIZATION, BATCH, INPUT, STYLE, HISTORY, UPDATE
 }
diff --git a/Core/src/main/java/support/Constants.java b/Core/src/main/java/support/Constants.java
index 5d7cb4445..a92cf37c5 100644
--- a/Core/src/main/java/support/Constants.java
+++ b/Core/src/main/java/support/Constants.java
@@ -1,5 +1,12 @@
 package support;
 
+import init.Environment;
+import utils.Utility;
+
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.net.URL;
+
 public class Constants {
     public static final String APPLICATION_NAME = "Drifty";
     public static final String VERSION_NUMBER = "v2.1.0-beta.1";
@@ -17,6 +24,17 @@ public class Constants {
     public static final String PERMISSION_DENIED = "You do not have access to download the video, permission is denied.";
     public static final String DRIFTY_COMPONENT_NOT_EXECUTABLE = "A Drifty component (yt-dlp) is not marked as executable.";
     public static final String USER_AGENT = "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36 Edg/122.0.0.0";
+    public static final long ONE_DAY = 86400000; // Value of one day (24 Hours) in milliseconds
+    public static URL updateURL;
+
+    static {
+        try {
+            updateURL = Utility.getUpdateURL();
+        } catch (MalformedURLException | URISyntaxException e) {
+            Environment.getMessageBroker().msgUpdateError("Drifty update URL is invalid! " + e.getMessage());
+            updateURL = null;
+        }
+    }
 
     /*
     Denoting a Constant with _F indicates that it needs to be used with String.format(), where %s is replaced with the
diff --git a/Core/src/main/java/updater/UpdateChecker.java b/Core/src/main/java/updater/UpdateChecker.java
new file mode 100644
index 000000000..c0cda626d
--- /dev/null
+++ b/Core/src/main/java/updater/UpdateChecker.java
@@ -0,0 +1,153 @@
+package updater;
+
+import init.Environment;
+import preferences.AppSettings;
+import properties.MessageCategory;
+import support.Constants;
+import utils.MessageBroker;
+import utils.Utility;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+
+public class UpdateChecker {
+    private static final String CURRENT_VERSION = Constants.VERSION_NUMBER.replace("v", "");
+    private static final MessageBroker M = Environment.getMessageBroker();
+
+    public static boolean isUpdateAvailable() {
+        if (Utility.isOffline()) {
+            M.msgLogError("Failed to check for updates! You are not connected to the internet.");
+            return false;
+        }
+        String latestVersion;
+        if (AppSettings.GET.earlyAccess()) {
+            latestVersion = getLatestPreReleaseVersion();
+        } else {
+            latestVersion = getLatestStableVersion();
+        }
+        M.msgLogInfo("Latest version : " + latestVersion);
+        M.msgLogInfo("Current version : " + CURRENT_VERSION);
+        if (latestVersion.isEmpty()) {
+            return false;
+        }
+        AppSettings.SET.lastDriftyUpdateTime(System.currentTimeMillis());
+        return compareVersions(CURRENT_VERSION, latestVersion);
+    }
+
+    private static String getLatestStableVersion() {
+        try {
+            HttpRequest request = HttpRequest.newBuilder()
+                    .uri(new URI("https://api.github.com/repos/SaptarshiSarkar12/Drifty/releases/latest"))
+                    .header("Accept", "application/vnd.github.v3+json")
+                    .build();
+            return getReleaseTag(request);
+        } catch (URISyntaxException e) {
+            M.msgUpdateError("Failed to fetch stable release data from GitHub api! " + e.getMessage());
+            return "";
+        }
+    }
+
+    private static String getLatestPreReleaseVersion() {
+        try {
+            HttpRequest request = HttpRequest.newBuilder()
+                    .uri(new URI("https://api.github.com/repos/SaptarshiSarkar12/Drifty/releases"))
+                    .header("Accept", "application/vnd.github.v3+json")
+                    .build();
+            return getReleaseTag(request);
+        } catch (URISyntaxException e) {
+            M.msgUpdateError("Failed to fetch pre-release data from GitHub api! " + e.getMessage());
+            return "";
+        }
+    }
+
+    private static String getReleaseTag(HttpRequest request) {
+        try (HttpClient client = HttpClient.newHttpClient()) {
+            String responseBody = client.send(request, HttpResponse.BodyHandlers.ofString()).body();
+            String tag = responseBody.split("\"tag_name\":\"")[1].split("\"")[0];
+            AppSettings.SET.newDriftyVersionName(responseBody.split("\"name\":\"")[1].split("\"")[0]);
+            AppSettings.SET.latestDriftyVersionTag(tag);
+            return tag.replace("v", "");
+        } catch (IOException e) {
+            if (e.getMessage() == null) {
+                M.msgLogError("Failed to check for updates! You may be offline.");
+            } else {
+                if (e.getMessage().contains("403")) {
+                    M.msgUpdateError("Failed to check for updates! GitHub API rate limit exceeded. " + e.getMessage());
+                } else {
+                    M.msgUpdateError("Failed to check for updates! " + e.getMessage());
+                }
+            }
+            return "";
+        } catch (InterruptedException e) {
+            M.msgUpdateError("User interrupted the update check! " + e.getMessage());
+            return "";
+        }
+    }
+
+    public static boolean compareVersions(String currentVersion, String latestVersion) {
+        if (currentVersion.equals(latestVersion)) {
+            return false;
+        }
+        String[] currentVersionParts = getTagParts(currentVersion);
+        String[] latestVersionParts = getTagParts(latestVersion);
+        // Check major, minor, and patch versions
+        for (int i = 0; i < 3; i++) {
+            int cvPart = Utility.parseStringToInt(currentVersionParts[i], "Failed to parse current version part " + i, MessageCategory.UPDATE);
+            int lvPart = Utility.parseStringToInt(latestVersionParts[i], "Failed to parse latest version part " + i, MessageCategory.UPDATE);
+
+            if (cvPart < lvPart) {
+                return true;
+            } else if (cvPart > lvPart) {
+                return false;
+            }
+        }
+
+        if (currentVersionParts.length == 3 && latestVersionParts.length == 5) {
+            // Example: currentVersion = v2.1.0 and latestVersion = v2.1.0-beta.1
+            // currentVersion is a stable release version, and the latestVersion is a pre-release version
+            // So, the currentVersion is greater than latestVersion as currentVersion is a stable version
+            return false;
+        } else if (currentVersionParts.length == 5 && latestVersionParts.length == 3) {
+            // Example: currentVersion = v2.1.0-beta.1 and latestVersion = v2.1.0
+            // currentVersion is a pre-release version, and the latestVersion is a release version
+            // So, the currentVersion is less than latestVersion as latestVersion is a stable version
+            return true;
+        } else if (currentVersionParts.length == 5 && latestVersionParts.length == 5) {
+            if (AppSettings.GET.earlyAccess()) { // If the user has enabled early access, then pre-release versions are considered
+                // Both versions are pre-release versions
+                int comparePreReleaseType = currentVersionParts[3].compareTo(latestVersionParts[3]); // alpha < beta < rc (compared lexicographically)
+                // Example: currentVersion = v2.1.0-beta.1 and latestVersion = v2.1.0-alpha.1
+                // beta > alpha, so the currentVersion is greater than the latestVersion. Return false
+                // Example: currentVersion = v2.1.0-beta.1, and latestVersion = v2.1.0-rc.1
+                // beta < rc, so the currentVersion is less than the latestVersion. Return true
+                if (comparePreReleaseType < 0) {
+                    return true;
+                } else if (comparePreReleaseType > 0) {
+                    return false;
+                } else {
+                    // Both versions have the same pre-release type (alpha, beta, rc)
+                    // Higher Revision number means a newer version
+                    int cvRevisionNumber = Utility.parseStringToInt(currentVersionParts[4], "Failed to parse current version's revision number", MessageCategory.UPDATE);
+                    int lvRevisionNumber = Utility.parseStringToInt(latestVersionParts[4], "Failed to parse latest version's revision number", MessageCategory.UPDATE);
+                    return cvRevisionNumber < lvRevisionNumber;
+                }
+            }
+        }
+        return false; // Both versions are equal
+    }
+
+    private static String[] getTagParts(String tag) {
+        if (tag.contains("-")) {
+            String[] versionAndReleaseCode = tag.replace("v", "").split("-"); // Example: v2.1.0-beta.1 => [2.1.0, beta.1]
+            String[] releaseTypeAndNumber = versionAndReleaseCode[1].split("\\."); // Example: beta.1 => [beta, 1]
+            String[] versionParts = versionAndReleaseCode[0].split("\\."); // Example: 2.1.0 => [2, 1, 0]
+            return new String[]{versionParts[0], versionParts[1], versionParts[2], releaseTypeAndNumber[0], releaseTypeAndNumber[1]};
+        } else {
+            return tag.replace("v", "").split("\\."); // Example: v2.1.0 => [2, 1, 0]
+        }
+    }
+}
diff --git a/Core/src/main/java/updater/UpdateExecutor.java b/Core/src/main/java/updater/UpdateExecutor.java
new file mode 100644
index 000000000..283c26c6c
--- /dev/null
+++ b/Core/src/main/java/updater/UpdateExecutor.java
@@ -0,0 +1,87 @@
+package updater;
+
+import init.Environment;
+import preferences.AppSettings;
+import properties.OS;
+import utils.MessageBroker;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
+
+public abstract class UpdateExecutor {
+    protected static final MessageBroker M = Environment.getMessageBroker();
+    protected File oldExecutableFile;
+    protected File currentExecutableFile;
+    protected File latestExecutableFile;
+
+    protected UpdateExecutor(File currentExecutableFile, File latestExecutableFile) {
+        this.currentExecutableFile = currentExecutableFile;
+        this.latestExecutableFile = latestExecutableFile;
+        this.oldExecutableFile = Paths.get(currentExecutableFile.getParent()).resolve(currentExecutableFile.getName() + ".old").toFile();
+    }
+
+    protected boolean setLatestExecutablePermissions() {
+        return setPermission("executable") && setPermission("writeable") && setPermission("readable");
+    }
+
+    private boolean setPermission(String permissionType) {
+        boolean granted = switch (permissionType) {
+            case "executable" -> latestExecutableFile.setExecutable(true);
+            case "writeable" -> latestExecutableFile.setWritable(true);
+            case "readable" -> latestExecutableFile.setReadable(true);
+            default -> false;
+        };
+        if (!granted) {
+            M.msgUpdateError("Failed to set " + permissionType + " permission for the latest version of Drifty!");
+        }
+        return granted;
+    }
+
+    protected void cleanup(boolean deleteImmediately) {
+        try {
+            if (deleteImmediately || !OS.isWindows()) {
+                Files.deleteIfExists(oldExecutableFile.toPath());
+            } else {
+                oldExecutableFile.deleteOnExit();
+            }
+            if (!deleteImmediately) {
+                Environment.terminate(0);
+            }
+        } catch (IOException e) {
+            M.msgUpdateError("Failed to delete the old version of Drifty!\n" + e.getMessage());
+        } finally {
+            if (!deleteImmediately) {
+                AppSettings.CLEAR.driftyUpdateAvailable(); // Reset the update flag
+            }
+        }
+    }
+
+    protected boolean replaceCurrentExecutable() {
+        try {
+            Files.move(latestExecutableFile.toPath(), currentExecutableFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
+            M.msgUpdateInfo("Update successful!");
+        } catch (IOException e) {
+            try {
+                Files.copy(latestExecutableFile.toPath(), currentExecutableFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
+            } catch (Exception ex) {
+                M.msgUpdateError("Failed to replace the current version of Drifty!\n" + ex.getMessage());
+                return false;
+            }
+        }
+        return true;
+    }
+
+    protected boolean renameCurrentExecutable() {
+        boolean isCurrentExecutableRenamed = currentExecutableFile.renameTo(oldExecutableFile);
+        if (!isCurrentExecutableRenamed) {
+            M.msgUpdateError("Failed to rename the current executable!");
+            return false;
+        }
+        return true;
+    }
+
+    protected abstract boolean execute();
+}
diff --git a/Core/src/main/java/utils/Logger.java b/Core/src/main/java/utils/Logger.java
index 750b68e1a..cba944236 100644
--- a/Core/src/main/java/utils/Logger.java
+++ b/Core/src/main/java/utils/Logger.java
@@ -1,15 +1,17 @@
 package utils;
 
+import init.Environment;
 import properties.MessageType;
 import properties.Mode;
 
 import java.io.*;
+import java.nio.file.Files;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 
-import static support.Constants.FAILED_TO_CREATE_LOG;
 import static support.Constants.FAILED_TO_CLEAR_LOG;
+import static support.Constants.FAILED_TO_CREATE_LOG;
 
 public final class Logger {
     boolean isLogEmpty;
@@ -18,6 +20,7 @@ public final class Logger {
     private final DateFormat dateFormat;
     private final Calendar calendarObject = Calendar.getInstance();
     private final String logFilename;
+    private final File logFile;
 
     private Logger() {
         if (Mode.isCLI()) {
@@ -26,6 +29,18 @@ private Logger() {
             logFilename = "Drifty GUI.log";
         }
         dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        logFile = determineLogFile();
+    }
+
+    private File determineLogFile() {
+        if (!Environment.isAdministrator()) {
+            try {
+                return Files.createTempFile(logFilename.split("\\.")[0], ".log").toFile();
+            } catch (IOException e) {
+                System.err.println(FAILED_TO_CREATE_LOG + logFilename);
+            }
+        }
+        return new File(logFilename);
     }
 
     public static Logger getInstance() {
@@ -45,7 +60,7 @@ public static Logger getInstance() {
     }
 
     private void clearLog() {
-        try (PrintWriter logWriter = new PrintWriter(new BufferedWriter(new OutputStreamWriter(new FileOutputStream(logFilename, false))))) {
+        try (PrintWriter logWriter = new PrintWriter(new BufferedWriter(new OutputStreamWriter(new FileOutputStream(logFile, false))))) {
             isLogEmpty = true;
             logWriter.write("");
         } catch (IOException e) {
@@ -58,7 +73,7 @@ public void log(MessageType messageType, String logMessage) {
         if (!isLogEmpty) {
             clearLog();
         }
-        try (PrintWriter logWriter = new PrintWriter(new BufferedWriter(new OutputStreamWriter(new FileOutputStream(logFilename, true))))) {
+        try (PrintWriter logWriter = new PrintWriter(new BufferedWriter(new OutputStreamWriter(new FileOutputStream(logFile, true))))) {
             isLogEmpty = true;
             logWriter.println(dateAndTime + " " + messageType.toString() + " - " + logMessage);
         } catch (IOException e) {
diff --git a/Core/src/main/java/utils/MessageBroker.java b/Core/src/main/java/utils/MessageBroker.java
index 20ca55296..7fc42d4a3 100644
--- a/Core/src/main/java/utils/MessageBroker.java
+++ b/Core/src/main/java/utils/MessageBroker.java
@@ -76,10 +76,22 @@ public void msgBatchError(String message) {
         sendMessage(message, MessageType.ERROR, MessageCategory.BATCH);
     }
 
+    public void msgError(String message, MessageCategory messageCategory) {
+        sendMessage(message, MessageType.ERROR, messageCategory);
+    }
+
+    public void msgUpdateError(String message) {
+        sendMessage(message, MessageType.ERROR, MessageCategory.UPDATE);
+    }
+
+    public void msgUpdateInfo(String message) {
+        sendMessage(message, MessageType.INFO, MessageCategory.UPDATE);
+    }
+
     protected void sendMessage(String message, MessageType messageType, MessageCategory messageCategory) {
         logger.log(messageType, message);
         message = switch (messageType) {
-            case INFO -> messageCategory == MessageCategory.INPUT ? "\033[94m" + message + "\033[0m" : "\033[92m" + message + "\033[0m";
+            case INFO -> messageCategory == MessageCategory.INPUT || messageCategory == MessageCategory.UPDATE ? "\033[94m" + message + "\033[0m" : "\033[92m" + message + "\033[0m";
             case WARN -> "\033[93m" + message + "\033[0m";
             case ERROR -> "\033[91m" + message + "\033[0m";
         };
diff --git a/Core/src/main/java/utils/Utility.java b/Core/src/main/java/utils/Utility.java
index ab646f176..78066a689 100644
--- a/Core/src/main/java/utils/Utility.java
+++ b/Core/src/main/java/utils/Utility.java
@@ -7,6 +7,7 @@
 import org.apache.commons.text.StringEscapeUtils;
 import org.hildan.fxgson.FxGson;
 import preferences.AppSettings;
+import properties.MessageCategory;
 import properties.Mode;
 import properties.OS;
 import properties.Program;
@@ -23,6 +24,8 @@
 import java.nio.file.Paths;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -33,9 +36,14 @@
 
 public class Utility {
     private static final Random RANDOM_GENERATOR = new Random(System.currentTimeMillis());
-    protected static final MessageBroker M = Environment.getMessageBroker();
+    protected static MessageBroker msgBroker;
     private static boolean interrupted;
 
+    public static void initializeUtility() {
+        // Lazy initialization of the MessageBroker as it might be null when the Environment MessageBroker is not set
+        msgBroker = Environment.getMessageBroker();
+    }
+
     public static boolean isYoutube(String url) {
         String pattern = "^(http(s)?://)?((w){3}.)?youtu(be|.be)?(\\.com)?/.+";
         return url.matches(pattern);
@@ -55,41 +63,80 @@ public static boolean isExtractableLink(String link) {
         return isYoutube(link) || isInstagram(link) || isSpotify(link);
     }
 
+    public static boolean isOffline() {
+        try {
+            URL projectWebsite = URI.create(DRIFTY_WEBSITE_URL).toURL();
+            HttpURLConnection connectProjectWebsite = (HttpURLConnection) projectWebsite.openConnection();
+            connectProjectWebsite.connect();
+            return false;
+        } catch (UnknownHostException e) {
+            msgBroker.msgLogError("You are not connected to the Internet!");
+        } catch (MalformedURLException e) {
+            msgBroker.msgLogError("The link is not correctly formatted! " + e.getMessage());
+        } catch (IOException e) {
+            msgBroker.msgLogError("Failed to connect to the project website! " + e.getMessage());
+        }
+        return true;
+    }
+
     public static boolean isLinkValid(String link) {
         try {
             URL url = URI.create(link).toURL();
             HttpURLConnection connection = (HttpURLConnection) url.openConnection();
             connection.setRequestMethod("HEAD"); // Faster validation and hence improves performance
             connection.connect();
-            M.msgLinkInfo("Link is valid!");
+            msgBroker.msgLinkInfo("Link is valid!");
             return true;
         } catch (ConnectException e) {
-            M.msgLinkError("Connection to the link timed out! Please check your internet connection. " + e.getMessage());
+            msgBroker.msgLinkError("Connection to the link timed out! Please check your internet connection. " + e.getMessage());
         } catch (UnknownHostException unknownHost) {
-            try {
-                URL projectWebsite = URI.create(DRIFTY_WEBSITE_URL).toURL();
-                HttpURLConnection connectProjectWebsite = (HttpURLConnection) projectWebsite.openConnection();
-                connectProjectWebsite.connect();
-                M.msgLinkError(INVALID_LINK); // If our project website can be connected to, then the one entered by user is not valid! [NOTE: UnknownHostException is thrown if either internet is not connected or the website address is incorrect]
-            } catch (UnknownHostException e) {
-                M.msgLinkError("You are not connected to the Internet!");
-            } catch (MalformedURLException e) {
-                M.msgLinkError("The link is not correctly formatted! " + e.getMessage());
-            } catch (IOException e) {
-                M.msgLinkError("Failed to connect to the project website! " + e.getMessage());
+            if (isOffline()) {
+                msgBroker.msgLinkError("You are not connected to the Internet!");
+            } else {
+                msgBroker.msgLinkError(INVALID_LINK);
             }
         } catch (ProtocolException e) {
-            M.msgLinkError("An error occurred with the protocol! " + e.getMessage());
+            msgBroker.msgLinkError("An error occurred with the protocol! " + e.getMessage());
         } catch (MalformedURLException e) {
-            M.msgLinkError("The link is not correctly formatted! " + e.getMessage());
+            msgBroker.msgLinkError("The link is not correctly formatted! " + e.getMessage());
         } catch (IOException e) {
-            M.msgLinkError("Failed to connect to " + link + " ! " + e.getMessage());
+            msgBroker.msgLinkError("Failed to connect to " + link + " ! " + e.getMessage());
         } catch (IllegalArgumentException e) {
-            M.msgLinkError(link + " is not a URL; error: " + e.getMessage());
+            msgBroker.msgLinkError(link + " is not a URL; Error: " + e.getMessage());
         }
         return false;
     }
 
+    public static URL getUpdateURL() throws MalformedURLException, URISyntaxException {
+        URL updateURL;
+        String[] executableNames;
+        String arch = System.getProperty("os.arch");
+        if ("amd64".equals(arch) || "x86_64".equals(arch)) {
+            arch = "x86_64";
+        } else if ("aarch64".equals(arch)) {
+            arch = "aarch64";
+        }
+        if (Mode.isGUI()) {
+            executableNames = new String[]{"Drifty-GUI_" + arch + ".pkg", "Drifty-GUI.exe", "Drifty-GUI_linux"};
+        } else {
+            executableNames = new String[]{"Drifty-CLI_macos_" + arch, "Drifty-CLI.exe", "Drifty-CLI_linux"};
+        }
+        String updateURLMiddle;
+        if (AppSettings.GET.earlyAccess()) {
+            updateURLMiddle = "download/" + AppSettings.GET.latestDriftyVersionTag() + "/";
+        } else {
+            updateURLMiddle = "latest/download/";
+        }
+        if (OS.isMac()) {
+            updateURL = new URI("https://github.com/SaptarshiSarkar12/Drifty/releases/" + updateURLMiddle + executableNames[0]).toURL();
+        } else if (OS.isWindows()) {
+            updateURL = new URI("https://github.com/SaptarshiSarkar12/Drifty/releases/" + updateURLMiddle + executableNames[1]).toURL();
+        } else {
+            updateURL = new URI("https://github.com/SaptarshiSarkar12/Drifty/releases/" + updateURLMiddle + executableNames[2]).toURL();
+        }
+        return updateURL;
+    }
+
     public static LinkedList<String> getYtDlpMetadata(String link) {
         try {
             LinkedList<String> list = new LinkedList<>();
@@ -98,14 +145,14 @@ public static LinkedList<String> getYtDlpMetadata(String link) {
                 FileUtils.forceDelete(driftyJsonFolder); // Deletes the previously generated temporary directory for Drifty
             }
             if (!driftyJsonFolder.mkdir()) {
-                M.msgLinkError("Failed to create temporary directory for Drifty to get link metadata!");
+                msgBroker.msgLinkError("Failed to create temporary directory for Drifty to get link metadata!");
                 return null;
             }
             Thread linkThread = new Thread(ytDLPJsonData(driftyJsonFolder.getAbsolutePath(), link));
             try {
                 linkThread.start();
             } catch (Exception e) {
-                M.msgLinkError("Failed to start thread to get link metadata! " + e.getMessage());
+                msgBroker.msgLinkError("Failed to start thread to get link metadata! " + e.getMessage());
                 return null;
             }
             while (!linkThread.getState().equals(Thread.State.TERMINATED) && !linkThread.isInterrupted()) {
@@ -128,14 +175,14 @@ public static LinkedList<String> getYtDlpMetadata(String link) {
             }
             return list;
         } catch (IOException e) {
-            M.msgLinkError("Failed to perform I/O operations on link metadata! " + e.getMessage());
+            msgBroker.msgLinkError("Failed to perform I/O operations on link metadata! " + e.getMessage());
             return null;
         }
     }
 
     public static String getHomeDownloadFolder() {
         String downloadsFolder;
-        M.msgDirInfo(TRYING_TO_AUTO_DETECT_DOWNLOADS_FOLDER);
+        msgBroker.msgDirInfo(TRYING_TO_AUTO_DETECT_DOWNLOADS_FOLDER);
         if (!OS.isWindows()) {
             String home = System.getProperty("user.home");
             downloadsFolder = home + FileSystems.getDefault().getSeparator() + "Downloads" + FileSystems.getDefault().getSeparator();
@@ -144,9 +191,9 @@ public static String getHomeDownloadFolder() {
         }
         if (downloadsFolder.equals(FileSystems.getDefault().getSeparator())) {
             downloadsFolder = System.getProperty("user.home");
-            M.msgDirError(FAILED_TO_RETRIEVE_DEFAULT_DOWNLOAD_FOLDER);
+            msgBroker.msgDirError(FAILED_TO_RETRIEVE_DEFAULT_DOWNLOAD_FOLDER);
         } else {
-            M.msgDirInfo(FOLDER_DETECTED + downloadsFolder);
+            msgBroker.msgDirInfo(FOLDER_DETECTED + downloadsFolder);
         }
         return downloadsFolder;
     }
@@ -184,10 +231,10 @@ public static String getFilenameFromJson(String jsonString) {
         Matcher m = p.matcher(json);
         if (m.find()) {
             filename = cleanFilename(m.group(2)) + ".mp4";
-            M.msgFilenameInfo(FILENAME_DETECTED + "\"" + filename + "\"");
+            msgBroker.msgFilenameInfo(FILENAME_DETECTED + "\"" + filename + "\"");
         } else {
             filename = cleanFilename("Unknown_Filename_") + randomString(15) + ".mp4";
-            M.msgFilenameError(FILENAME_DETECTION_ERROR);
+            msgBroker.msgFilenameError(FILENAME_DETECTION_ERROR);
         }
         return filename;
     }
@@ -199,7 +246,7 @@ public static HashMap<String, Object> getSpotifySongMetadata(String songUrl) {
         if (trackMatcher.find()) {
             trackId = trackMatcher.group(1);
         } else {
-            M.msgLinkError("Failed to extract track ID from Spotify link!");
+            msgBroker.msgLinkError("Failed to extract track ID from Spotify link!");
             return null;
         }
         while (true) {
@@ -219,11 +266,11 @@ public static HashMap<String, Object> getSpotifySongMetadata(String songUrl) {
                 // extract the JSON part of the list in the response body;
                 JsonObject songMetadata = JsonParser.parseString(songMetadataResponseBody.replace("[\n{", "{").replace("}\n]", "}")).getAsJsonObject();
                 if (songMetadata.has("error")) {
-                    M.msgDownloadError("Failed to get song metadata! " + songMetadata.get("error").getAsJsonObject().get("message").getAsString());
+                    msgBroker.msgDownloadError("Failed to get song metadata! " + songMetadata.get("error").getAsJsonObject().get("message").getAsString());
                     if (Mode.isCLI()) {
                         // Get the time (from `retry-after` header) to wait before sending another request
                         String retryAfter = songMetadataResponse.headers().firstValue("retry-after").orElse("5");
-                        long timeToWait = (long) parseStringToInt(retryAfter) * 1000;
+                        long timeToWait = (long) parseStringToInt(retryAfter, "Failed to parse time to wait before retrying!", MessageCategory.DOWNLOAD) * 1000;
                         for (long i = timeToWait; i >= 0; i -= 1000) {
                             System.out.print("\r" + "Retrying in " + i / 1000 + " seconds...");
                             sleep(1000);
@@ -249,16 +296,16 @@ public static HashMap<String, Object> getSpotifySongMetadata(String songUrl) {
                 String json = gson.toJson(songMetadataMap);
                 File jsonFile = Program.getJsonDataPath().resolve("spotify-metadata.json").toFile();
                 FileUtils.writeStringToFile(jsonFile, json, Charset.defaultCharset());
-                M.msgLogInfo("Spotify metadata retrieved successfully!");
+                msgBroker.msgLogInfo("Spotify metadata retrieved successfully!");
                 return songMetadataMap;
             } catch (URISyntaxException e) {
-                M.msgLinkError("Spotify API URI is incorrect! " + e.getMessage());
+                msgBroker.msgLinkError("Spotify API URI is incorrect! " + e.getMessage());
                 break;
             } catch (IOException e) {
-                M.msgLinkError("Failed to send request to Spotify API! " + e.getMessage());
+                msgBroker.msgLinkError("Failed to send request to Spotify API! " + e.getMessage());
                 break;
             } catch (InterruptedException e) {
-                M.msgLinkError("The request to Spotify API was interrupted! " + e.getMessage());
+                msgBroker.msgLinkError("The request to Spotify API was interrupted! " + e.getMessage());
                 break;
             }
         }
@@ -279,17 +326,17 @@ private static String fetchSpotifyPlaylistData(String spotifyPlaylistAPIUrl) {
                 songMetadataResponse = client.send(getPlaylistMetadata, HttpResponse.BodyHandlers.ofByteArray());
                 return extractContent(songMetadataResponse);
             } catch (UnknownHostException e) {
-                M.msgLinkError("You are not connected to the Internet!");
+                msgBroker.msgLinkError("You are not connected to the Internet!");
                 return null;
             } catch (IOException e) {
-                M.msgLinkError("Failed to send request to Spotify API! " + e.getMessage());
+                msgBroker.msgLinkError("Failed to send request to Spotify API! " + e.getMessage());
                 return null;
             } catch (InterruptedException e) {
-                M.msgLinkError("The request to Spotify API was interrupted! " + e.getMessage());
+                msgBroker.msgLinkError("The request to Spotify API was interrupted! " + e.getMessage());
                 return null;
             }
         } catch (URISyntaxException e) {
-            M.msgLinkError("Spotify API URI is incorrect! " + e.getMessage());
+            msgBroker.msgLinkError("Spotify API URI is incorrect! " + e.getMessage());
             return null;
         }
     }
@@ -301,7 +348,7 @@ public static ArrayList<HashMap<String, Object>> getSpotifyPlaylistMetadata(Stri
         if (playlistMatcher.find()) {
             playlistId = playlistMatcher.group(1);
         } else {
-            M.msgLinkError("Failed to extract playlist ID from Spotify link!");
+            msgBroker.msgLinkError("Failed to extract playlist ID from Spotify link!");
             return null;
         }
         int offset = 0;
@@ -318,10 +365,10 @@ public static ArrayList<HashMap<String, Object>> getSpotifyPlaylistMetadata(Stri
             if (offset == 0) {
                 totalNumberOfTracks = playlistMetadata.get("total").getAsInt();
                 if (totalNumberOfTracks == 0) {
-                    M.msgLinkError("The playlist is empty!");
+                    msgBroker.msgLinkError("The playlist is empty!");
                     return null;
                 }
-                M.msgLinkInfo("Total number of tracks in the playlist: " + totalNumberOfTracks);
+                msgBroker.msgLinkInfo("Total number of tracks in the playlist: " + totalNumberOfTracks);
             }
             JsonElement nextUrl = playlistMetadata.get("next");
             if (!nextUrl.isJsonNull()) {
@@ -353,7 +400,7 @@ public static ArrayList<HashMap<String, Object>> getSpotifyPlaylistMetadata(Stri
                 playlistData.add(songMetadataMap);
             }
         }
-        M.msgLogInfo("Spotify playlist metadata retrieved successfully!");
+        msgBroker.msgLogInfo("Spotify playlist metadata retrieved successfully!");
         return playlistData;
     }
 
@@ -367,7 +414,7 @@ private static String extractContent(HttpResponse<byte[]> response) {
                 content.append(line);
             }
         } catch (IOException e) {
-            M.msgLinkError("Failed to extract content from Spotify API response! " + e.getMessage());
+            msgBroker.msgLinkError("Failed to extract content from Spotify API response! " + e.getMessage());
         }
         return content.toString();
     }
@@ -393,31 +440,31 @@ private static Runnable ytDLPJsonData(String folderPath, String link) {
                     while ((line = reader.readLine()) != null) {
                         if (line.contains("ERROR") || line.contains("WARNING")) {
                             if (line.contains("unable to extract username")) {
-                                M.msgLinkError("The Instagram post/reel is private!");
+                                msgBroker.msgLinkError("The Instagram post/reel is private!");
                                 break;
                             } else if (line.contains("The playlist does not exist")) {
-                                M.msgLinkError("The YouTube playlist does not exist or is private!");
+                                msgBroker.msgLinkError("The YouTube playlist does not exist or is private!");
                                 break;
                             } else if (line.contains("Video unavailable")) {
-                                M.msgLinkError("The YouTube video is unavailable!");
+                                msgBroker.msgLinkError("The YouTube video is unavailable!");
                                 break;
                             } else if (line.contains("Skipping player responses from android clients")) {
-                                M.msgLogWarning(line);
+                                msgBroker.msgLogWarning(line);
                             } else if (line.contains("Unable to download webpage") && line.contains("Temporary failure in name resolution")) {
-                                M.msgLinkError("You are not connected to the Internet!");
+                                msgBroker.msgLinkError("You are not connected to the Internet!");
                                 break;
                             } else {
                                 if (line.contains("ERROR")) {
-                                    M.msgLogError(line);
+                                    msgBroker.msgLogError(line);
                                 } else {
-                                    M.msgLogWarning(line);
+                                    msgBroker.msgLogWarning(line);
                                 }
                             }
                         }
                     }
                 }
             } catch (Exception e) {
-                M.msgLinkError("Failed to get link metadata! " + e.getMessage());
+                msgBroker.msgLinkError("Failed to get link metadata! " + e.getMessage());
             }
         };
     }
@@ -433,7 +480,7 @@ public static void sleep(long time) {
         try {
             TimeUnit.MILLISECONDS.sleep(time);
         } catch (InterruptedException e) {
-            M.msgLinkError("The calling method failed to sleep for " + time + " milliseconds. It got interrupted. " + e.getMessage());
+            msgBroker.msgLinkError("The calling method failed to sleep for " + time + " milliseconds. It got interrupted. " + e.getMessage());
         }
     }
 
@@ -467,7 +514,7 @@ public static String getMatchingVideoID(ArrayList<HashMap<String, Object>> searc
                 continue;
             }
             String[] durationInMinutes = searchResult.get("duration").toString().split(":");
-            int videoDurationInMs = parseStringToInt(durationInMinutes[0]) * 60000 + parseStringToInt(durationInMinutes[1]) * 1000;
+            int videoDurationInMs = parseStringToInt(durationInMinutes[0], "Failed to parse video duration for Spotify song!", MessageCategory.DOWNLOAD) * 60000 + parseStringToInt(durationInMinutes[1], "Failed to parse video duration for Spotify song!", MessageCategory.DOWNLOAD) * 1000;
             if ("Top result".equalsIgnoreCase(searchResult.get("category").toString())) {
                 if (isDurationMatched(videoDurationInMs, spotifySongDuration, false)) {
                     matchedVideoId = (String) searchResult.get("videoId");
@@ -506,7 +553,7 @@ public static ArrayList<HashMap<String, Object>> getYoutubeSearchResults(String
         query = query.replace(" ", "-"); // make the query URL-friendly
         String googleVisitorId = getGoogleVisitorId();
         if (googleVisitorId == null) {
-            M.msgDownloadError("Failed to get Google Visitor ID!");
+            msgBroker.msgDownloadError("Failed to get Google Visitor ID!");
             return null;
         }
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
@@ -528,14 +575,14 @@ public static ArrayList<HashMap<String, Object>> getYoutubeSearchResults(String
             try (HttpClient client = HttpClient.newHttpClient()) {
                 response = client.send(req, HttpResponse.BodyHandlers.ofByteArray());
             } catch (UnknownHostException e) {
-                M.msgDownloadError("You are not connected to the Internet!");
+                msgBroker.msgDownloadError("You are not connected to the Internet!");
                 return null;
             } catch (IOException e) {
-                M.msgDownloadError("Failed to get search results! " + e.getMessage());
+                msgBroker.msgDownloadError("Failed to get search results! " + e.getMessage());
                 return null;
             }
             if (response.statusCode() != 200) {
-                M.msgDownloadError("Failed to get search results! " + response.statusCode() + " " + response.uri());
+                msgBroker.msgDownloadError("Failed to get search results! " + response.statusCode() + " " + response.uri());
             } else {
                 String responseContent = extractContent(response);
                 JsonObject jsonObject = JsonParser.parseString(responseContent).getAsJsonObject();
@@ -565,10 +612,10 @@ public static ArrayList<HashMap<String, Object>> getYoutubeSearchResults(String
                                     String duration = in.readLine();
                                     searchResult.put("duration", duration);
                                 } catch (IOException e) {
-                                    M.msgDownloadError("Failed to get video duration! " + e.getMessage());
+                                    msgBroker.msgDownloadError("Failed to get video duration! " + e.getMessage());
                                 }
                             } catch (IOException e) {
-                                M.msgDownloadError("Failed to get video duration! " + e.getMessage());
+                                msgBroker.msgDownloadError("Failed to get video duration! " + e.getMessage());
                             }
                         }
                         searchResults.add(searchResult);
@@ -607,7 +654,7 @@ public static ArrayList<HashMap<String, Object>> getYoutubeSearchResults(String
                 return searchResults;
             }
         } catch (URISyntaxException | InterruptedException e) {
-            M.msgDownloadError("Failed to get search results! " + e.getMessage());
+            msgBroker.msgDownloadError("Failed to get search results! " + e.getMessage());
         }
         return null;
     }
@@ -667,9 +714,9 @@ private static String getGoogleVisitorId() {
                 return matcher2.group(1); // return the visitor ID (aka "X-Goog-Visitor-Id")
             }
         } catch (UnknownHostException e) {
-            M.msgDownloadError("You are not connected to the Internet!");
+            msgBroker.msgDownloadError("You are not connected to the Internet!");
         } catch (URISyntaxException | IOException | InterruptedException e) {
-            M.msgDownloadError("Failed to get Google Visitor ID! " + e.getMessage());
+            msgBroker.msgDownloadError("Failed to get Google Visitor ID! " + e.getMessage());
         }
         return null;
     }
@@ -677,10 +724,10 @@ private static String getGoogleVisitorId() {
     public static void setFfmpegVersion() {
         Path ffmpegPath = Paths.get(Program.get(Program.FFMPEG));
         if (!Files.exists(ffmpegPath)) {
-            M.msgLogError("FFMPEG not found at " + ffmpegPath);
+            msgBroker.msgLogError("FFMPEG not found at " + ffmpegPath);
             AppSettings.SET.isFfmpegWorking(false);
         } else {
-            M.msgLogInfo("FFMPEG found at " + ffmpegPath);
+            msgBroker.msgLogInfo("FFMPEG found at " + ffmpegPath);
             ProcessBuilder getFfmpegVersion = new ProcessBuilder(ffmpegPath.toString(), "-version");
             try {
                 Process process = getFfmpegVersion.start();
@@ -689,15 +736,15 @@ public static void setFfmpegVersion() {
                     while ((line = reader.readLine()) != null) {
                         if (line.contains("ffmpeg version")) {
                             String version = line.split(" ")[2];
-                            M.msgLogInfo("FFMPEG version: " + version);
-                            M.msgLogInfo(line);
+                            msgBroker.msgLogInfo("FFMPEG version: " + version);
+                            msgBroker.msgLogInfo(line);
                             AppSettings.SET.isFfmpegWorking(true);
                             AppSettings.SET.ffmpegVersion(version);
                         }
                     }
                 }
             } catch (IOException e) {
-                M.msgLogError("Failed to get FFMPEG version : " + e.getMessage());
+                msgBroker.msgLogError("Failed to get FFMPEG version : " + e.getMessage());
                 AppSettings.SET.isFfmpegWorking(false);
             }
         }
@@ -711,7 +758,7 @@ public static Runnable setYtDlpVersion() {
             try {
                 ytDlpVersionTask = getYtDlpVersion.start();
             } catch (IOException e) {
-                M.msgInitError("Failed to get yt-dlp version! " + e.getMessage());
+                msgBroker.msgInitError("Failed to get yt-dlp version! " + e.getMessage());
                 return;
             }
             try (BufferedReader reader = new BufferedReader(new InputStreamReader(Objects.requireNonNull(ytDlpVersionTask).getInputStream()))) {
@@ -720,7 +767,7 @@ public static Runnable setYtDlpVersion() {
                     AppSettings.SET.ytDlpVersion(line);
                 }
             } catch (IOException e) {
-                M.msgInitError("Failed to get yt-dlp version! " + e.getMessage());
+                msgBroker.msgInitError("Failed to get yt-dlp version! " + e.getMessage());
             }
         };
     }
@@ -749,11 +796,13 @@ public static Runnable setSpotifyAccessToken() {
                 JsonObject jsonObject = JsonParser.parseString(responseContent.toString()).getAsJsonObject();
                 AppSettings.SET.spotifyAccessToken(jsonObject.get("access_token").getAsString());
             } catch (UnknownHostException e) {
-                M.msgInitError("You are not connected to the Internet!");
+                msgBroker.msgLogError("You are not connected to the Internet!");
+                ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor();
+                executor.schedule(setSpotifyAccessToken(), 5, TimeUnit.SECONDS); // retry after 5 seconds
             } catch (IOException e) {
-                M.msgInitError("Failed to get Spotify access token! Failed to read response from Spotify API! " + e.getMessage());
+                msgBroker.msgInitError("Failed to get Spotify access token! Failed to read response from Spotify API! " + e.getMessage());
             } catch (URISyntaxException e) {
-                M.msgInitError("Failed to get Spotify access token! Spotify API URI is incorrect! " + e.getMessage());
+                msgBroker.msgInitError("Failed to get Spotify access token! Spotify API URI is incorrect! " + e.getMessage());
             }
         };
     }
@@ -784,29 +833,30 @@ public static String convertToMp3(Path inputFilePath) {
                     renamedFile = renamedFile.getParentFile().toPath().resolve(newFilename).toFile();
                 }
                 if (outputFilePath.toFile().renameTo(renamedFile)) {
-                    M.msgLogInfo("Converted to mp3 successfully!");
+                    msgBroker.msgLogInfo("Converted to mp3 successfully!");
                     return "Converted to mp3 successfully!";
                 } else {
-                    M.msgLogError("Failed to rename the converted file!");
+                    msgBroker.msgLogError("Failed to rename the converted file!");
                     return "Failed to rename the converted file!";
                 }
             } else {
-                M.msgLogError("Failed to convert to mp3!");
+                msgBroker.msgLogError("Failed to convert to mp3!");
                 return "Failed to convert to mp3!";
             }
         } catch (IOException e) {
-            M.msgLogError("Failed to convert to mp3! IOException: " + e.getMessage());
+            msgBroker.msgLogError("Failed to convert to mp3! IOException: " + e.getMessage());
             return "Failed to convert to mp3! IOException: " + e.getMessage();
         } catch (InterruptedException e) {
-            M.msgLogError("Failed to convert to mp3! User interrupted the process. " + e.getMessage());
+            msgBroker.msgLogError("Failed to convert to mp3! User interrupted the process. " + e.getMessage());
             return "Failed to convert to mp3! User interrupted the process. " + e.getMessage();
         }
     }
 
-    public static int parseStringToInt(String string) {
+    public static int parseStringToInt(String string, String errorMessage, MessageCategory messageCategory) {
         try {
             return Integer.parseInt(string);
         } catch (NumberFormatException e) {
+            msgBroker.msgError(errorMessage + " " + e.getMessage(), messageCategory);
             return 0;
         }
     }
diff --git a/GUI/src/main/java/backend/FileDownloader.java b/GUI/src/main/java/backend/FileDownloader.java
index 4df33e7ad..b503ad11e 100644
--- a/GUI/src/main/java/backend/FileDownloader.java
+++ b/GUI/src/main/java/backend/FileDownloader.java
@@ -13,6 +13,7 @@
 import javafx.beans.property.StringProperty;
 import javafx.concurrent.Task;
 import properties.LinkType;
+import properties.MessageCategory;
 import properties.Program;
 import support.DownloadMetrics;
 import support.Job;
@@ -410,9 +411,9 @@ So I put a check in the second regex match (m2.find()) because if
                     String speed = String.format("%06.2f", averageSpeed);
                     String units = m2.group(2);
                     String[] parts = m2.group(3).split(":");
-                    int hours = parts.length > 0 ? Utility.parseStringToInt(parts[0]) : 0;
-                    int minutes = parts.length > 1 ? Utility.parseStringToInt(parts[1]) : 0;
-                    int seconds = parts.length > 2 ? Utility.parseStringToInt(parts[2]) : 0;
+                    int hours = parts.length > 0 ? Utility.parseStringToInt(parts[0], "Failed to parse hours in ETA", MessageCategory.DOWNLOAD) : 0;
+                    int minutes = parts.length > 1 ? Utility.parseStringToInt(parts[1], "Failed to parse minutes in ETA", MessageCategory.DOWNLOAD) : 0;
+                    int seconds = parts.length > 2 ? Utility.parseStringToInt(parts[2], "Failed to parse seconds in ETA", MessageCategory.DOWNLOAD) : 0;
                     String time = String.format("%02d:%02d:%02d", hours, minutes, seconds);
                     updateMessage(speed + " " + units + " ETA " + time);
                     if (progress > 99) {
diff --git a/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java b/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java
new file mode 100644
index 000000000..77bb677ca
--- /dev/null
+++ b/GUI/src/main/java/gui/updater/GUIUpdateExecutor.java
@@ -0,0 +1,58 @@
+package gui.updater;
+
+import gui.init.Environment;
+import gui.preferences.AppSettings;
+import org.buildobjects.process.ProcBuilder;
+import org.buildobjects.process.ProcResult;
+import properties.OS;
+
+import java.io.File;
+import java.io.IOException;
+
+public class GUIUpdateExecutor extends updater.UpdateExecutor {
+
+    public GUIUpdateExecutor(File currentExecutableFile, File latestExecutableFile) {
+        super(currentExecutableFile, latestExecutableFile);
+    }
+
+    @Override
+    public boolean execute() {
+        M.msgLogInfo("Download successful! Setting executable permission...");
+        if (setLatestExecutablePermissions()) {
+            M.msgLogInfo("Executable permission set! Executing update...");
+        } else {
+            M.msgUpdateError("Failed to set executable permission for the latest version of Drifty!");
+            return false;
+        }
+        if (OS.isMac()) {
+            return executeMacUpdate();
+        } else {
+            ProcessBuilder runCurrentExecutable = new ProcessBuilder(currentExecutableFile.getAbsolutePath());
+            cleanup(true); // This will delete the old executable created previously
+            if (renameCurrentExecutable()) {
+                if (replaceCurrentExecutable()) {
+                    try {
+                        runCurrentExecutable.start();
+                    } catch (IOException e) {
+                        M.msgUpdateError("Failed to start the latest version of Drifty!");
+                    }
+                    cleanup(false);
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    private boolean executeMacUpdate() {
+        ProcResult executionResult = new ProcBuilder("open").withArgs(latestExecutableFile.getAbsolutePath()).withNoTimeout().ignoreExitStatus().run();
+        if (executionResult.getExitValue() != 0) {
+            M.msgUpdateError("Failed to open the installer for the latest version of Drifty! Error code: " + executionResult.getExitValue());
+            return false;
+        } else {
+            AppSettings.CLEAR.driftyUpdateAvailable(); // Reset the update flag
+            Environment.terminate(0);
+        }
+        return true;
+    }
+}
diff --git a/GUI/src/main/java/gui/utils/MessageBroker.java b/GUI/src/main/java/gui/utils/MessageBroker.java
index 1ac6bb414..b00fbec5c 100644
--- a/GUI/src/main/java/gui/utils/MessageBroker.java
+++ b/GUI/src/main/java/gui/utils/MessageBroker.java
@@ -3,6 +3,7 @@
 import javafx.scene.paint.Color;
 import properties.MessageCategory;
 import properties.MessageType;
+import ui.ConfirmationDialog;
 import ui.UIController;
 
 import java.util.Objects;
@@ -35,6 +36,11 @@ protected void sendMessage(String message, MessageType messageType, MessageCateg
             case FILENAME -> Objects.requireNonNull(ui).setFilenameOutput(color, message);
             case DIRECTORY -> Objects.requireNonNull(ui).setDirOutput(color, message);
             case DOWNLOAD -> Objects.requireNonNull(ui).setDownloadOutput(color, message);
+            case UPDATE -> {
+                if (MessageType.ERROR.equals(messageType)) {
+                    new ConfirmationDialog("Update Failed", message, true, true).getResponse();
+                }
+            }
             default -> {
                 if (!message.isEmpty()) {
                     logger.log(messageType, message);
diff --git a/GUI/src/main/java/gui/utils/UIComponentBuilder.java b/GUI/src/main/java/gui/utils/UIComponentBuilder.java
index 66be5f215..bf9d2d8bb 100644
--- a/GUI/src/main/java/gui/utils/UIComponentBuilder.java
+++ b/GUI/src/main/java/gui/utils/UIComponentBuilder.java
@@ -7,6 +7,7 @@
 import javafx.scene.control.TextField;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
+import javafx.scene.layout.Border;
 import javafx.scene.layout.HBox;
 import javafx.scene.paint.LinearGradient;
 import javafx.scene.paint.Paint;
@@ -65,6 +66,7 @@ public TextField buildTextField() {
     public Hyperlink buildHyperlink(String text, Font font, LinearGradient fill, String url) {
         Hyperlink link = new Hyperlink(text);
         link.setFont(font);
+        link.setBorder(Border.EMPTY);
         link.setTextFill(fill);
         link.setOnAction(e -> Drifty_GUI.INSTANCE.openWebsite(url));
         return link;
diff --git a/GUI/src/main/java/main/Drifty_GUI.java b/GUI/src/main/java/main/Drifty_GUI.java
index aab8ec7a4..53b9b8b9c 100644
--- a/GUI/src/main/java/main/Drifty_GUI.java
+++ b/GUI/src/main/java/main/Drifty_GUI.java
@@ -17,6 +17,7 @@
 import javafx.stage.Stage;
 import properties.Mode;
 import ui.*;
+import updater.UpdateChecker;
 import utils.Utility;
 
 import static gui.support.Constants.GUI_APPLICATION_TERMINATED;
@@ -32,6 +33,7 @@ public class Drifty_GUI extends Application {
     private Stage primaryStage;
 
     public static void main(String[] args) {
+        Mode.setGUIMode();
         System.setProperty("javafx.preloader", Splash.class.getCanonicalName());
         launch(args);
     }
@@ -39,21 +41,20 @@ public static void main(String[] args) {
     @Override
     public void init() {
         System.setProperty("apple.laf.useScreenMenuBar", "true");
-        Mode.setGUIMode();
         msgBroker = new MessageBroker();
         Environment.setGUIMessageBroker(msgBroker);
         msgBroker.msgLogInfo("Drifty GUI (Graphical User Interface) Application Started !");
+        Environment.initializeEnvironment();
+        notifyPreloader(new Preloader.StateChangeNotification(Preloader.StateChangeNotification.Type.BEFORE_START));
     }
 
     @Override
     public void start(Stage primaryStage) {
-        Environment.initializeEnvironment();
         this.primaryStage = Constants.getStage("Drifty GUI", true);
         this.primaryStage.setMinWidth(Constants.SCREEN_WIDTH * .46);
         this.primaryStage.setMinHeight(Constants.SCREEN_HEIGHT * .8125);
         createScene();
         this.primaryStage.setScene(scene);
-        notifyPreloader(new Preloader.StateChangeNotification(Preloader.StateChangeNotification.Type.BEFORE_LOAD));
         this.primaryStage.show();
     }
 
@@ -137,28 +138,46 @@ private Menu getHelpMenu() {
         MenuItem bug = new MenuItem("Report a Bug");
         MenuItem securityVulnerability = new MenuItem("Report a Security Vulnerability");
         MenuItem feature = new MenuItem("Suggest a Feature");
+        MenuItem checkForUpdates = new MenuItem("Check for Updates");
         MenuItem about = new MenuItem("About Drifty");
         contactUs.setOnAction(e -> openWebsite("https://saptarshisarkar12.github.io/Drifty/contact"));
         contribute.setOnAction(e -> openWebsite("https://github.com/SaptarshiSarkar12/Drifty"));
         bug.setOnAction(e -> openWebsite("https://github.com/SaptarshiSarkar12/Drifty/issues/new?assignees=&labels=bug+%F0%9F%90%9B%2CApp+%F0%9F%92%BB&projects=&template=Bug-for-application.yaml&title=%5BBUG%5D+"));
         securityVulnerability.setOnAction(e -> openWebsite("https://github.com/SaptarshiSarkar12/Drifty/security/advisories/new"));
         feature.setOnAction(e -> openWebsite("https://github.com/SaptarshiSarkar12/Drifty/issues/new?assignees=&labels=feature+%E2%9C%A8%2CApp+%F0%9F%92%BB&projects=&template=feature-request-application.yaml&title=%5BFEATURE%5D+"));
+        checkForUpdates.setOnAction(e -> {
+            if (Utility.isOffline()) {
+                ConfirmationDialog noInternet = new ConfirmationDialog("No Internet Connection", "You are currently offline! Please check your internet connection and try again.", true, false);
+                noInternet.getResponse();
+            } else {
+                new Thread(this::checkForUpdates).start();
+            }
+        });
         about.setOnAction(event -> {
             if (aboutInstance == null) {
                 aboutInstance = new About();
             }
             aboutInstance.show();
         });
-        menu.getItems().setAll(contactUs, contribute, bug, securityVulnerability, feature, about);
+        menu.getItems().setAll(contactUs, contribute, bug, securityVulnerability, feature, checkForUpdates, about);
         return menu;
     }
 
+    private void checkForUpdates() {
+        if (UpdateChecker.isUpdateAvailable()) {
+            UIController.INSTANCE.showUpdateDialog();
+        } else {
+            ConfirmationDialog noUpdate = new ConfirmationDialog("No Updates Available", "You are already using the latest version of Drifty!", true, false);
+            noUpdate.getResponse();
+        }
+    }
+
     private Menu getEditMenu() {
         Menu menu = new Menu("Edit");
         MenuItem wipeHistory = new MenuItem("Clear Download History");
         MenuItem settings = new MenuItem("Settings");
         wipeHistory.setOnAction(e -> {
-            ConfirmationDialog ask = new ConfirmationDialog("Clear Download History", "Are you sure you wish to wipe out all of your download history?\n(This will NOT delete any downloaded files)", false);
+            ConfirmationDialog ask = new ConfirmationDialog("Clear Download History", "Are you sure you wish to wipe out all of your download history?\n(This will NOT delete any downloaded files)", false, false);
             if (ask.getResponse().isYes()) {
                 UIController.clearJobHistory();
             }
diff --git a/GUI/src/main/java/module-info.java b/GUI/src/main/java/module-info.java
index 876373541..64bf61f55 100644
--- a/GUI/src/main/java/module-info.java
+++ b/GUI/src/main/java/module-info.java
@@ -7,6 +7,7 @@
     requires com.google.gson;
     requires org.hildan.fxgson;
     requires java.prefs;
+    requires jproc;
 
     exports gui.support;
     exports gui.utils;
diff --git a/GUI/src/main/java/ui/ConfirmationDialog.java b/GUI/src/main/java/ui/ConfirmationDialog.java
index 47b8a7b87..7701058ed 100644
--- a/GUI/src/main/java/ui/ConfirmationDialog.java
+++ b/GUI/src/main/java/ui/ConfirmationDialog.java
@@ -1,7 +1,6 @@
 package ui;
 
 import gui.init.Environment;
-
 import gui.preferences.AppSettings;
 import gui.support.Constants;
 import javafx.application.Platform;
@@ -11,10 +10,16 @@
 import javafx.geometry.Pos;
 import javafx.scene.Scene;
 import javafx.scene.control.Button;
-import javafx.scene.control.Label;
+import javafx.scene.control.Hyperlink;
 import javafx.scene.control.TextField;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
+import javafx.scene.paint.Color;
+import javafx.scene.paint.CycleMethod;
+import javafx.scene.paint.LinearGradient;
+import javafx.scene.paint.Stop;
+import javafx.scene.text.Font;
+import javafx.scene.text.FontWeight;
 import javafx.scene.text.Text;
 import javafx.scene.text.TextAlignment;
 import javafx.stage.Stage;
@@ -34,17 +39,23 @@ enum State {
     private static Button btnYes;
     private double width = 200;
     private double height = 150;
-    private Stage stage;
-    private VBox vbox;
     private final String windowTitle;
     private final String msg;
-    private String filename = "";
+    private boolean isUpdateError;
     private final GetConfirmationDialogResponse answer = new GetConfirmationDialogResponse();
+    private Stage stage;
+    private VBox vbox;
+    private String filename = "";
 
-    public ConfirmationDialog(String windowTitle, String message, boolean okOnly) {
+    public ConfirmationDialog(String windowTitle, String message, boolean okOnly, boolean isUpdateError) {
         this.windowTitle = windowTitle;
-        this.msg = message;
         this.state = okOnly ? State.OK : State.YES_NO;
+        this.isUpdateError = isUpdateError;
+        if (isUpdateError) {
+            this.msg = message + "\n\nPlease try again later or download the latest version from the below link :";
+        } else {
+            this.msg = message;
+        }
         finish();
     }
 
@@ -99,13 +110,7 @@ private void createControls() {
         text.setFont(Constants.getMonaco(16));
         text.setTextAlignment(TextAlignment.LEFT);
         text.setWrappingWidth(width * .85);
-        Label message = new Label("Are you sure?");
-        message.setFont(Constants.getMonaco(17));
-        if (!msg.isEmpty()) {
-            message.setText(msg);
-            message.setWrapText(true);
-            message.setTextAlignment(TextAlignment.CENTER);
-        }
+        Hyperlink downloadLink = Constants.UI_COMPONENT_BUILDER_INSTANCE.buildHyperlink("Download the Latest Version", Font.font("Verdana", FontWeight.BOLD, 16), new LinearGradient(0, 0, 1, 0, true, CycleMethod.NO_CYCLE, new Stop(0.25, Color.valueOf("#4158D0")), new Stop(1, Color.valueOf("#C850C0"))), "https://saptarshisarkar12.github.io/Drifty/download");
         btnYes = newButton("Yes", e -> {
             answer.setAnswer(true);
             stage.close();
@@ -130,7 +135,12 @@ private void createControls() {
             vbox.getChildren().add(tfFilename);
         }
         switch (state) {
-            case OK -> hbox.getChildren().add(btnOk);
+            case OK -> {
+                if (isUpdateError) {
+                    vbox.getChildren().add(downloadLink);
+                }
+                hbox.getChildren().add(btnOk);
+            }
             case YES_NO, FILENAME -> hbox.getChildren().addAll(btnYes, btnNo);
             default -> Environment.getMessageBroker().msgLogError("Unknown state in ConfirmationDialog : " + state);
         }
@@ -152,14 +162,7 @@ public GetConfirmationDialogResponse getResponse() {
     private void showScene() {
         stage = Constants.getStage(windowTitle, false);
         scene = Constants.getScene(vbox);
-        if ("Dark".equals(AppSettings.GET.mainTheme())) {
-            Theme.applyTheme("Dark", scene);
-            Theme.changeButtonStyle(true, btnYes);
-            Theme.changeButtonStyle(true, btnNo);
-            Theme.changeButtonStyle(true, btnOk);
-        } else {
-            Theme.applyTheme("Light", scene);
-        }
+        Theme.applyTheme(AppSettings.GET.mainTheme(), scene);
         stage.setWidth(width);
         stage.setHeight(height);
         stage.setScene(scene);
@@ -188,4 +191,8 @@ static Scene getScene() {
     static Button getBtnYes() {
         return btnYes;
     }
+
+    static Button getBtnOk() {
+        return btnOk;
+    }
 }
diff --git a/GUI/src/main/java/ui/GetFilename.java b/GUI/src/main/java/ui/GetFilename.java
index 1791414a1..feb9ea221 100644
--- a/GUI/src/main/java/ui/GetFilename.java
+++ b/GUI/src/main/java/ui/GetFilename.java
@@ -6,6 +6,7 @@
 import javafx.beans.property.StringProperty;
 import javafx.concurrent.Task;
 import org.apache.commons.io.FileUtils;
+import properties.MessageCategory;
 import properties.Program;
 import support.Job;
 import utils.Utility;
@@ -162,7 +163,7 @@ private Runnable getFileCount() {
                     for (String line : list) {
                         Matcher m = pattern.matcher(line);
                         if (m.find()) {
-                            fileCount = Utility.parseStringToInt(m.group(2));
+                            fileCount = Utility.parseStringToInt(m.group(2), "Failed to get file count", MessageCategory.FILENAME);
                             break;
                         }
                     }
diff --git a/GUI/src/main/java/ui/Settings.java b/GUI/src/main/java/ui/Settings.java
index ba7d3a542..96cab6177 100644
--- a/GUI/src/main/java/ui/Settings.java
+++ b/GUI/src/main/java/ui/Settings.java
@@ -28,10 +28,12 @@ public class Settings {
     private static Scene settingsScene;
     private static TextField tfCurrentDirectory;
     private CheckBox autoPasteCheckbox;
+    private CheckBox earlyAccessCheckbox;
     private Label lblDefaultDownloadDir;
     private Label lblTheme;
     private Label lblSettingsHeading;
     private Label lblAutoPaste;
+    private Label lblEarlyAccess;
     private ChoiceBox<String> themeChoiceBox;
     private Stage stage;
     private GridPane root;
@@ -46,6 +48,7 @@ private void initializeUIComponents() {
         createTfDirectory();
         createLabels();
         createAutoPasteCheck();
+        createEarlyAccessCheck();
         createDirectoryButton();
     }
 
@@ -73,7 +76,7 @@ private void configureLayout() {
         root.setPadding(new Insets(10, 20, 20, 20));
         addComponents();
         setHAlignments();
-        setHGrowsAlways(lblSettingsHeading, lblAutoPaste, autoPasteCheckbox, lblTheme, themeChoiceBox, lblDefaultDownloadDir, tfCurrentDirectory, selectDirectoryButton);
+        setHGrowsAlways(lblSettingsHeading, lblAutoPaste, autoPasteCheckbox, lblEarlyAccess, earlyAccessCheckbox, lblTheme, themeChoiceBox, lblDefaultDownloadDir, tfCurrentDirectory, selectDirectoryButton);
     }
 
     public void show() {
@@ -89,6 +92,7 @@ public void show() {
     private void setHAlignments() {
         GridPane.setHalignment(lblSettingsHeading, HPos.CENTER);
         GridPane.setHalignment(lblAutoPaste, HPos.RIGHT);
+        GridPane.setHalignment(lblEarlyAccess, HPos.RIGHT);
         GridPane.setHalignment(lblTheme, HPos.RIGHT);
         GridPane.setHalignment(lblDefaultDownloadDir, HPos.RIGHT);
         GridPane.setHalignment(selectDirectoryButton, HPos.CENTER);
@@ -104,17 +108,19 @@ private void addComponents() {
         root.add(lblSettingsHeading, 0, 0, 2, 1);
         root.add(lblAutoPaste, 0, 1);
         root.add(autoPasteCheckbox, 1, 1);
-        root.add(lblTheme, 0, 2);
-        root.add(themeChoiceBox, 1, 2);
-        root.add(lblDefaultDownloadDir, 0, 3);
-        root.add(tfCurrentDirectory, 1, 3);
-        root.add(selectDirectoryButton, 1, 4, 2, 1);
+        root.add(lblEarlyAccess, 0, 2);
+        root.add(earlyAccessCheckbox, 1, 2);
+        root.add(lblTheme, 0, 3);
+        root.add(themeChoiceBox, 1, 3);
+        root.add(lblDefaultDownloadDir, 0, 4);
+        root.add(tfCurrentDirectory, 1, 4);
+        root.add(selectDirectoryButton, 1, 5);
     }
 
     private void setInitialTheme(String theme) {
         boolean isDark = "Dark".equals(theme);
         Constants.addCSS(settingsScene, isDark ? Constants.DARK_THEME_CSS : Constants.LIGHT_THEME_CSS);
-        applyStyleToLabels(isDark, lblTheme, lblAutoPaste, lblDefaultDownloadDir, lblSettingsHeading);
+        applyStyleToLabels(isDark, lblTheme, lblAutoPaste, lblEarlyAccess, lblDefaultDownloadDir, lblSettingsHeading);
         tfCurrentDirectory.setStyle("-fx-text-fill: " + (isDark ? "white" : "black") + " ; -fx-font-weight: Bold");
     }
 
@@ -140,10 +146,18 @@ private void createAutoPasteCheck() {
         autoPasteCheckbox.selectedProperty().addListener(((observable, oldValue, newValue) -> AppSettings.SET.mainAutoPaste(newValue)));
     }
 
+    private void createEarlyAccessCheck() {
+        earlyAccessCheckbox = new CheckBox();
+        earlyAccessCheckbox.setSelected(AppSettings.GET.earlyAccess());
+        earlyAccessCheckbox.setMaxWidth(5.0);
+        earlyAccessCheckbox.selectedProperty().addListener(((observable, oldValue, newValue) -> AppSettings.SET.earlyAccess(newValue)));
+    }
+
     private void createLabels() {
         Paint textFill = LinearGradient.valueOf("linear-gradient(to right, #0f0c29, #302b63, #24243e)");
         lblSettingsHeading = UI_COMPONENT_BUILDER_INSTANCE.buildLabel("Settings", Font.font("monospace", FontWeight.EXTRA_BOLD, 100), textFill);
         lblAutoPaste = UI_COMPONENT_BUILDER_INSTANCE.buildLabel("Auto-Paste", Font.font("Arial", FontWeight.EXTRA_BOLD, 20), textFill);
+        lblEarlyAccess = UI_COMPONENT_BUILDER_INSTANCE.buildLabel("Get Early Access Updates", Font.font("Arial", FontWeight.EXTRA_BOLD, 20), textFill);
         lblTheme = UI_COMPONENT_BUILDER_INSTANCE.buildLabel("Theme", Font.font("Arial", FontWeight.EXTRA_BOLD, 20), textFill);
         lblDefaultDownloadDir = UI_COMPONENT_BUILDER_INSTANCE.buildLabel("Default Download Directory", Font.font("Arial", FontWeight.BOLD, 20), textFill);
     }
diff --git a/GUI/src/main/java/ui/Splash.java b/GUI/src/main/java/ui/Splash.java
index dc5c01587..7e974dd9d 100644
--- a/GUI/src/main/java/ui/Splash.java
+++ b/GUI/src/main/java/ui/Splash.java
@@ -47,7 +47,7 @@ public void start(Stage primaryStage) {
     @Override
     public void handleStateChangeNotification(StateChangeNotification info) {
         StateChangeNotification.Type type = info.getType();
-        if (Objects.requireNonNull(type) == StateChangeNotification.Type.BEFORE_LOAD) {
+        if (Objects.requireNonNull(type) == StateChangeNotification.Type.BEFORE_START) {
             double time;
             if (AppSettings.GET.ytDlpUpdating()) {
                 time = 2.0;
diff --git a/GUI/src/main/java/ui/Theme.java b/GUI/src/main/java/ui/Theme.java
index d0dcf62f2..5212a27df 100644
--- a/GUI/src/main/java/ui/Theme.java
+++ b/GUI/src/main/java/ui/Theme.java
@@ -103,6 +103,7 @@ private static void updateButtonStyles(boolean isDark, String theme) {
         changeButtonStyle(isDark, Settings.getSelectDirectoryButton());
         changeButtonStyle(isDark, ConfirmationDialog.getBtnYes());
         changeButtonStyle(isDark, ConfirmationDialog.getBtnNo());
+        changeButtonStyle(isDark, ConfirmationDialog.getBtnOk());
         changeButtonStyle(isDark, ManageFolders.getBtnClose());
         changeButtonStyle(isDark, ManageFolders.getBtnRemove());
         setupButtonGraphics(theme);
diff --git a/GUI/src/main/java/ui/UIController.java b/GUI/src/main/java/ui/UIController.java
index 59027c744..b2f70fea0 100644
--- a/GUI/src/main/java/ui/UIController.java
+++ b/GUI/src/main/java/ui/UIController.java
@@ -8,6 +8,7 @@
 import gui.support.Constants;
 import gui.support.Folders;
 import gui.support.Jobs;
+import gui.updater.GUIUpdateExecutor;
 import gui.utils.CheckFile;
 import gui.utils.MessageBroker;
 import javafx.application.Platform;
@@ -32,11 +33,16 @@
 import javafx.scene.text.TextFlow;
 import javafx.stage.DirectoryChooser;
 import javafx.stage.Stage;
+import main.Drifty_GUI;
+import properties.OS;
 import support.Job;
 import support.JobHistory;
 import utils.Utility;
 
 import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.*;
 import java.util.concurrent.ConcurrentLinkedDeque;
@@ -86,6 +92,12 @@ private UIController() {
     Methods for initializing the various controls that are on the form - MainGridPane
      */
     private void start(MainGridPane pane) {
+        new Thread(() -> {
+            if (AppSettings.GET.driftyUpdateAvailable()) {
+                M.msgLogInfo("A new version of Drifty is available!");
+                showUpdateDialog();
+            }
+        }).start();
         form = pane;
         setControlProperties();
         setControlActions();
@@ -93,6 +105,64 @@ private void start(MainGridPane pane) {
         commitJobListToListView();
     }
 
+    public void showUpdateDialog() {
+        if (OS.isMac() || Environment.isAdministrator()) { // If the user is running as an administrator, they can update the application. Otherwise, they will be prompted to run as an administrator. For Mac, the user will always be prompted to update the application as a `.pkg` file will just be opened to install the update (the user has to manually install the update).
+            ConfirmationDialog ask = new ConfirmationDialog("Update Available", "A new version of Drifty is available!" + nl.repeat(2) + AppSettings.GET.newDriftyVersionName() + nl.repeat(2) + "Do you want to download and install the update?", false, false);
+            if (ask.getResponse().isYes()) {
+                downloadUpdate();
+            }
+        } else {
+            ConfirmationDialog ask = new ConfirmationDialog("Update Available", "A new version of Drifty is available!" + nl.repeat(2) + AppSettings.GET.newDriftyVersionName() + nl.repeat(2) + "Unfortunately, you do not have the necessary permissions to update the application." + nl.repeat(2) + "Please run Drifty as an administrator to update the application.", true, false);
+            ask.getResponse();
+        }
+    }
+
+    private void downloadUpdate() {
+        String previouslySelectedDir = getDir(); // Save the download folder selected before the update was initiated.
+        try {
+            // "Current executable" means the executable currently running i.e., the one that is outdated.
+            File currentExecutableFile = new File(Drifty_GUI.class.getProtectionDomain().getCodeSource().getLocation().toURI());
+            // "Latest executable" means the executable that is to be downloaded and installed i.e., the latest version.
+            // "tmpFolder" is the temporary folder where the latest executable will be downloaded to.
+            File tmpFolder = Files.createTempDirectory("Drifty").toFile();
+            tmpFolder.deleteOnExit();
+            // For Mac, the latest executable is a ".pkg" file as it is the only working way to update the application, i.e., by installing a new version.
+            // For other OS, the latest executable name along with the extension is the same as that of the current executable.
+            String latestExecutableName = OS.isMac() ? "Drifty_GUI.pkg" : currentExecutableFile.getName();
+            File latestExecutableFile = Paths.get(tmpFolder.getPath()).resolve(latestExecutableName).toFile();
+            // Get the download queue already present in the application before adding the latest executable to it. This is done to ensure that the latest executable is downloaded first and alone.
+            ConcurrentLinkedDeque<Job> currentDownloadQueue = getJobs().jobList();
+            // Clear the download queue to download only the latest executable to prevent any other downloads from interfering with the update process.
+            getJobs().clear();
+
+            // Download the latest executable
+            Job updateJob = new Job(Constants.updateURL.toString(), latestExecutableFile.getParent(), latestExecutableFile.getName(), false);
+            addJob(updateJob);
+            Thread downloadUpdate = new Thread(batchDownloader());
+            downloadUpdate.start();
+            while (!downloadUpdate.getState().equals(Thread.State.TERMINATED)) {
+                sleep(500);
+            }
+            setDir(previouslySelectedDir); // Reset the download folder to the one that was selected before the update was initiated.
+            AppSettings.SET.lastFolder(previouslySelectedDir); // Reset the download folder to the one that was selected before the update was initiated.
+            // Reset the download queue to the previous state.
+            getJobs().setList(currentDownloadQueue);
+            if (latestExecutableFile.exists() && latestExecutableFile.isFile() && latestExecutableFile.length() > 0) {
+                // If the latest executable was successfully downloaded, set the executable permission and execute the update.
+                GUIUpdateExecutor updateExecutor = new GUIUpdateExecutor(currentExecutableFile, latestExecutableFile);
+                updateExecutor.execute();
+            } else {
+                M.msgUpdateError("Failed to download update!");
+            }
+        } catch (IOException e) {
+            M.msgUpdateError("Failed to create temporary folder for downloading update! " + e.getMessage());
+        } catch (URISyntaxException e) {
+            M.msgUpdateError("Failed to get the location of the current executable! " + e.getMessage());
+        } catch (Exception e) {
+            M.msgUpdateError("Failed to update! An unknown error occurred! " + e.getMessage());
+        }
+    }
+
     private void setControlProperties() {
         setDir(folders.getDownloadFolder());
         DIRECTORY_EXISTS.setValue(new File(getDir()).exists());
@@ -519,10 +589,10 @@ private void checkHistoryAddJobs(Worker<ConcurrentLinkedDeque<Job>> worker) {
                             ask = new ConfirmationDialog("File Already Downloaded and Exists", message, renameFile(job.getFilename(), job.getDir()));
                         } else if (existsNoHistory) {
                             message = String.format(fileExistsString, job.getFilename());
-                            ask = new ConfirmationDialog("File Already Exists", message, false);
+                            ask = new ConfirmationDialog("File Already Exists", message, false, false);
                         } else if (fileHasHistory) {
                             message = String.format(pastJobNoFile, job.getFilename());
-                            ask = new ConfirmationDialog("File Already Downloaded", message, false);
+                            ask = new ConfirmationDialog("File Already Downloaded", message, false, false);
                         }
                         if (fileHasHistory || existsHasHistory || existsNoHistory) {
                             addJob = ask.getResponse().isYes();
diff --git a/GUI/src/main/resources/META-INF/native-image/reflect-config.json b/GUI/src/main/resources/META-INF/native-image/reflect-config.json
index 2c3efaf79..b9158f6e8 100644
--- a/GUI/src/main/resources/META-INF/native-image/reflect-config.json
+++ b/GUI/src/main/resources/META-INF/native-image/reflect-config.json
@@ -111,10 +111,6 @@
   "name":"com.sun.prism.shader.Mask_TextureSuper_Loader",
   "methods":[{"name":"loadShader","parameterTypes":["com.sun.prism.ps.ShaderFactory","java.io.InputStream"] }]
 },
-{
-  "name":"com.sun.prism.shader.Solid_Color_Loader",
-  "methods":[{"name":"loadShader","parameterTypes":["com.sun.prism.ps.ShaderFactory","java.io.InputStream"] }]
-},
 {
   "name":"com.sun.prism.shader.Solid_TextureFirstPassLCD_Loader",
   "methods":[{"name":"loadShader","parameterTypes":["com.sun.prism.ps.ShaderFactory","java.io.InputStream"] }]
diff --git a/GUI/src/main/resources/META-INF/native-image/resource-config.json b/GUI/src/main/resources/META-INF/native-image/resource-config.json
index 6f7abad5e..63a32fc10 100644
--- a/GUI/src/main/resources/META-INF/native-image/resource-config.json
+++ b/GUI/src/main/resources/META-INF/native-image/resource-config.json
@@ -140,8 +140,6 @@
     "pattern":"javafx.graphics:\\Qcom/sun/prism/es2/glsl/FillRoundRect_Color.frag\\E"
   }, {
     "pattern":"javafx.graphics:\\Qcom/sun/prism/es2/glsl/Mask_TextureSuper.frag\\E"
-  }, {
-    "pattern":"javafx.graphics:\\Qcom/sun/prism/es2/glsl/Solid_Color.frag\\E"
   }, {
     "pattern":"javafx.graphics:\\Qcom/sun/prism/es2/glsl/Solid_TextureFirstPassLCD.frag\\E"
   }, {