diff --git a/GChan/Controllers/MainController.cs b/GChan/Controllers/MainController.cs
index 6e06f67..f8e967a 100644
--- a/GChan/Controllers/MainController.cs
+++ b/GChan/Controllers/MainController.cs
@@ -1,5 +1,6 @@
 using GChan.Data;
 using GChan.Forms;
+using GChan.Helpers;
 using GChan.Models;
 using GChan.Properties;
 using GChan.Trackers;
@@ -82,7 +83,7 @@ public MainController(MainForm mainForm)
 
             scanTimer.Enabled = false;
             scanTimer.Interval = Settings.Default.ScanTimer;
-            scanTimer.Tick += new EventHandler(Scan);
+            scanTimer.Tick += new EventHandler(StartScanThread);
         }
 
         public void LoadTrackers()
@@ -106,7 +107,6 @@ public void LoadTrackers()
 
                 new SysThread(() =>
                 {
-                    // END TODO
                     Parallel.ForEach(threads, (thread) =>
                     {
                         Thread newThread = (Thread)Utils.CreateNewTracker(thread);
@@ -114,16 +114,16 @@ public void LoadTrackers()
                     });
 
                     Form.Invoke((MethodInvoker)delegate {
-                        Done();
+                        FinishLoadingTrackers();
                     });
                 }).Start();
             }
 
             /// Executed once everything has finished being loaded.
-            void Done()
+            void FinishLoadingTrackers()
             {
                 scanTimer.Enabled = true;
-                Scan(this, new EventArgs());
+                StartScanThread(this, new EventArgs());
 
                 // Check for updates.
                 if (Settings.Default.CheckForUpdatesOnStart)
@@ -133,41 +133,56 @@ void Done()
             }
         }
 
-        public void AddUrl(string url)
+        public void AddUrls(IEnumerable<string> urls)
         {
-            Tracker newTracker = Utils.CreateNewTracker(url);
-
-            if (newTracker != null)
-            {
-                List<Tracker> trackerList = ((newTracker.Type == Type.Board) ? Model.Boards.Cast<Tracker>() : Model.Threads.Cast<Tracker>()).ToList();
+            bool trackerWasAdded = false;
+            foreach (var url in urls)
+            { 
+                var newTracker = Utils.CreateNewTracker(url);
 
-                if (IsUnique(newTracker, trackerList))
-                {
-                    AddNewTracker(newTracker);
-                    scanTimer.Enabled = true;
-                    Scan(this, new EventArgs());
-                }
-                else
+                if (newTracker != null)
                 {
-                    DialogResult result = MessageBox.Show(
-                        "URL is already being tracked!\nOpen corresponding folder?",
-                        "Error", MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button1);
+                    var trackerList = ((newTracker.Type == Type.Board) ? Model.Boards.Cast<Tracker>() : Model.Threads.Cast<Tracker>()).ToArray();
 
-                    if (result == DialogResult.Yes)
+                    if (IsUnique(newTracker, trackerList))
+                    {
+                        var addSuccess = AddNewTracker(newTracker);
+                        if (addSuccess)
+                        { 
+                            trackerWasAdded = true;
+                        }
+                    }
+                    else
                     {
-                        string spath = newTracker.SaveTo;
-                        if (!Directory.Exists(spath))
-                            Directory.CreateDirectory(spath);
-                        Process.Start(spath);
+                        var result = MessageBox.Show(
+                            "URL is already being tracked!\nOpen corresponding folder?",
+                            "Error", MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button1);
+
+                        if (result == DialogResult.Yes)
+                        {
+                            var path = newTracker.SaveTo;
+                            if (!Directory.Exists(path))
+                            { 
+                                Directory.CreateDirectory(path);
+                            }
+                            Process.Start(path);
+                        }
                     }
                 }
+                else
+                {
+                    MessageBox.Show($"Entered text '{url}' is not a supported site or board/thread!");
+                }
             }
-            else
+
+            if (trackerWasAdded)
             {
-                MessageBox.Show($"Entered text '{url}' is not a supported site or board/thread!");
+                scanTimer.Enabled = true;
+                StartScanThread(this, new EventArgs());
             }
         }
 
+        /// <returns>Was <paramref name="tracker"/> added to a tracker list.</returns>
         private bool AddNewTracker(Tracker tracker)
         {
             if (tracker == null)
@@ -235,7 +250,10 @@ internal void ClearTrackers(Type type)
             }
         }
 
-        private void Scan(object sender, EventArgs e)
+        /// <summary>
+        /// Run the scan thread if it isn't already running.
+        /// </summary>
+        private void StartScanThread(object sender, EventArgs e)
         {
             if (scanThread == null || !scanThread.IsAlive)
             {
@@ -249,67 +267,71 @@ private void Scan(object sender, EventArgs e)
             }
         }
 
