diff --git a/archive/NerdTools-2022.10.04-x86_64-1.txz b/archive/NerdTools-2022.10.04-x86_64-1.txz
new file mode 100644
index 0000000..4fdce8f
Binary files /dev/null and b/archive/NerdTools-2022.10.04-x86_64-1.txz differ
diff --git a/archive/NerdTools-2022.10.04a-x86_64-1.txz b/archive/NerdTools-2022.10.04a-x86_64-1.txz
new file mode 100644
index 0000000..3f0aee8
Binary files /dev/null and b/archive/NerdTools-2022.10.04a-x86_64-1.txz differ
diff --git a/contents/packages.6.11.json b/contents/packages.6.11.json
deleted file mode 100644
index 710b4f3..0000000
--- a/contents/packages.6.11.json
+++ /dev/null
@@ -1,202 +0,0 @@
-[
-    {
-        "name": "axel-2.4-x86_64-2_slonly.txz",
-        "path": "packages/6.11/axel-2.4-x86_64-2_slonly.txz",
-        "sha": "4a95098164a748c8e697258b8a5eca3eec9be61a",
-        "size": 44160,
-        "download_url": "https://raw.githubusercontent.com/UnRAIDES/unRAID-NerdTools/main/packages/6.11/axel-2.4-x86_64-2_slonly.txz",
-        "type": "file"
-    },
-    {
-        "name": "borgbackup-1.1.15-x86_64-1.txz",
-        "path": "packages/6.11/borgbackup-1.1.15-x86_64-1.txz",
-        "sha": "9379fa8c6b57bbfff180b68a78cacb341c3afe16",
-        "size": 4169268,
-        "download_url": "https://raw.githubusercontent.com/UnRAIDES/unRAID-NerdTools/main/packages/6.11/borgbackup-1.1.15-x86_64-1.txz",
-        "type": "file"
-    },
-    {
-        "name": "fdupes-1.51-x86_64-3_slack.txz",
-        "path": "packages/6.11/fdupes-1.51-x86_64-3_slack.txz",
-        "sha": "812721209a7d3757556247edb70889e1f104db54",
-        "size": 17484,
-        "download_url": "https://raw.githubusercontent.com/UnRAIDES/unRAID-NerdTools/main/packages/6.11/fdupes-1.51-x86_64-3_slack.txz",
-        "type": "file"
-    },
-    {
-        "name": "fzf-0.20.0-x86_64-3_slonly.txz",
-        "path": "packages/6.11/fzf-0.20.0-x86_64-3_slonly.txz",
-        "sha": "b0885addf4b23557fc82ba7c2a69fc0a0a82a144",
-        "size": 901728,
-        "download_url": "https://raw.githubusercontent.com/UnRAIDES/unRAID-NerdTools/main/packages/6.11/fzf-0.20.0-x86_64-3_slonly.txz",
-        "type": "file"
-    },
-    {
-        "name": "irssi-1.2.3-x86_64-2.txz",
-        "path": "packages/6.11/irssi-1.2.3-x86_64-2.txz",
-        "sha": "749c8b09f9cc52f7dc52e7888e8c2d522e0668d7",
-        "size": 654900,
-        "download_url": "https://raw.githubusercontent.com/UnRAIDES/unRAID-NerdTools/main/packages/6.11/irssi-1.2.3-x86_64-2.txz",
-        "type": "file"
-    },
-    {
-        "name": "jdupes-1.19.1-x86_64-1_SBo.txz",
-        "path": "packages/6.11/jdupes-1.19.1-x86_64-1_SBo.txz",
-        "sha": "5c819c752cfa0065779bdec0506eaeb96afe116e",
-        "size": 45560,
-        "download_url": "https://raw.githubusercontent.com/UnRAIDES/unRAID-NerdTools/main/packages/6.11/jdupes-1.19.1-x86_64-1_SBo.txz",
-        "type": "file"
-    },
-    {
-        "name": "libmediainfo-19.09-x86_64-1_SBo.txz",
-        "path": "packages/6.11/libmediainfo-19.09-x86_64-1_SBo.txz",
-        "sha": "a8efcd09519097b6d53c80d8db0d1fd30e9200ba",
-        "size": 2359380,
-        "download_url": "https://raw.githubusercontent.com/UnRAIDES/unRAID-NerdTools/main/packages/6.11/libmediainfo-19.09-x86_64-1_SBo.txz",
-        "type": "file"
-    },
-    {
-        "name": "libzen-0.4.37-x86_64-1_SBo.txz",
-        "path": "packages/6.11/libzen-0.4.37-x86_64-1_SBo.txz",
-        "sha": "fe1b1a207f3dd30710f7e2e6b3838388d0a229bb",
-        "size": 366184,
-        "download_url": "https://raw.githubusercontent.com/UnRAIDES/unRAID-NerdTools/main/packages/6.11/libzen-0.4.37-x86_64-1_SBo.txz",
-        "type": "file"
-    },
-    {
-        "name": "mediainfo-19.09-x86_64-1_SBo.txz",
-        "path": "packages/6.11/mediainfo-19.09-x86_64-1_SBo.txz",
-        "sha": "7dd4e5a74f65d3582b40244fbf91eaa1866fa34d",
-        "size": 68712,
-        "download_url": "https://raw.githubusercontent.com/UnRAIDES/unRAID-NerdTools/main/packages/6.11/mediainfo-19.09-x86_64-1_SBo.txz",
-        "type": "file"
-    },
-    {
-        "name": "mktorrent-1.1-x86_64-1.txz",
-        "path": "packages/6.11/mktorrent-1.1-x86_64-1.txz",
-        "sha": "cbe8bcadfe36e7e34c51b7df454b07ec5762f60e",
-        "size": 18116,
-        "download_url": "https://raw.githubusercontent.com/UnRAIDES/unRAID-NerdTools/main/packages/6.11/mktorrent-1.1-x86_64-1.txz",
-        "type": "file"
-    },
-    {
-        "name": "ncdu-1.17-x86_64-1gds.txz",
-        "path": "packages/6.11/ncdu-1.17-x86_64-1gds.txz",
-        "sha": "4c2f4665343cdaa00f40b097a343b3c09c92d03b",
-        "size": 47188,
-        "download_url": "https://raw.githubusercontent.com/UnRAIDES/unRAID-NerdTools/main/packages/6.11/ncdu-1.17-x86_64-1gds.txz",
-        "type": "file"
-    },
-    {
-        "name": "neofetch-20211210-noarch-1.txz",
-        "path": "packages/6.11/neofetch-20211210-noarch-1.txz",
-        "sha": "dc559e2a99a5ef9443b5bb40b35f69eb3797ee9f",
-        "size": 89584,
-        "download_url": "https://raw.githubusercontent.com/UnRAIDES/unRAID-NerdTools/main/packages/6.11/neofetch-20211210-noarch-1.txz",
-        "type": "file"
-    },
-    {
-        "name": "nload-0.7.4-x86_64-1_slack.txz",
-        "path": "packages/6.11/nload-0.7.4-x86_64-1_slack.txz",
-        "sha": "163badb089b8924c1d0b0471c66ab79d5fe52164",
-        "size": 59996,
-        "download_url": "https://raw.githubusercontent.com/UnRAIDES/unRAID-NerdTools/main/packages/6.11/nload-0.7.4-x86_64-1_slack.txz",
-        "type": "file"
-    },
-    {
-        "name": "p7zip-16.02-x86_64-1sl.txz",
-        "path": "packages/6.11/p7zip-16.02-x86_64-1sl.txz",
-        "sha": "efb97a9f688f6179439b79711462c73e086b258a",
-        "size": 1285484,
-        "download_url": "https://raw.githubusercontent.com/UnRAIDES/unRAID-NerdTools/main/packages/6.11/p7zip-16.02-x86_64-1sl.txz",
-        "type": "file"
-    },
-    {
-        "name": "python2-2.7.18-x86_64-4.txz",
-        "path": "packages/6.11/python2-2.7.18-x86_64-4.txz",
-        "sha": "4f1e65a1c8898aa3c59c5f960d92c7abdd51bc88",
-        "size": 13018740,
-        "download_url": "https://raw.githubusercontent.com/UnRAIDES/unRAID-NerdTools/main/packages/6.11/python2-2.7.18-x86_64-4.txz",
-        "type": "file"
-    },
-    {
-        "name": "python3-3.9.10-x86_64-1.txz",
-        "path": "packages/6.11/python3-3.9.10-x86_64-1.txz",
-        "sha": "77658849776e0220efa46a63a3f1f0d23c7294ca",
-        "size": 18538524,
-        "download_url": "https://raw.githubusercontent.com/UnRAIDES/unRAID-NerdTools/main/packages/6.11/python3-3.9.10-x86_64-1.txz",
-        "type": "file"
-    },
-    {
-        "name": "python-pip-21.3.1-x86_64-2.txz",
-        "path": "packages/6.11/python-pip-21.3.1-x86_64-2.txz",
-        "sha": "81d362d40980146d544608a1d71bdad3efd94304",
-        "size": 1809344,
-        "download_url": "https://raw.githubusercontent.com/UnRAIDES/unRAID-NerdTools/main/packages/6.11/python-pip-21.3.1-x86_64-2.txz",
-        "type": "file"
-    },
-    {
-        "name": "python-setuptools-57.4.0-x86_64-1.txz",
-        "path": "packages/6.11/python-setuptools-57.4.0-x86_64-1.txz",
-        "sha": "c1a53a2c9babc2ea778bc14cb743b2dae5656ac9",
-        "size": 673896,
-        "download_url": "https://raw.githubusercontent.com/UnRAIDES/unRAID-NerdTools/main/packages/6.11/python-setuptools-57.4.0-x86_64-1.txz",
-        "type": "file"
-    },
-    {
-        "name": "rar-5.8.1-x86_64-1_SBo.txz",
-        "path": "packages/6.11/rar-5.8.1-x86_64-1_SBo.txz",
-        "sha": "be3b78ce6cb78a16dadad71b665e760b273fde17",
-        "size": 290256,
-        "download_url": "https://raw.githubusercontent.com/UnRAIDES/unRAID-NerdTools/main/packages/6.11/rar-5.8.1-x86_64-1_SBo.txz",
-        "type": "file"
-    },
-    {
-        "name": "screen-4.9.0-x86_64-1.txz",
-        "path": "packages/6.11/screen-4.9.0-x86_64-1.txz",
-        "sha": "c8cc719bee582d4bcca1c06ec988a8f787e807a9",
-        "size": 550196,
-        "download_url": "https://raw.githubusercontent.com/UnRAIDES/unRAID-NerdTools/main/packages/6.11/screen-4.9.0-x86_64-1.txz",
-        "type": "file"
-    },
-    {
-        "name": "tmux-3.2-x86_64-1.txz",
-        "path": "packages/6.11/tmux-3.2-x86_64-1.txz",
-        "sha": "a6e16326da7d6a12524a667679e39f8dd9c74ffe",
-        "size": 366896,
-        "download_url": "https://raw.githubusercontent.com/UnRAIDES/unRAID-NerdTools/main/packages/6.11/tmux-3.2-x86_64-1.txz",
-        "type": "file"
-    },
-    {
-        "name": "unrar-5.8.5-x86_64-1_SBo.txz",
-        "path": "packages/6.11/unrar-5.8.5-x86_64-1_SBo.txz",
-        "sha": "56af0812f15bd83e387398402a2107723f1c364e",
-        "size": 347692,
-        "download_url": "https://raw.githubusercontent.com/UnRAIDES/unRAID-NerdTools/main/packages/6.11/unrar-5.8.5-x86_64-1_SBo.txz",
-        "type": "file"
-    },
-    {
-        "name": "utf8proc-2.7.0-x86_64-1.txz",
-        "path": "packages/6.11/utf8proc-2.7.0-x86_64-1.txz",
-        "sha": "a4f8d1725afd0feb4ccf65c528eebbd040d0faeb",
-        "size": 63420,
-        "download_url": "https://raw.githubusercontent.com/UnRAIDES/unRAID-NerdTools/main/packages/6.11/utf8proc-2.7.0-x86_64-1.txz",
-        "type": "file"
-    },
-    {
-        "name": "zsh-5.8-x86_64-3.txz",
-        "path": "packages/6.11/zsh-5.8-x86_64-3.txz",
-        "sha": "63ab9b0d4888db77f54fcf6f6c84e6e04aea5fd8",
-        "size": 3056824,
-        "download_url": "https://raw.githubusercontent.com/UnRAIDES/unRAID-NerdTools/main/packages/6.11/zsh-5.8-x86_64-3.txz",
-        "type": "file"
-    },
-    {
-        "name": "iotop-0.6-x86_64-1_fs.tgz",
-        "path": "packages/6.11/iotop-0.6-x86_64-1_fs.tgz",
-        "sha": "fdfe9270c20d923ef5af2ec09de25918575fa12c",
-        "size": 50268,
-        "download_url": "https://raw.githubusercontent.com/UnRAIDES/unRAID-NerdTools/main/packages/6.11/iotop-0.6-x86_64-1_fs.tgz",
-        "type": "file"
-    }
-]
\ No newline at end of file
diff --git a/contents/packages-desc b/packages/packages-desc
similarity index 98%
rename from contents/packages-desc
rename to packages/packages-desc
index e9d7c06..335cda3 100644
--- a/contents/packages-desc
+++ b/packages/packages-desc
@@ -91,7 +91,7 @@
  "progress":"This tool can be described as a Tiny, Dirty command that looks for coreutils basic commands (cp, mv, dd, tar, gzip\/gunzip, cat, etc.) currently running on your system and displays the percentage of copied data. It can also show estimated time and throughput, and provides a `top-like` mode (monitoring).",
  "protobuf":"protocol buffers are a flexible, efficient, automated mechanism for serializing structured data.",
  "psutil":"psutil is a module providing an interface for retrieving information on all running processes and system utilization (CPU, memory, disks, network, users) in a portable way by using Python, implementing many functionalities offered by command line tools such as: ps, top, df, kill, free, lsof, netstat, ifconfig, nice, ionice, iostat, iotop, uptime, pidof, tty, who, taskset, and pmap.",