+        /// <summary>
+        /// Thread entry-point.
+        /// </summary>
         private void ScanRoutine()
         {
             lock (ThreadLock)
             {
                 // Remove 404'd threads
-                for (int i = 0; i < Model.Threads.Count; i++)
-                {
-                    if (Model.Threads[i].Gone)
-                    {
-                        RemoveThread(Model.Threads[i]);
-                        i--;
-                    }
-                }
+                var removedThreads = Model.Threads.RemoveAll(t => t.Gone);
+                removedThreads.ForEach(t => RemoveThread(t));
             }
 
             // Make a copy of the current boards and scrape them for new threads.
-            var boards = Model.Boards.ToList();
+            var boards = Model.Boards.ToArray();
 
-            for (int i = 0; i < boards.Count; i++)
+            foreach (var board in boards)
             {
-                if (boards[i].Scraping)
+                if (board.Scraping)
                 {
-                    // OrderBy because we need the threads to be in ascending order by ID for LargestAddedThreadNo to be useful.
-                    string[] boardThreadUrls = boards[i].GetThreadLinks().OrderBy(t => t).ToArray();
-                    int largestNo = 0;
+                    var threadUrls = board.GetThreadLinks();
+                    var greatestThreadIdLock = new object();
+                    var greatestThreadId = 0;
 
-                    Parallel.ForEach(boardThreadUrls, (url) =>
+                    Parallel.ForEach(threadUrls, (threadUrl) =>
                     {
-                        if (boards[i].Scraping)
+                        if (board.Scraping)
                         {
-                            int? id = GetThreadId(boards[i], url);
+                            var id = GetThreadId(board, threadUrl);
 
-                            if (id.HasValue && id.Value > boards[i].LargestAddedThreadNo)
+                            if (id != null && id > board.LargestAddedThreadNo)
                             {
-                                Thread newThread = (Thread)Utils.CreateNewTracker(url);
+                                var newThread = (Thread)Utils.CreateNewTracker(threadUrl);
 
                                 if (newThread != null && IsUnique(newThread, Model.Threads))
                                 {
-                                    bool urlWasAdded = AddNewTracker(newThread);
+                                    var urlWasAdded = AddNewTracker(newThread);
 
                                     if (urlWasAdded)
                                     {
-                                        if (id.Value > largestNo)   //Not exactly safe in multithreaded but should work fine.
-                                            largestNo = id.Value;
+                                        lock (greatestThreadIdLock)
+                                        { 
+                                            if (id > greatestThreadId)
+                                            {
+                                                greatestThreadId = id.Value;
+                                            }
+                                        }
                                     }
                                 }
                             }
                         }
                     });
 
-                    boards[i].LargestAddedThreadNo = largestNo;
+                    board.LargestAddedThreadNo = greatestThreadId;
                 }
             }
 
             // Make a copy of the current threads and download them.
-            var threads = Model.Threads.ToList();
+            var threads = Model.Threads.ToArray();
 
-            for (int i = 0; i < threads.Count; i++)
+            for (int i = 0; i < threads.Length; i++)
             {
                 if (threads[i].Scraping)
+                { 
                     ThreadPool.QueueUserWorkItem(new WaitCallback(threads[i].Download));
+                }
             }
         }
 
@@ -319,8 +341,8 @@ private void ScanRoutine()
             {
                 var idCodeMatch = board.SiteName switch
                 {
-                    Thread_4Chan.ID_CODE_REGEX => Regex.Match(url, Thread_4Chan.ID_CODE_REGEX),
-                    Board_8Kun.SITE_NAME_8KUN => Regex.Match(url, Thread_8Kun.ID_CODE_REGEX),
+                    Board_4Chan.SITE_NAME => Regex.Match(url, Thread_4Chan.ID_CODE_REGEX),
+                    Board_8Kun.SITE_NAME => Regex.Match(url, Thread_8Kun.ID_CODE_REGEX),
                     _ => null,
                 };
 
@@ -342,12 +364,13 @@ private void ScanRoutine()
         /// </summary>
         private bool IsUnique(Tracker tracker, IEnumerable<Tracker> list)
         {
-            if (tracker.Type == Type.Thread)
+            if (tracker is Thread thread)
             {
-                return !list.OfType<Thread>().Any(
-                    t => t.SiteName == tracker.SiteName &&
-                    t.BoardCode == tracker.BoardCode &&
-                    t.ID == ((Thread)tracker).ID);
+                return !list.OfType<Thread>().Any(t => 
+                    t.SiteName == thread.SiteName &&
+                    t.BoardCode == thread.BoardCode &&
+                    t.ID == thread.ID
+                );
             }
             else // Board
             {
@@ -475,8 +498,8 @@ public bool Closing()
             scanTimer.Dispose();
 
             if (Settings.Default.SaveListsOnClose)
-            { 
-                DataController.SaveAll(Model.Threads.ToList(), Model.Boards);
+            {
+                DataController.SaveAll(Model.Threads.ToArray(), Model.Boards.ToArray());
             }
 
             return false;
diff --git a/GChan/Controls/SortableBindingList/SortableBindingList.cs b/GChan/Controls/SortableBindingList/SortableBindingList.cs
index aa9dcce..eb6924a 100644
--- a/GChan/Controls/SortableBindingList/SortableBindingList.cs
+++ b/GChan/Controls/SortableBindingList/SortableBindingList.cs
@@ -1,9 +1,15 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Drawing.Imaging;
+using System.Linq;
 
 namespace GChan.Controls
 {
+    /// <summary>
+    /// Binding list that gives list changed events, also supports sorting for the WinForms UI.
+    /// Attempts to be thread-safe as possible within reason.
+    /// </summary>
     public class SortableBindingList<T> : BindingList<T>
     {
         private readonly Dictionary<Type, PropertyComparer<T>> comparers;
@@ -11,6 +17,8 @@ public class SortableBindingList<T> : BindingList<T>
         private ListSortDirection listSortDirection;
         private PropertyDescriptor propertyDescriptor;
 
+        private readonly object ilock = new();
+
         public SortableBindingList()
             : base(new List<T>())
         {
@@ -48,6 +56,32 @@ protected override bool SupportsSearchingCore
             get { return true; }
         }
 
+        public new void Add(T item)
+        {
+            lock (ilock)
+            {
+                base.Add(item);
+            }
+        }
+
+        public new T this[int index]
+        {
+            get
+            {
+                lock (ilock)
+                {
+                    return base[index];
+                }
+            }
+            set
+            {
+                lock (ilock)
+                {
+                    base[index] = value;
+                }
+            }
+        }
+
         protected override void ApplySortCore(PropertyDescriptor property, ListSortDirection direction)
         {
             List<T> itemsList = (List<T>)Items;
@@ -93,5 +127,89 @@ protected override int FindCore(PropertyDescriptor property, object key)
 
             return -1;
         }
+
+        /// <returns>Item removed from <paramref name="index"/>.</returns>
+        public new T RemoveAt(int index)
+        {
+            lock (ilock) 
+            {
+                var item = this[index];
+                base.RemoveAt(index);
+                return item;
+            }
+        }
+
+        public new void Remove(T item)
+        {
+            lock (ilock)
+            {
+                if (Contains(item))
+                {
+                    base.Remove(item);
+                }
+            }
+        }
+
+        /// <returns>Removed items.</returns>
+        public T[] RemoveAll(Predicate<T> match)
+        {
+            lock (ilock)
+            {
+                var itemsToRemove = new List<T>();
+
+                foreach (T item in this)
+                {
+                    if (match(item))
+                    {
+                        itemsToRemove.Add(item);
+                    }
+                }
+
+                foreach (T item in itemsToRemove)
+                {
+                    this.Remove(item);
+                }
+
+                return itemsToRemove.ToArray();
+            }
+        }
+
+        /// <summary>
+        /// Lock the list and foreach loop over the items (don't do long operations with this).
+        /// </summary>
+        public void ForEachLocked(Action<T> action)
+        {
+            lock (ilock)
+            { 
+                foreach (var item in this)
+                {
+                    action(item);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Thread Safe implementation.
+        /// </summary>
+        public List<T> ToList()
+        {
+            lock (ilock)
+            {
+                return Enumerable.ToList(this);
+            }
+        }
+
+        /// <summary>
+        /// Thread Safe implementation.
+        /// </summary>
+        public T[] ToArray()
+        {
+            lock (ilock)
+            {
+                return Enumerable.ToArray(this);
+            }
+        }
+
+        public T[] Copy() => ToArray();
     }
 }
\ No newline at end of file
diff --git a/GChan/Forms/AboutBox.resx b/GChan/Forms/AboutBox.resx
index cc27825..434a569 100644
--- a/GChan/Forms/AboutBox.resx
+++ b/GChan/Forms/AboutBox.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -118,17 +118,18 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="richTextBoxDescription.Text" xml:space="preserve">
-    <value>YChan forked and became GChan by Issung at
-https://github.com/Issung/GChan
-
-List of contributers to GChan (Thank you!)
- - MistressAshai
-
-YChan updated by Ricardo1991 and FugiMuffi at
-https://github.com/Ricardo1991/YChan
-https://github.com/FugiMuffi/YChan
-
-Original project (YChan): https://sourceforge.net/projects/ychan/
+    <value>YChan forked and became GChan by Issung at
+https://github.com/Issung/GChan
+
+List of contributers to GChan (Thank you!)
+ - MistressAshai
+ - RoyalJackal
+
+YChan updated by Ricardo1991 and FugiMuffi at
+https://github.com/Ricardo1991/YChan
+https://github.com/FugiMuffi/YChan
+
+Original project (YChan): https://sourceforge.net/projects/ychan/
 Created by mirage (mirage@secure-mail.biz)</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/GChan/Forms/MainForm.Designer.cs b/GChan/Forms/MainForm.Designer.cs
index 8e03219..aceb479 100644
--- a/GChan/Forms/MainForm.Designer.cs
+++ b/GChan/Forms/MainForm.Designer.cs
@@ -445,7 +445,6 @@ private void InitializeComponent() {
             // 
             // urlTextBox
             // 
-            this.urlTextBox.AllowDrop = true;
             this.urlTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.urlTextBox.Location = new System.Drawing.Point(12, 30);
diff --git a/GChan/Forms/MainForm.cs b/GChan/Forms/MainForm.cs
index 382f7f5..7422b00 100644
--- a/GChan/Forms/MainForm.cs
+++ b/GChan/Forms/MainForm.cs
@@ -2,8 +2,6 @@
 using GChan.Models;
 using GChan.Properties;
 using GChan.Trackers;
-using NLog;
-using NLog.Targets;
 using System;
 using System.Diagnostics;
 using System.IO;
@@ -87,13 +85,8 @@ private void addButton_Click(object sender, EventArgs e)
                 textBox = Clipboard.GetText();
 
             // Get url from TextBox
-            var urls = textBox.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
-
-            for (int i = 0; i < urls.Length; i++)
-            {
-                urls[i] = Utils.PrepareURL(urls[i]);
-                Controller.AddUrl(urls[i]);
-            }
+            var urls = textBox.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries).Select(Utils.PrepareURL);
+            Controller.AddUrls(urls);
         }
 
         private void DragDropHandler(object sender, DragEventArgs e)
@@ -101,13 +94,8 @@ private void DragDropHandler(object sender, DragEventArgs e)
             var textData = (string)e.Data.GetData(DataFormats.Text);
 
             // Get url from TextBox
-            var urls = textData.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
-
-            for (int i = 0; i < urls.Length; i++)
-            {
-                urls[i] = Utils.PrepareURL(urls[i]);
-                Controller.AddUrl(urls[i]);
-            }
+            var urls = textData.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries).Select(Utils.PrepareURL);
+            Controller.AddUrls(urls);
         }
 
         private void DragEnterHandler(object sender, DragEventArgs e)
@@ -146,7 +134,9 @@ private void openFolderToolStripMenuItem_Click(object sender, EventArgs e)
             {
                 string spath = Model.Threads[ThreadGridViewSelectedRowIndex].SaveTo;
                 if (!Directory.Exists(spath))
+                { 
                     Directory.CreateDirectory(spath);
+                }
                 Process.Start(spath);
             }
         }
diff --git a/GChan/Forms/SettingsForm.cs b/GChan/Forms/SettingsForm.cs
index 19bd463..953473a 100644
--- a/GChan/Forms/SettingsForm.cs
+++ b/GChan/Forms/SettingsForm.cs
@@ -5,6 +5,7 @@
 using System.IO;
 using System.Linq;
 using System.Windows.Forms;
+using Microsoft.WindowsAPICodePack.Dialogs;
 
 namespace GChan
 {
@@ -148,14 +149,14 @@ private bool hasWriteAccessToFolder(string folderPath, out string reason)
 
         private void SetPathButton_Click(object sender, EventArgs e)
         {
-            FolderBrowserDialog FolD = new FolderBrowserDialog();
-            FolD.Description = "Select Folder";
-            FolD.SelectedPath = @"C:\";
-            DialogResult dRes = FolD.ShowDialog(this);
-
-            if (dRes == DialogResult.OK)
+            var openFileDialog = new CommonOpenFileDialog();
+            openFileDialog.IsFolderPicker = true;
+            openFileDialog.Title = "Select Folder";
+            openFileDialog.InitialDirectory = Path.GetPathRoot(Environment.SystemDirectory);
+            
+            if (openFileDialog.ShowDialog() == CommonFileDialogResult.Ok && !string.IsNullOrWhiteSpace(openFileDialog.FileName))
             {
-                directory = FolD.SelectedPath;
+                directory = openFileDialog.FileName;
                 directoryTextBox.Text = directory;
             }
         }
diff --git a/GChan/GChan.csproj b/GChan/GChan.csproj
index 608b0b8..5eade81 100644
--- a/GChan/GChan.csproj
+++ b/GChan/GChan.csproj
@@ -14,6 +14,8 @@
     <FileAlignment>512</FileAlignment>
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
     <PublishUrl>C:\Users\joel\Documents\GChanPublish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -25,12 +27,10 @@
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
     <ApplicationRevision>1</ApplicationRevision>
-    <ApplicationVersion>4.0.0.%2a</ApplicationVersion>
+    <ApplicationVersion>5.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -63,6 +63,15 @@
     <GenerateManifests>true</GenerateManifests>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Microsoft.WindowsAPICodePack, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\WindowsAPICodePack-Core.1.1.1\lib\Microsoft.WindowsAPICodePack.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.WindowsAPICodePack.Shell, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\WindowsAPICodePack-Shell.1.1.1\lib\Microsoft.WindowsAPICodePack.Shell.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <HintPath>..\packages\NLog.5.0.4\lib\net46\NLog.dll</HintPath>
     </Reference>
@@ -93,6 +102,9 @@
       <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.Text.Json, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Text.Json.4.7.1\lib\net461\System.Text.Json.dll</HintPath>
+    </Reference>
     <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
@@ -136,6 +148,7 @@
     <Compile Include="Forms\UpdateInfoForm.Designer.cs">
       <DependentUpon>UpdateInfoForm.cs</DependentUpon>
     </Compile>
+    <Compile Include="Helpers\EnumerableExtensions.cs" />
     <Compile Include="ImageLink.cs" />
     <Compile Include="Controls\PreferencesDataGridView.cs">
       <SubType>Component</SubType>
diff --git a/GChan/Helpers/EnumerableExtensions.cs b/GChan/Helpers/EnumerableExtensions.cs
new file mode 100644
index 0000000..afbe11c
--- /dev/null
+++ b/GChan/Helpers/EnumerableExtensions.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+
+namespace GChan.Helpers
+{
+    public static class EnumerableExtensions
+    {
+        public static void ForEach<T>(this IEnumerable<T> source, Action<T> action)
+        {
+            foreach (var item in source)
+            {
+                action(item);
+            }
+        }
+    }
+}
diff --git a/GChan/ImageLink.cs b/GChan/ImageLink.cs
index 2e85336..85785da 100644
--- a/GChan/ImageLink.cs
+++ b/GChan/ImageLink.cs
@@ -7,48 +7,48 @@ namespace GChan
 {
     public class ImageLink
     {
+        /// <summary>
+        /// For 4chan: Unix timestamp with microseconds at which the image was uploaded.
+        /// For 8kun: The ID of the post this image belongs to (same as No).
+        /// </summary>
         public long Tim;
 
         /// <summary>
         /// URL to the access the image.
         /// </summary>
-        public string URL;
+        public string Url;
 
         /// <summary>
-        /// The filename the image was uploaded with. 
-        /// e.g. "LittleSaintJames.jpg", NOT the stored filename e.g. "1265123123.jpg".
+        /// The filename the image was uploaded as <strong>without an extension</strong>.<br/>
+        /// e.g. "LittleSaintJames", NOT the stored filename e.g. "1265123123.jpg".
         /// </summary>
         public string UploadedFilename;
 
         private readonly ILogger logger = LogManager.GetCurrentClassLogger();
 
-        public ImageLink(string url, string uploadedFilename)
-        {
-            URL = url;
-            UploadedFilename = uploadedFilename;
-        }
+        /// <summary>
+        /// The ID of the post this image belongs to.
+        /// </summary>
+        public long No;
 
-        public ImageLink(long tim, string url, string uploadedFilename)
+        public ImageLink(long tim, string url, string uploadedFilename, long no)
         {
             Tim = tim;
-            URL = url;
+            Url = url;
             UploadedFilename = uploadedFilename;
+            No = no;
         }
 
-        public string GenerateNewFilename(ImageFileNameFormat format)
+        public string GenerateFilename(ImageFileNameFormat format)
         {
-            //const int FILENAME_MAX_LENGTH = 254;
-            string[] parts = URL.Split('/');
-            string lastPart = (parts.Length > 0) ? parts.Last() : URL;
-
-            string extension = Path.GetExtension(URL); // Contains period (.).
+            var extension = Path.GetExtension(Url); // Contains period (.).
 
-            string result = format switch
+            var result = format switch
             {
-                ImageFileNameFormat.ID => lastPart,
-                ImageFileNameFormat.OriginalFilename => UploadedFilename + extension,
-                ImageFileNameFormat.IDAndOriginalFilename => $"{Tim}-{UploadedFilename}{extension}",
-                ImageFileNameFormat.OriginalFilenameAndID => $"{UploadedFilename}-{Tim}{extension}",
+                ImageFileNameFormat.ID => $"{No}{extension}",
+                ImageFileNameFormat.OriginalFilename => $"{UploadedFilename}{extension}",
+                ImageFileNameFormat.IDAndOriginalFilename => $"{No} - {UploadedFilename}{extension}",
+                ImageFileNameFormat.OriginalFilenameAndID => $"{UploadedFilename} - {No}{extension}",
                 _ => throw new ArgumentException("Given value for 'format' is unknown.")
             };
 
@@ -59,7 +59,7 @@ public string GenerateNewFilename(ImageFileNameFormat format)
 
         public override string ToString()
         {
-            return $"ImageLink {{ Tim: '{Tim}', URL: '{URL}', UploadedFilename: '{UploadedFilename}' }}";
+            return $"ImageLink {{ Tim: '{Tim}', Url: '{Url}', UploadedFilename: '{UploadedFilename}', No: '{No}' }}";
         }
     }
 }
diff --git a/GChan/Models/MainFormModel.cs b/GChan/Models/MainFormModel.cs
index ee9f8ec..d24d3a4 100644
--- a/GChan/Models/MainFormModel.cs
+++ b/GChan/Models/MainFormModel.cs
@@ -23,9 +23,9 @@ public void NotifyPropertyChanged([CallerMemberName] string propertyName = "")
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
 
-        public SortableBindingList<Thread> Threads { get; set; } = new SortableBindingList<Thread>();
+        public SortableBindingList<Thread> Threads { get; set; } = new();
 
-        public BindingList<Board> Boards { get; set; } = new BindingList<Board>();
+        public SortableBindingList<Board> Boards { get; set; } = new();
 
         public string ThreadsTabText => $"Threads ({Threads.Count})";
 
diff --git a/GChan/Trackers/Sites/Board_4Chan.cs b/GChan/Trackers/Sites/Board_4Chan.cs
index 4874796..d636bc9 100644
--- a/GChan/Trackers/Sites/Board_4Chan.cs
+++ b/GChan/Trackers/Sites/Board_4Chan.cs
@@ -1,25 +1,24 @@
-using NLog;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Net;
-using System.Runtime.Serialization.Json;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
-using System.Xml;
-using System.Xml.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 
 namespace GChan.Trackers
 {
     public class Board_4Chan : Board
     {
-        public const string SITE_NAME_4CHAN = "4chan";
+        public const string SITE_NAME = "4chan";
         public const string IS_BOARD_REGEX = "boards.(4chan|4channel).org/[a-zA-Z0-9]*?/*$";
         public const string BOARD_CODE_REGEX = "(?<=((chan|channel).org/))[a-zA-Z0-9]+(?=(/))?";
 
         public Board_4Chan(string URL) : base(URL)
         {
-            SiteName = SITE_NAME_4CHAN;
+            SiteName = SITE_NAME;
 
             Match boardCodeMatch = Regex.Match(URL, BOARD_CODE_REGEX);
             BoardCode = boardCodeMatch.Groups[0].Value;
@@ -35,30 +34,20 @@ override public string[] GetThreadLinks()
             //string URL = "http://a.4cdn.org/" + base.URL.Split('/')[3] + "/catalog.json"; //example: http://a.4cdn.org/b/catalog.json
             string URL = "http://a.4cdn.org/" + BoardCode + "/catalog.json";
             List<string> threadLinks = new List<string>();
-            string str = "";
-            XmlNodeList threadIDs;
 
             try
             {
-                string json = new WebClient().DownloadString(URL);
-                byte[] bytes = Encoding.ASCII.GetBytes(json);
-
-                using (var stream = new MemoryStream(bytes))
+                JArray jArray;
+                using (var web = new WebClient())
                 {
-                    var quotas = new XmlDictionaryReaderQuotas();
-                    var jsonReader = JsonReaderWriterFactory.CreateJsonReader(stream, quotas);
-                    var xml = XDocument.Load(jsonReader);
-                    str = xml.ToString();
+                    string json = web.DownloadString(URL);
+                    jArray = JArray.Parse(json);
                 }
 
-                XmlDocument doc = new XmlDocument();
-                doc.LoadXml(str);
-                threadIDs = doc.DocumentElement.SelectNodes("/root/item/threads/item/no");
-
-                for (int i = 0; i < threadIDs.Count; i++)
-                {
-                    threadLinks.Add("http://boards.4chan.org/" + Url.Split('/')[3] + "/thread/" + threadIDs[i].InnerText);
-                }
+                threadLinks = jArray
+                    .SelectTokens("[*].threads[*]")
+                    .Select(x => "http://boards.4chan.org/" + BoardCode + "/thread/" + x["no"])
+                    .ToList();
             }
             catch (WebException webEx)
             {
diff --git a/GChan/Trackers/Sites/Board_8Kun.cs b/GChan/Trackers/Sites/Board_8Kun.cs
index 1aff4fd..e5fd9e4 100644
--- a/GChan/Trackers/Sites/Board_8Kun.cs
+++ b/GChan/Trackers/Sites/Board_8Kun.cs
@@ -1,25 +1,24 @@
 using GChan.Properties;
-using NLog;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Net;
-using System.Runtime.Serialization.Json;
 using System.Text;
 using System.Text.RegularExpressions;
-using System.Xml;
-using System.Xml.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 
 namespace GChan.Trackers
 {
     public class Board_8Kun : Board
     {
-        public const string SITE_NAME_8KUN = "8kun";
+        public const string SITE_NAME = "8kun";
         public const string boardRegex = @"8kun.top/[a-zA-Z0-9]*?/";
         public const string boardCodeRegex = @"(?<=(8kun.top/))[a-zA-Z0-9]*(?=(/index.html))";
 
         public Board_8Kun(string url) : base(url)
         {
-            SiteName = SITE_NAME_8KUN;
+            SiteName = SITE_NAME;
 
             Match boardCodeMatch = Regex.Match(url, boardCodeRegex);
             BoardCode = boardCodeMatch.Groups[0].Value;
@@ -36,28 +35,20 @@ override public string[] GetThreadLinks()
         {
             string url = "http://8kun.top/" + BoardCode + "/catalog.json";
             List<string> threadUrls = new List<string>();
-            string str = "";
-            XmlNodeList threadNos;
 
             try
             {
-                string json = new WebClient().DownloadString(url);
-                byte[] bytes = Encoding.ASCII.GetBytes(json);
-                using (var stream = new MemoryStream(bytes))
+                JArray jArray;
+                using (var web = new WebClient())
                 {
-                    var quotas = new XmlDictionaryReaderQuotas();
-                    var jsonReader = JsonReaderWriterFactory.CreateJsonReader(stream, quotas);
-                    var xml = XDocument.Load(jsonReader);
-                    str = xml.ToString();
+                    string json = web.DownloadString(url);
+                    jArray = JArray.Parse(json);
                 }
 
-                XmlDocument doc = new XmlDocument();
-                doc.LoadXml(str);
-                threadNos = doc.DocumentElement.SelectNodes("//no");
-                for (int i = 0; i < threadNos.Count; i++)
-                {
-                    threadUrls.Add("http://8kun.top/" + BoardCode + "/res/" + threadNos[i].InnerText + ".html");
-                }
+                threadUrls = jArray
+                    .SelectTokens("..no")
+                    .Select(x => "http://8kun.top/" + BoardCode + "/res/" + x + ".html")
+                    .ToList();
             }
             catch (WebException webEx)
             {
diff --git a/GChan/Trackers/Sites/Thread_4Chan.cs b/GChan/Trackers/Sites/Thread_4Chan.cs
index 49f073d..0306e1f 100644
--- a/GChan/Trackers/Sites/Thread_4Chan.cs
+++ b/GChan/Trackers/Sites/Thread_4Chan.cs
@@ -2,12 +2,12 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Net;
-using System.Runtime.Serialization.Json;
 using System.Text;
 using System.Text.RegularExpressions;
-using System.Xml;
-using System.Xml.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 
 namespace GChan.Trackers
 {
@@ -19,7 +19,7 @@ public class Thread_4Chan : Thread
 
         public Thread_4Chan(string url) : base(url)
         {
-            SiteName = Board_4Chan.SITE_NAME_4CHAN;
+            SiteName = Board_4Chan.SITE_NAME;
 
             Match match = Regex.Match(url, @"boards.(4chan|4channel).org/[a-zA-Z0-9]*?/thread/\d*");
             Url = "http://" + match.Groups[0].Value;
@@ -46,43 +46,27 @@ protected override ImageLink[] GetImageLinks()
             List<ImageLink> links = new List<ImageLink>();
             string JSONUrl = "http://a.4cdn.org/" + BoardCode + "/thread/" + ID + ".json";
             string baseURL = "http://i.4cdn.org/" + BoardCode + "/";
-            string str = "";
-            XmlNodeList xmlTims;
-            XmlNodeList xmlFilenames;
-            XmlNodeList xmlExts;
 
             try
             {
+                JObject jObject;
                 using (var web = new WebClient())
                 {
-                    string Content = web.DownloadString(JSONUrl);
-                    byte[] bytes = Encoding.ASCII.GetBytes(Content);
-
-                    using (var stream = new MemoryStream(bytes))
-                    {
-                        var quotas = new XmlDictionaryReaderQuotas();
-                        var jsonReader = JsonReaderWriterFactory.CreateJsonReader(stream, quotas);
-                        var xml = XDocument.Load(jsonReader);
-                        str = xml.ToString();
-                    }
+                    string json = web.DownloadString(JSONUrl);
+                    jObject = JObject.Parse(json);
                 }
 
-                XmlDocument doc = new XmlDocument();
-                doc.LoadXml(str);
-
                 // The /f/ board (flash) saves the files with their uploaded name.
-                if (Url.Split('/')[3] == "f")
-                    xmlTims = doc.DocumentElement.SelectNodes("/root/posts/item/filename");
-                else
-                    xmlTims = doc.DocumentElement.SelectNodes("/root/posts/item/tim");
-
-                xmlFilenames = doc.DocumentElement.SelectNodes("/root/posts/item/filename");
-                xmlExts = doc.DocumentElement.SelectNodes("/root/posts/item/ext");
-
-                for (int i = 0; i < xmlExts.Count; i++)
-                {
-                    links.Add(new ImageLink(long.Parse(xmlTims[i].InnerText), baseURL + xmlTims[i].InnerText + xmlExts[i].InnerText, xmlFilenames[i].InnerText));
-                }
+                var timPath = BoardCode == "f" ? "filename" : "tim";
+                links = jObject
+                    .SelectTokens("posts[*]")
+                    .Where(x => x["ext"] != null)
+                    .Select(x =>
+                        new ImageLink(x[timPath].Value<long>(),
+                            baseURL + x[timPath] + x["ext"],
+                            x["filename"].ToString(),
+                            x["no"].Value<long>()))
+                    .ToList();
             }
             catch (Exception ex)
             {
@@ -98,69 +82,67 @@ protected override void DownloadHTMLPage()
         {
             List<string> thumbs = new List<string>();
             string htmlPage = "";
-            string str = "";
-            string baseURL = "//i.4cdn.org/" + Url.Split('/')[3] + "/";
-            string JURL = "http://a.4cdn.org/" + Url.Split('/')[3] + "/thread/" + Url.Split('/')[5] + ".json";
+            string baseURL = "//i.4cdn.org/" + BoardCode + "/";
+            string JURL = "http://a.4cdn.org/" + BoardCode + "/thread/" + ID + ".json";
 
             try
             {
-                //Add a UserAgent to prevent 403
+                JObject jObject;
+
                 using (var web = new WebClient())
                 {
+                    //Add a UserAgent to prevent 403
                     web.Headers["User-Agent"] = "Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:47.0) Gecko/20100101 Firefox/47.0";
 
                     htmlPage = web.DownloadString(Url);
 
                     //Prevent the html from being destroyed by the anti adblock script
                     htmlPage = htmlPage.Replace("f=\"to\"", "f=\"penis\"");
-
+                    
                     string json = web.DownloadString(JURL);
-                    byte[] bytes = Encoding.ASCII.GetBytes(json);
-                    using (var stream = new MemoryStream(bytes))
-                    {
-                        var quotas = new XmlDictionaryReaderQuotas();
-                        var jsonReader = JsonReaderWriterFactory.CreateJsonReader(stream, quotas);
-                        var xml = XDocument.Load(jsonReader);
-                        str = xml.ToString();
-                    }
+                    jObject = JObject.Parse(json);
                 }
 
-                XmlDocument doc = new XmlDocument();
-                doc.LoadXml(str);
-                XmlNodeList xmlTim = doc.DocumentElement.SelectNodes("/root/posts/item/tim");
-                XmlNodeList xmlExt = doc.DocumentElement.SelectNodes("/root/posts/item/ext");
-                XmlNodeList xmlFilenames = doc.DocumentElement.SelectNodes("/root/posts/item/filename");
-
-                for (int i = 0; i < xmlExt.Count; i++)
+                var posts = jObject
+                    .SelectTokens("posts[*]")
+                    .Where(x => x["ext"] != null)
+                    .ToList();
+                
+                foreach (var post in posts)
                 {
-                    string old = baseURL + xmlTim[i].InnerText + xmlExt[i].InnerText;
-                    string rep = xmlTim[i].InnerText + xmlExt[i].InnerText;
-                    htmlPage = htmlPage.Replace(old, rep);
+                    string old = baseURL + post["tim"] + post["ext"];
+                    string replacement = post["tim"] + (string) post["ext"];
+                    htmlPage = htmlPage.Replace(old, replacement);
 
                     //get the actual filename saved
-                    string filename = Path.GetFileNameWithoutExtension(new ImageLink(baseURL + xmlTim[i].InnerText + xmlExt[i].InnerText, xmlFilenames[i].InnerText).GenerateNewFilename((ImageFileNameFormat)Settings.Default.ImageFilenameFormat));
+                    string filename = Path.GetFileNameWithoutExtension(
+                        new ImageLink(post["tim"].Value<long>(),
+                                old,
+                                post["filename"].ToString(),
+                                post["no"].Value<long>())
+                            .GenerateFilename((ImageFileNameFormat)Settings.Default.ImageFilenameFormat));
 
                     //Save thumbs for files that need it
-                    if (rep.Split('.')[1] == "webm")
+                    if (replacement.Split('.')[1] == "webm")
                     {
-                        old = "//t.4cdn.org/" + Url.Split('/')[3] + "/" + xmlTim[i].InnerText + "s.jpg";
+                        old = "//t.4cdn.org/" + BoardCode + "/" + post["tim"] + "s.jpg";
                         thumbs.Add("http:" + old);
 
-                        htmlPage = htmlPage.Replace(xmlTim[i].InnerText, filename);
-                        htmlPage = htmlPage.Replace("//i.4cdn.org/" + Url.Split('/')[3] + "/" + filename, "thumb/" + xmlTim[i].InnerText);
+                        htmlPage = htmlPage.Replace(post["tim"].ToString(), filename);
+                        htmlPage = htmlPage.Replace("//i.4cdn.org/" + BoardCode + "/" + filename, "thumb/" + post["tim"]);
                     }
                     else
                     {
-                        string thumbName = rep.Split('.')[0] + "s";
-                        htmlPage = htmlPage.Replace(thumbName + ".jpg", rep.Split('.')[0] + "." + rep.Split('.')[1]);
+                        string thumbName = replacement.Split('.')[0] + "s";
+                        htmlPage = htmlPage.Replace(thumbName + ".jpg", replacement.Split('.')[0] + "." + replacement.Split('.')[1]);
                         htmlPage = htmlPage.Replace("/" + thumbName, thumbName);
 
-                        htmlPage = htmlPage.Replace("//i.4cdn.org/" + Url.Split('/')[3] + "/" + xmlTim[i].InnerText, xmlTim[i].InnerText);
-                        htmlPage = htmlPage.Replace(xmlTim[i].InnerText, filename); //easy fix for images
+                        htmlPage = htmlPage.Replace("//i.4cdn.org/" + BoardCode + "/" + post["tim"], post["tim"].ToString());
+                        htmlPage = htmlPage.Replace(post["tim"].ToString(), filename); //easy fix for images
                     }
 
-                    htmlPage = htmlPage.Replace("//is2.4chan.org/" + Url.Split('/')[3] + "/" + xmlTim[i].InnerText, xmlTim[i].InnerText); //bandaid fix for is2 urls
-                    htmlPage = htmlPage.Replace("/" + rep, rep);
+                    htmlPage = htmlPage.Replace("//is2.4chan.org/" + BoardCode + "/" + post["tim"], post["tim"].ToString()); //bandaid fix for is2 urls
+                    htmlPage = htmlPage.Replace("/" + replacement, replacement);
                 }
 
                 htmlPage = htmlPage.Replace("=\"//", "=\"http://");
diff --git a/GChan/Trackers/Sites/Thread_8Kun.cs b/GChan/Trackers/Sites/Thread_8Kun.cs
index 3523621..e120913 100644
--- a/GChan/Trackers/Sites/Thread_8Kun.cs
+++ b/GChan/Trackers/Sites/Thread_8Kun.cs
@@ -2,12 +2,12 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Net;
-using System.Runtime.Serialization.Json;
 using System.Text;
 using System.Text.RegularExpressions;
-using System.Xml;
-using System.Xml.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 
 namespace GChan.Trackers
 {
@@ -19,7 +19,7 @@ public class Thread_8Kun : Thread
 
         public Thread_8Kun(string url) : base(url)
         {
-            SiteName = Board_8Kun.SITE_NAME_8KUN;
+            SiteName = Board_8Kun.SITE_NAME;
 
             //Match simplifiedThreadUrlMatch = Regex.Match(url, threadRegex);
             //URL = "https://" + simplifiedThreadUrlMatch.Groups[0].Value;      // simplify thread url
@@ -45,53 +45,41 @@ protected override ImageLink[] GetImageLinks()
         {
             List<ImageLink> links = new List<ImageLink>();
             string JSONUrl = ("http://8kun.top/" + BoardCode + "/res/" + ID + ".json"); // Thread JSON url
-            string str = "";
-            XmlNodeList xmlNos, xmlTims, xmlFilenames, xmlExts, xmlFpaths;
 
             string Fpath0Url(string boardcode, string tim, string ext) => $"https://8kun.top/{boardcode}/src/{tim}{ext}";
             string Fpath1Url(string tim, string ext) => $"https://8kun.top/file_store/{tim}{ext}";
 
             try
             {
-                string Content = new WebClient().DownloadString(JSONUrl);
-
-                byte[] bytes = Encoding.ASCII.GetBytes(Content);
-                using (var stream = new MemoryStream(bytes))
+                JObject jObject;
+                using (var web = new WebClient())
                 {
-                    var quotas = new XmlDictionaryReaderQuotas();
-                    var jsonReader = JsonReaderWriterFactory.CreateJsonReader(stream, quotas);
-                    var xml = XDocument.Load(jsonReader);
-                    str = xml.ToString();                                                               // convert JSON to XML (funny, I know)
+                    string json = web.DownloadString(JSONUrl);
+                    jObject = JObject.Parse(json);
                 }
 
-                XmlDocument doc = new XmlDocument();
-                doc.LoadXml(str);
-
                 // Get the numbers of replies that have 1 or more images.
-                xmlNos = doc.DocumentElement.SelectNodes("/root/posts/item[tim]/no");
+                var nos = jObject.SelectTokens("posts[?(@.tim)].no").Select(x => x.Value<long>()).ToList();
 
                 // Loop through each reply.
-                for (int i = 0; i < xmlNos.Count; i++)
+                foreach (var no in nos)
                 {
                     // Get the tims, filenames and extensions of each image in this reply.
-                    xmlTims = doc.DocumentElement.SelectNodes($"/root/posts/item[no={xmlNos[i].InnerText}]//tim");
-                    xmlFilenames = doc.DocumentElement.SelectNodes($"/root/posts/item[no={xmlNos[i].InnerText}]//filename");
-                    xmlExts = doc.DocumentElement.SelectNodes($"/root/posts/item[no={xmlNos[i].InnerText}]//ext");
-                    xmlFpaths = doc.DocumentElement.SelectNodes($"/root/posts/item[no={xmlNos[i].InnerText}]//fpath");
+                    var tims = jObject.SelectTokens($"posts[?(@.no == {no})]..tim").Select(x => x.ToString()).ToList();
+                    var filenames = jObject.SelectTokens($"posts[?(@.no == {no})]..filename").Select(x => x.ToString()).ToList();
+                    var exts = jObject.SelectTokens($"posts[?(@.no == {no})]..ext").Select(x => x.ToString()).ToList();
+                    var fpaths = jObject.SelectTokens($"posts[?(@.no == {no})]..fpath").Select(x => x.ToString()).ToList();
 
-                    for (int j = 0; j < xmlTims.Count; j++)
+                    for (int j = 0; j < tims.Count; j++)
                     {
-                        string url;
-
-                        if (xmlExts[j].InnerText != "deleted")
+                        if (exts[j] != "deleted")
                         {
-                            if (xmlFpaths[j].InnerText == "0")
-                                url = Fpath0Url(BoardCode, xmlTims[j].InnerText, xmlExts[j].InnerText);
-                            else // "1"
-                                url = Fpath1Url(xmlTims[j].InnerText, xmlExts[j].InnerText);
+                            var url = fpaths[j] == "0" ? 
+                                Fpath0Url(BoardCode, tims[j], exts[j]) :
+                                Fpath1Url(tims[j], exts[j]); // "1"
 
                             // Save image link using reply no (number) as tim because 8kun tims have letters and numbers in them. The reply number will work just fine.
-                            links.Add(new ImageLink(long.Parse(xmlNos[i].InnerText), url, xmlFilenames[j].InnerText));
+                            links.Add(new ImageLink(no, url, filenames[j], no));
                         }
                     }
                 }
@@ -110,61 +98,63 @@ protected override ImageLink[] GetImageLinks()
         protected override void DownloadHTMLPage()
         {
             List<string> thumbs = new List<string>();
-            string str;
+            string htmlPage = "";
 
             try
             {
-                string htmlPage = new WebClient().DownloadString(Url);
-
-                string JURL = Url.Replace(".html", ".json");
+                JObject jObject;
+                using (var web = new WebClient())
+                {
+                    htmlPage = new WebClient().DownloadString(Url);
 
-                string Content = new WebClient().DownloadString(JURL);
+                    string JURL = Url.Replace(".html", ".json");
 
-                byte[] bytes = Encoding.ASCII.GetBytes(Content);
-                using (var stream = new MemoryStream(bytes))
-                {
-                    var quotas = new XmlDictionaryReaderQuotas();
-                    var jsonReader = JsonReaderWriterFactory.CreateJsonReader(stream, quotas);
-                    var xml = XDocument.Load(jsonReader);
-                    str = xml.ToString();
+                    string json = web.DownloadString(JURL);
+                    jObject = JObject.Parse(json);
                 }
 
                 // get single images
-                XmlDocument doc = new XmlDocument();
-                doc.LoadXml(str);
-                XmlNodeList xmlTim = doc.DocumentElement.SelectNodes("/root/posts/item/tim");
-                XmlNodeList xmlExt = doc.DocumentElement.SelectNodes("/root/posts/item/ext");
-                for (int i = 0; i < xmlExt.Count; i++)
+                var posts = jObject
+                    .SelectTokens("posts[*]")
+                    .Where(x => x["ext"] != null)
+                    .ToList();
+                
+                foreach (var post in posts)
                 {
-                    string ext = xmlExt[i].InnerText;
+                    var tim = post["tim"].ToString();
+                    var ext = post["ext"].ToString();
                     //                        if(ext == ".webm")
                     //                            ext = ".jpg";
-                    thumbs.Add("https://8kun.top/file_store/thumb/" + xmlTim[i].InnerText + ext);
-
-                    htmlPage = htmlPage.Replace("https://8kun.top/file_store/thumb/" + xmlTim[i].InnerText + ext, "thumb/" + xmlTim[i].InnerText + ext);
-                    htmlPage = htmlPage.Replace("=\"/file_store/thumb/" + xmlTim[i].InnerText + ext, "=\"thumb/" + xmlTim[i].InnerText + ext);
-                    htmlPage = htmlPage.Replace("=\"/file_store/" + xmlTim[i].InnerText + ext, "=\"" + xmlTim[i].InnerText + ext);
-                    htmlPage = htmlPage.Replace("https://media.8kun.top/file_store/thumb/" + xmlTim[i].InnerText + ext, "thumb/" + xmlTim[i].InnerText + ext);
-                    htmlPage = htmlPage.Replace("https://media.8kun.top/file_store/" + xmlTim[i].InnerText + ext, xmlTim[i].InnerText + ext);
-                    htmlPage = htmlPage.Replace("https://8kun.top/file_store/" + xmlTim[i].InnerText + ext, xmlTim[i].InnerText + ext);
+                    thumbs.Add("https://8kun.top/file_store/thumb/" + post["tim"] + ext);
+
+                    htmlPage = htmlPage.Replace("https://8kun.top/file_store/thumb/" + tim + ext, "thumb/" + tim + ext);
+                    htmlPage = htmlPage.Replace("=\"/file_store/thumb/" + tim + ext, "=\"thumb/" + tim + ext);
+                    htmlPage = htmlPage.Replace("=\"/file_store/" + tim + ext, "=\"" + tim + ext);
+                    htmlPage = htmlPage.Replace("https://media.8kun.top/file_store/thumb/" + tim + ext, "thumb/" + tim + ext);
+                    htmlPage = htmlPage.Replace("https://media.8kun.top/file_store/" + tim + ext, tim + ext);
+                    htmlPage = htmlPage.Replace("https://8kun.top/file_store/" + tim + ext, tim + ext);
                 }
 
                 // get images of posts with multiple images
-                xmlTim = doc.DocumentElement.SelectNodes("/root/posts/item/extra_files/item/tim");
-                xmlExt = doc.DocumentElement.SelectNodes("/root/posts/item/extra_files/item/ext");
-                for (int i = 0; i < xmlExt.Count; i++)
+                var extras = jObject
+                    .SelectTokens("posts.extra_files[*]")
+                    .Where(x => x["ext"] != null)
+                    .ToList();
+                
+                foreach (var extra in extras)
                 {
-                    string ext = xmlExt[i].InnerText;
+                    var tim = extra["tim"].ToString();
+                    var ext = extra["ext"].ToString();
                     //                        if(ext == ".webm")
                     //                            ext = ".jpg";
-                    thumbs.Add("https://8kun.top/file_store/thumb/" + xmlTim[i].InnerText + ext);
-
-                    htmlPage = htmlPage.Replace("https://8kun.top/file_store/thumb/" + xmlTim[i].InnerText + ext, "thumb/" + xmlTim[i].InnerText + ext);
-                    htmlPage = htmlPage.Replace("=\"/file_store/thumb/" + xmlTim[i].InnerText + ext, "=\"thumb/" + xmlTim[i].InnerText + ext);
-                    htmlPage = htmlPage.Replace("=\"/file_store/" + xmlTim[i].InnerText + ext, "=\"" + xmlTim[i].InnerText + ext);
-                    htmlPage = htmlPage.Replace("https://media.8kun.top/file_store/thumb/" + xmlTim[i].InnerText + ext, "thumb/" + xmlTim[i].InnerText + ext);
-                    htmlPage = htmlPage.Replace("https://media.8kun.top/file_store/" + xmlTim[i].InnerText + ext, xmlTim[i].InnerText + ext);
-                    htmlPage = htmlPage.Replace("https://8kun.top/file_store/" + xmlTim[i].InnerText + ext, xmlTim[i].InnerText + ext);
+                    thumbs.Add("https://8kun.top/file_store/thumb/" + tim + ext);
+
+                    htmlPage = htmlPage.Replace("https://8kun.top/file_store/thumb/" + tim + ext, "thumb/" + tim + ext);
+                    htmlPage = htmlPage.Replace("=\"/file_store/thumb/" + tim + ext, "=\"thumb/" + tim + ext);
+                    htmlPage = htmlPage.Replace("=\"/file_store/" + tim + ext, "=\"" + tim + ext);
+                    htmlPage = htmlPage.Replace("https://media.8kun.top/file_store/thumb/" + tim + ext, "thumb/" + tim + ext);
+                    htmlPage = htmlPage.Replace("https://media.8kun.top/file_store/" + tim + ext, tim + ext);
+                    htmlPage = htmlPage.Replace("https://8kun.top/file_store/" + tim + ext, tim + ext);
                 }
 
                 htmlPage = htmlPage.Replace("=\"/", "=\"https://8kun.top/");
diff --git a/GChan/Utils.cs b/GChan/Utils.cs
index 762f1a3..4252fbb 100644
--- a/GChan/Utils.cs
+++ b/GChan/Utils.cs
@@ -197,12 +197,12 @@ public static bool DownloadToDir(ImageLink link, string dir)
                 Directory.CreateDirectory(dir);
             }
 
-            string destFilepath = CombinePathAndFilename(dir, link.GenerateNewFilename((ImageFileNameFormat)Settings.Default.ImageFilenameFormat));
+            string destFilepath = CombinePathAndFilename(dir, link.GenerateFilename((ImageFileNameFormat)Settings.Default.ImageFilenameFormat));
 
             try
             {
                 using var webClient = new WebClient();
-                webClient.DownloadFile(link.URL, destFilepath);
+                webClient.DownloadFile(link.Url, destFilepath);
 
                 // TODO: Figure out how to make the async downloading work properly.
                 // This line is currently not working and downloads 0 byte files 100% of the time.
@@ -219,7 +219,7 @@ public static bool DownloadToDir(ImageLink link, string dir)
             }
             catch (WebException ex)
             {
-                logger.Error(ex, $"Error occured while downloading link {link.URL}.");
+                logger.Error(ex, $"Error occured while downloading link {link.Url}.");
                 return false;
             }
         }
diff --git a/GChan/nlog.config b/GChan/nlog.config
index e3887c7..7a2c6b3 100644
--- a/GChan/nlog.config
+++ b/GChan/nlog.config
@@ -3,15 +3,15 @@
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       throwExceptions="true">
 
-	<variable name="myLayout" value="${longdate} [${level}] ${message} ${callsite-filename}:${callsite-linenumber} ${exception:format=ToString,Data,Properties:separator=\n:exceptionDataSeparator=\n:maxInnerExceptionLevel=3}" />
-	
-	<targets>
-		<target name="console" xsi:type="Console" layout="${myLayout}" />
-		<target name="debugger" xsi:type="Debugger" layout="${myLayout}" />
-		<target name="file" xsi:type="File" fileName="logs/${processname}.log" archiveOldFileOnStartup="true" maxArchiveFiles="5" layout="${myLayout}" />
-	</targets>
+    <variable name="myLayout" value="${longdate} [${level}] ${message} ${callsite-filename}:${callsite-linenumber} ${exception:format=ToString,Data,Properties:separator=\n:exceptionDataSeparator=\n:maxInnerExceptionLevel=3}" />
 
-	<rules>
-		<logger name="*" minlevel="Trace" writeTo="console,debugger,file" />
-	</rules>
+    <targets>
+        <target name="console" xsi:type="Console" layout="${myLayout}" />
+        <target name="debugger" xsi:type="Debugger" layout="${myLayout}" />
+        <target name="file" xsi:type="File" fileName="logs/${processname}.log" archiveOldFileOnStartup="true" maxArchiveFiles="5" layout="${myLayout}" />
+    </targets>
+
+    <rules>
+        <logger name="*" minlevel="Trace" writeTo="console,debugger,file" />
+    </rules>
 </nlog>
\ No newline at end of file
diff --git a/GChan/packages.config b/GChan/packages.config
index ef781cf..1ed8410 100644
--- a/GChan/packages.config
+++ b/GChan/packages.config
@@ -12,7 +12,9 @@
   <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net48" />
   <package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net48" />
   <package id="System.Text.Encodings.Web" version="7.0.0" targetFramework="net48" />
-  <package id="System.Text.Json" version="7.0.1" targetFramework="net48" />
+  <package id="System.Text.Json" version="4.7.1" targetFramework="net48" />
   <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net48" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net48" />
+  <package id="WindowsAPICodePack-Core" version="1.1.1" targetFramework="net48" />
+  <package id="WindowsAPICodePack-Shell" version="1.1.1" targetFramework="net48" />
 </packages>
\ No newline at end of file
diff --git a/README.md b/README.md
index 8c79330..f0d59fd 100644
--- a/README.md
+++ b/README.md
@@ -11,30 +11,35 @@ GChan is a fork of YChan which aims to improve stability and add extra features
 
 ### Supported Websites: 
 * [4chan.org](http://4chan.org/)
-* [8kun.top](https://8kun.top/index.html) [Complete. Pending Release]
+* [8kun.top](https://8kun.top/index.html) [Pending Release]
 
 Requires .NET Framework 4.8 or higher, made with Windows Forms.
 
 ![GChan Window](http://puu.sh/ERKQ8.png)
 
-## New Features
+## Contributing
+When contributing please:
+1. First make an issue to discuss the change or if it is an existing issue please ask on the issue to be assigned the problem, someone may already be working on it.
+2. On your fork's branch please prefix the branch with `feature/` or `bugfix/` and the use the issue number. E.g. `feature/#5-support-2chan`.
+3. Show proof of testing in your pull request, or have created tests in the code.
+4. Please keep the changes restricted to one area, make the purpose of the change easy to locate and easy to understand.
+
+## Features
 * Intuitive thread layout using grid.
-   * Columns that display thread Subject, Board, ID and File Count.
-   * Subject renaming, useful for threads with no subject.
-   * Sorting via clicking column headers, supports ascending and descending.
+   * Adjustable columns display.
+   * Subject renaming.
+   * Sorting.
 * Ease of adding new threads/boards.
    * Add multiple threads at once seperated by a comma (,).
    * Click Add button without pasting it into the text box to add URL from clipboard.
-   * Drag and drop URL to textbox to automatically add it.
+   * Drag and drop URL into window to add it.
 * Right click a thread and copy URL to clipboard.
 * Copy all thread URLs to clipboard seperated by a comma (,).
 * Display of tracked threads and board count on tabs.
-* Set a custom subject for a thread, useful if the thread has no subject or a non-descriptive subject.
-* New settings and .
-   * Option to start GChan with Windows.
-      * Option to start hidden within system tray.
-   * Option to automatically add a thread's subject to thread's folder name when a thread is automatically or manually removed.
-      * Name format choice of 'ID - Subject' or 'Subject - ID'
+* Many settings:
+   * Optionally start with Windows, optionally hidden.
+   * Options to add a thread's subject to thread's directory when a thread is removed.
+      * Name format choice of 'ID - Subject' or 'Subject - ID'.
    * Choices for saved files filename format:
      * ID Only (e.g. '1570301.jpg')
      * Original Filename Only (e.g. 'LittleSaintJames.jpg')