- "python":"An interpreted, interactive, object-oriented programming language that combines remarkable power with very clear syntax. Its basic power can be extended with your own modules written in C or C++. It is also adaptable as an extension language for existing applications.",
+ "python2":"An interpreted, interactive, object-oriented programming language that combines remarkable power with very clear syntax. Its basic power can be extended with your own modules written in C or C++. It is also adaptable as an extension language for existing applications.",
  "python3":"Python is an interpreted, interactive, object-oriented programming language that combines remarkable power with very clear syntax. This is a new version of the language that is incompatible with the 2.x line of releases. The language is mostly the same, but many details, especially how built-in objects like dictionaries and strings work, have changed considerably, and a lot of deprecated features have finally been removed. Also, the standard library has been reorganized in a few prominent places.",
  "python-pip":"pip is a tool for installing and managing Python packages.",
  "python-setuptools":"A collection of enhancements to Python distutils.",
diff --git a/source/NerdTools/usr/local/emhttp/plugins/NerdTools/include/NerdPackHelpers.php b/source/NerdTools/usr/local/emhttp/plugins/NerdTools/include/NerdToolsHelpers.php
similarity index 93%
rename from source/NerdTools/usr/local/emhttp/plugins/NerdTools/include/NerdPackHelpers.php
rename to source/NerdTools/usr/local/emhttp/plugins/NerdTools/include/NerdToolsHelpers.php
index be9a3ed..c5ade45 100644
--- a/source/NerdTools/usr/local/emhttp/plugins/NerdTools/include/NerdPackHelpers.php
+++ b/source/NerdTools/usr/local/emhttp/plugins/NerdTools/include/NerdToolsHelpers.php
@@ -11,8 +11,8 @@ if (!is_dir($pkg_extra_path))
     mkdir($pkg_extra_path);
     
 
-$pkg_desc = 'https://raw.githubusercontent.com/UnRAIDES/unRAID-NerdTools/main/contents/packages-desc';
-$pkg_repo = "https://raw.githubusercontent.com/UnRAIDES/unRAID-NerdTools/main/contents/packages.$os_version.json";
+$pkg_desc = 'https://raw.githubusercontent.com/UnRAIDES/unRAID-NerdTools/main/packages/packages-desc';
+$pkg_repo = "https://api.github.com/repos/UnRAIDES/unRAID-NerdTools/contents/packages/$os_version";
 
 $desc_file   = $pkg_path.'packages-desc';
 $repo_file   = $pkg_path.'packages.json';
diff --git a/source/NerdTools/usr/local/emhttp/plugins/NerdTools/include/PackageQuery.php b/source/NerdTools/usr/local/emhttp/plugins/NerdTools/include/PackageQuery.php
index f456465..71de21a 100644
--- a/source/NerdTools/usr/local/emhttp/plugins/NerdTools/include/PackageQuery.php
+++ b/source/NerdTools/usr/local/emhttp/plugins/NerdTools/include/PackageQuery.php
@@ -1,5 +1,5 @@
 <?
-require_once '/usr/local/emhttp/plugins/NerdTools/include/NerdPackHelpers.php';
+require_once '/usr/local/emhttp/plugins/NerdTools/include/NerdToolsHelpers.php';
 require_once '/usr/local/emhttp/plugins/NerdTools/include/DownloadHelpers.php';
 
 // Only download repo update if the current one is 1 hour old or more
diff --git a/source/NerdTools/usr/local/emhttp/plugins/NerdTools/js/jquery.NerdTools.js b/source/NerdTools/usr/local/emhttp/plugins/NerdTools/js/jquery.NerdTools.js
index 1e27de5..b0e3c0f 100644
--- a/source/NerdTools/usr/local/emhttp/plugins/NerdTools/js/jquery.NerdTools.js
+++ b/source/NerdTools/usr/local/emhttp/plugins/NerdTools/js/jquery.NerdTools.js
@@ -19,8 +19,8 @@ $(function(){
         }
     });
  
-    $.cookie('nerdpack_checkall', 'no', { expires: 3650 });
-    $.cookie('nerdpack_packages_uninstall', '--uninstall', { expires: 3650 });
+    $.cookie('nerdtools_checkall', 'no', { expires: 3650 });
+    $.cookie('nerdtools_packages_uninstall', '--uninstall', { expires: 3650 });
     $('#btnApply').click(Apply);
 
     var url = window.location.href.split("?");
@@ -125,7 +125,7 @@ function packageQuery(force) {
 
 function Apply() {
         checkDepends();
-        var Arg2 = (typeof $.cookie('nerdpack_packages_uninstall') === 'undefined') ? '' : '&arg2='+$.cookie('nerdpack_packages_uninstall');
+        var Arg2 = (typeof $.cookie('nerdtools_packages_uninstall') === 'undefined') ? '' : '&arg2='+$.cookie('nerdtools_packages_uninstall');
         $.post('/update.php', $('#package_form').serializeArray(), function() {
                 openBox('/plugins/NerdTools/scripts/packagemanager&arg1=--download'+ Arg2,
                             'Package Manager', 600, 900, true);
diff --git a/source/NerdTools/usr/local/emhttp/plugins/NerdTools/scripts/packagemanager b/source/NerdTools/usr/local/emhttp/plugins/NerdTools/scripts/packagemanager
index 761e9d6..9cd0be5 100755
--- a/source/NerdTools/usr/local/emhttp/plugins/NerdTools/scripts/packagemanager
+++ b/source/NerdTools/usr/local/emhttp/plugins/NerdTools/scripts/packagemanager
@@ -4,7 +4,7 @@ $debug = FALSE;
 $prog  = pathinfo(__FILE__, PATHINFO_FILENAME);
 $usage = <<<EOF
 
-Process package files in NerdPack config. Download and install,
+Process package files in NerdTools config. Download and install,
 delete and uninstall, based on the config value and [options].
 
 Usage: packagemanager [options]
@@ -48,7 +48,7 @@ $argu = (array_key_exists("u", $args) || array_key_exists("uninstall", $args));
 $argv = (array_key_exists("v", $args) || array_key_exists("verbose", $args));
 $debug = array_key_exists("debug", $args);
 
-require_once '/usr/local/emhttp/plugins/NerdTools/include/NerdPackHelpers.php';
+require_once '/usr/local/emhttp/plugins/NerdTools/include/NerdToolsHelpers.php';
 require_once '/usr/local/emhttp/plugins/NerdTools/include/DownloadHelpers.php';
 
 /* debug */