diff --git a/CHANGES.md b/CHANGES.md
index 8a8a2c6..e49d1ed 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,28 +1,79 @@
-### 0.23.22 (2020-05-27 00:10:00 UTC)
+### 0.24.0 (2021-06-08 12:50:00 UTC)
+
+* Change free up some screen real estate on manage/Bulk Change
+* Change rotate column headers on manage/Bulk Change for supported browsers to reduce screen estate waste
+* Add column to manage/Bulk Change to display the show folder location size
+* Add media stats to manage/Bulk Change and view-show when hovering over folder size
+* Add to manage/Bulk Change an icon where show location no longer exists and group the icon/non icon shows
+* Add a hover tip to the edit column on manage/Bulk Change to remind about using multi-select
+* Change add tooltips on manage/Bulk Change checkbox actions to display what each are used for
+* Add to manage/Bulk Change confirm dialog before removing or deleting a show
+* Change manage/Bulk Change add sort by size options to table, (Total, Largest, Smallest, Average)
+* Change manage/Bulk Change add busy spinner for processing when changing size sort type
+* Change manage/Bulk Change table make header stick when page is scrolled
+* Change manage/Bulk Change table make footer stick when page is scrolled
+* Change manage/Bulk Change add filter to table, showname, quality, and status
+* Change number of shows listed after a filter is displayed at the bottom of Bulk Change
+* Change edit and submit buttons are disabled when there is no selection on Bulk Change
+* Change edit and submit buttons display number of selected items on Bulk Change
+* Change tidy up html markup and JavaScript for manage/Bulk Change
+* Change refactor to simplify bulk_change logic
+* Add to config/General, "Package updates" and list packages, check packages by default on Windows, others must enable
+* Change simplify section config/General/Updates
+* Add check for package updates to menu item action "Check for Updates"
+* Add known failures are cleared for a fresh check when "Check for Updates" is used
+* Add FileSharingTalk nzb provider
+* Change optimize .png images to improve file/transfer size
+* Add tz version info to the about page
+* Change auto-install Cheetah dependency on first time installations (tested on Win)
+* Change add cryptography to recommended.txt
+* Change add prebuilt AMD64 python-Levenshtein to recommended.txt
+* Change add prebuilt Windows Python 3.10 lxml to recommended.txt
+* Change add prebuilt Windows Python 3.10 regex to recommended.txt
+* Change replace deprecated `currentThread` with `current_thread` calls
+* Change initialise Manage/Media Process folder and method from Config/Media Process when no previous values are stored
+* Change remember Manage/Media Process folder and method when button 'Process' is used
+* Change abbreviate long titles under menu tab
+* Change add fallback to unar if unrar binary is unavailable on Linux
+* Update attr 20.2.0 (4f74fba) to 20.3.0 (f3762ba)
+* Update diskcache_py3 5.0.1 (9670fbb) to 5.1.0 (40ce0de)
+* Update diskcache_py2 4.1.0 (b0451e0) from 5.1.0 (40ce0de)
+* Update humanize 3.1.0 (aec9dc2) to 3.5.0 (b6b0ea5)
+* Update Rarfile 3.1 (a4202ca) to 4.0 (55fe778)
+* Update Requests library 2.24.0 (2f70990) to 2.25.1 (bdc00eb)
+* Update Six compatibility library 1.15.0 (c0be881) to 1.16.0 (b620447)
+* Update urllib3 1.25.11 (00f1769) to 1.26.2 (eae04d6)
+* Add menu Shows/"Next Episode Cards"
+* Change improve SQL performance
+* Add option "Add paused" to Options/"More Options" at the final step of adding a show
+* Update certifi 2020.11.08 to 2021.05.30
+
+
+### 0.23.22 (2021-05-27 00:10:00 UTC)
 
 * Change officially move chat support to irc.libera.chat
 * Change tweak NBL API tip
 
 
-### 0.23.21 (2020-05-17 10:20:00 UTC)
+### 0.23.21 (2021-05-17 10:20:00 UTC)
 
 * Fix provider Nebulance
 * Fix provider MoreThan
 
 
-### 0.23.20 (2020-05-13 18:35:00 UTC)
+### 0.23.20 (2021-05-13 18:35:00 UTC)
 
 * Fix restart to release and free resources from previous run process
 * Change fanart lib to get_url
 
 
-### 0.23.19 (2020-05-05 21:40:00 UTC)
+### 0.23.19 (2021-05-05 21:40:00 UTC)
 
 * Fix MoreThan provider and add provider option only allow releases that are site trusted
 * Add Python 3.9 to Travis
 
 
-### 0.23.18 (2020-05-03 23:10:00 UTC)
+### 0.23.18 (2021-05-03 23:10:00 UTC)
 
 * Change allow Python 3.8.10 and 3.9.5
 * Remove PiSexy provider
@@ -34,7 +85,7 @@
 * Add webapi unit tests
 
 
-### 0.23.17 (2020-04-12 12:40:00 UTC)
+### 0.23.17 (2021-04-12 12:40:00 UTC)
 
 * Update UnRar for Windows 6.00 to 6.01 x64
 
diff --git a/gui/slick/css/dark.css b/gui/slick/css/dark.css
index 16630bc..0f90353 100644
--- a/gui/slick/css/dark.css
+++ b/gui/slick/css/dark.css
@@ -1545,6 +1545,10 @@ thead.tablesorter-stickyHeader{
 	background-color:#2e2e2e
 }
 
+.sort-size-type.tablesorter-headerSorted{
+	background-color:#2c6590
+}
+
 .tablesorter tr.tablesorter-filter-row,
 .tablesorter tr.tablesorter-filter-row td{
 	text-align:center;
@@ -1552,11 +1556,22 @@ thead.tablesorter-stickyHeader{
 	border-bottom:1px solid #111
 }
 
+.tablesorter-filter-row input[type="search"]{
+	box-shadow:inset rgba(255, 255, 255, 0.2) 0 1px 0
+}
+
+#tfoot{
+	text-shadow:-1px -1px 0 rgba(0, 0, 0, 0.3)
+}
+
+#tfoot,
 .tablesorter tfoot tr{
 	color:#ddd;
 	text-align:center;
-	text-shadow:-1px -1px 0 rgba(0, 0, 0, 0.3);
-	background-color:#333;
+	background-color:#333
+}
+
+.tablesorter tfoot tr{
 	border-collapse:collapse
 }
 
@@ -1564,6 +1579,15 @@ thead.tablesorter-stickyHeader{
 	color:#ddd
 }
 
+#bulk-change-table .tablesorter-filter-row,
+#bulk-change-table .tablesorter-filter-row td,
+#bulk-change-table-sticky .tablesorter-filter-row,
+#bulk-change-table-sticky .tablesorter-filter-row td,
+#tfoot{
+	background:#282828;
+	border-bottom:0
+}
+
 #showListTable tbody{
 	color:#000
 }
diff --git a/gui/slick/css/fonts/sgicons.eot b/gui/slick/css/fonts/sgicons.eot
index 7253f34..68c72dd 100644
Binary files a/gui/slick/css/fonts/sgicons.eot and b/gui/slick/css/fonts/sgicons.eot differ
diff --git a/gui/slick/css/fonts/sgicons.svg b/gui/slick/css/fonts/sgicons.svg
index 537201e..6580f0c 100644
--- a/gui/slick/css/fonts/sgicons.svg
+++ b/gui/slick/css/fonts/sgicons.svg
@@ -107,6 +107,7 @@
 <glyph unicode="" horiz-adv-x="100" d="M100 57.71484 C100 53.88184 100 46.21582 100 42.38281 Q100 40.72266 98.87695 39.59961 Q97.75391 38.47656 96.19141 38.47656 C94.88932 38.47656 93.26172 38.47656 92.28516 38.47656 Q90.72266 38.47656 89.59961 39.59961 Q88.47656 40.72266 88.47656 42.38281 C88.47656 47.49349 88.47656 53.88184 88.47656 57.71484 Q88.47656 64.0625 83.98438 68.60352 Q79.49219 73.14453 73.04688 73.14453 Q66.69922 73.14453 62.20703 68.60352 Q57.71484 64.0625 57.71484 57.71484 C57.71484 53.8737 57.71484 49.07227 57.71484 46.19141 C59.15527 46.19141 62.03613 46.19141 63.47656 46.19141 Q65.82031 46.19141 67.5293 44.48242 Q69.23828 42.77344 69.23828 40.42969 C69.23828 28.8737 69.23828 14.42871 69.23828 5.76172 Q69.23828 3.32031 67.5293 1.66016 Q65.82031 0 63.47656 0 C44.23828 0 20.19043 0 5.76172 0 Q3.32031 0 1.66016 1.66016 Q0 3.32031 0 5.76172 C0 17.31771 0 31.7627 0 40.42969 Q0 42.77344 1.66016 44.48242 Q3.32031 46.19141 5.76172 46.19141 C19.23828 46.19141 36.08398 46.19141 46.19141 46.19141 C46.19141 49.07227 46.19141 54.83398 46.19141 57.71484 Q46.19141 68.84766 54.05273 76.75781 Q61.91406 84.66797 73.04688 84.66797 Q84.17969 84.66797 92.08984 76.75781 Q100 68.84766 100 57.71484 z" />
 <glyph unicode="" horiz-adv-x="100.09766" d="M50 82.42188 Q76.17188 82.42188 87.10938 55.46875 Q87.89062 53.32031 89.0625 43.75 Q89.0625 36.81641 84.76562 25.78125 Q77.53906 11.91406 59.76562 5.85938 Q59.17969 5.85938 50.78125 4.6875 C50 4.6875 49.02344 4.6875 48.4375 4.6875 Q38.37891 5.85938 30.07812 10.15625 Q11.32812 23.4375 11.32812 43.75 Q11.32812 67.87109 35.54688 79.6875 Q42.38281 82.42188 50 82.42188 zM43.75 62.89062 C43.75 62.01172 43.75 60.25391 43.75 59.375 C43.65234 59.17969 43.45703 58.78906 43.35938 58.59375 Q40.03906 59.375 39.45312 59.375 Q31.73828 59.375 27.73438 49.21875 Q27.34375 47.16797 27.34375 45.3125 C27.34375 44.66146 27.34375 43.84766 27.34375 43.35938 C27.14844 43.35938 26.75781 43.35938 26.5625 43.35938 Q24.70703 45.01953 23.04688 46.09375 C20.83333 43.75 18.06641 40.82031 16.40625 39.0625 Q26.5625 29.78516 43.35938 12.5 Q51.17188 18.45703 51.17188 21.09375 Q33.20312 37.98828 33.20312 40.625 C33.20312 41.01562 33.20312 41.50391 33.20312 41.79688 Q33.88672 47.26562 37.5 47.26562 C38.15104 47.26562 38.96484 47.26562 39.45312 47.26562 Q42.77344 47.26562 55.85938 32.8125 C57.16146 31.64062 58.78906 30.17578 59.76562 29.29688 C59.86328 29.29688 60.05859 29.29688 60.15625 29.29688 Q60.64453 29.29688 67.96875 37.10938 Q49.60938 54.00391 49.60938 57.8125 C49.60938 58.20312 49.60938 58.69141 49.60938 58.98438 Q50.87891 64.0625 54.6875 64.0625 C54.94792 64.0625 55.27344 64.0625 55.46875 64.0625 Q59.17969 64.0625 72.65625 49.21875 C73.95833 48.04688 75.58594 46.58203 76.5625 45.70312 Q77.05078 45.70312 84.375 53.51562 Q63.96484 75.78125 57.8125 75.78125 C56.77083 75.78125 55.46875 75.78125 54.6875 75.78125 Q43.75 72.16797 43.75 62.89062 zM50.19531 1.85547 Q58.49609 1.85547 66.21094 5.0293 Q73.92578 8.20312 79.78516 14.0625 Q85.64453 19.92188 88.81836 27.58789 Q91.99219 35.25391 91.99219 43.45703 Q91.99219 61.23047 79.63867 73.24219 Q67.28516 85.25391 50.19531 85.25391 Q33.10547 85.25391 20.84961 72.99805 Q8.59375 60.74219 8.59375 43.45703 Q8.59375 26.26953 21.38672 13.67188 Q33.39844 1.85547 50.19531 1.85547 zM50 -6.34766 Q40.03906 -6.34766 30.85938 -2.53906 Q21.67969 1.26953 14.64844 8.30078 Q7.61719 15.33203 3.80859 24.51172 Q0 33.69141 0 43.65234 Q0 53.61328 3.80859 62.8418 Q7.61719 72.07031 14.64844 79.10156 Q21.67969 86.13281 30.85938 89.94141 Q40.03906 93.75 50 93.75 Q70.80078 93.75 85.44922 79.10156 Q100.09766 64.45312 100.09766 43.65234 Q100.09766 22.94922 85.44922 8.30078 Q70.80078 -6.34766 50 -6.34766 z" />
 <glyph unicode="" horiz-adv-x="100" d="M66.01562 84.375 C65.42969 84.375 64.25781 84.375 63.67188 84.375 Q60.74219 84.375 57.03125 91.01562 C57.03125 91.53646 57.03125 92.1875 57.03125 92.57812 Q57.03125 93.75 60.54688 94.53125 Q61.91406 94.53125 68.35938 86.32812 Q68.35938 84.375 66.01562 84.375 zM80.85938 83.59375 C80.46875 83.59375 79.6875 83.59375 79.29688 83.59375 Q77.14844 83.59375 76.17188 85.54688 C76.17188 85.80729 76.17188 86.13281 76.17188 86.32812 Q83.20312 94.53125 84.375 94.53125 Q87.10938 94.53125 88.28125 91.79688 Q83.59375 83.59375 80.85938 83.59375 zM33.98438 69.53125 C31.44531 69.53125 26.36719 69.53125 23.82812 69.53125 Q21.09375 69.53125 21.09375 72.26562 C21.09375 73.82812 21.09375 75.78125 21.09375 76.95312 Q22.07031 82.03125 26.17188 82.03125 C29.03646 82.03125 32.61719 82.03125 34.76562 82.03125 Q38.28125 81.25 38.28125 80.07812 C38.28125 77.99479 38.28125 75.39062 38.28125 73.82812 Q37.59766 69.53125 33.98438 69.53125 zM56.64062 69.53125 C53.71094 69.53125 47.85156 69.53125 44.92188 69.53125 Q43.75 70.3125 42.96875 73.82812 C42.96875 75.65104 42.96875 77.92969 42.96875 79.29688 Q42.96875 82.03125 45.70312 82.03125 C49.34896 82.03125 53.90625 82.03125 56.64062 82.03125 Q60.15625 81.54297 60.15625 78.51562 C60.15625 76.69271 60.15625 74.41406 60.15625 73.04688 Q60.15625 70.60547 56.64062 69.53125 zM79.6875 69.72656 C76.80664 69.77539 71.04492 69.87305 68.16406 69.92188 Q64.25781 69.92188 64.25781 76.5625 Q64.25781 77.92969 64.45312 79.6875 Q67.38281 82.03125 69.14062 82.03125 Q79.19922 82.03125 80.17578 81.25 C80.24089 81.28255 80.32227 81.32324 80.37109 81.34766 Q81.25 81.34766 81.25 74.41406 C81.25 73.60026 81.25 72.58301 81.25 71.97266 Q81.25 69.82422 79.6875 69.72656 zM94.14062 68.16406 C93.75 68.21289 92.96875 68.31055 92.57812 68.35938 Q84.76562 68.94531 84.66797 69.92188 C84.3099 72.26562 83.8623 75.19531 83.59375 76.95312 Q84.96094 80.07812 85.9375 80.07812 C89.0625 79.55729 92.96875 78.90625 95.3125 78.51562 Q97.26562 77.24609 97.46094 73.82812 C97.49349 72.49349 97.53418 70.8252 97.55859 69.82422 Q97.55859 68.75 94.14062 68.16406 zM45.99609 52.34375 Q42.77344 53.125 42.77344 55.66406 C42.77344 58.33333 42.77344 61.66992 42.77344 63.67188 Q43.26172 66.40625 45.99609 66.40625 C49.60938 66.40625 54.12598 66.40625 56.83594 66.40625 Q59.86328 66.40625 60.83984 63.67188 C60.83984 61.0026 60.83984 57.66602 60.83984 55.66406 Q60.83984 52.73438 58.83789 52.53906 Q56.83594 52.34375 45.99609 52.34375 zM94.92188 52.34375 C93.94531 52.34375 91.99219 52.34375 91.01562 52.34375 Q85.9375 52.92969 85.9375 55.85938 C85.9375 58.20312 85.9375 61.13281 85.9375 62.89062 Q85.9375 65.625 88.67188 65.625 C90.625 65.625 93.06641 65.625 94.53125 65.625 Q99.12109 65.625 100 61.32812 C100 58.98438 100 56.05469 100 54.29688 Q100 53.22266 94.92188 52.34375 zM34.76562 34.375 C32.03125 34.57031 26.5625 34.96094 23.82812 35.15625 Q19.92188 35.44922 19.72656 37.20703 Q19.43359 37.20703 19.43359 39.94141 C19.46615 41.60156 19.50684 43.67676 19.53125 44.92188 Q19.53125 48.4375 22.31445 48.82812 Q25.09766 49.21875 26.17188 49.21875 C29.55729 49.21875 33.78906 49.21875 36.32812 49.21875 Q37.5 49.21875 38.28125 45.70312 C38.28125 43.35938 38.28125 40.42969 38.28125 38.67188 Q38.28125 34.86328 34.76562 34.375 zM76.95312 35.15625 C74.80469 35.15625 70.50781 35.15625 68.35938 35.15625 Q65.625 35.15625 65.625 37.89062 C65.625 40.75521 65.625 44.33594 65.625 46.48438 Q65.625 49.21875 68.35938 49.21875 C71.74479 49.47917 75.97656 49.80469 78.51562 50 Q82.03125 48.82812 82.03125 46.48438 C82.03125 44.40104 82.03125 41.79688 82.03125 40.23438 Q81.05469 35.15625 76.95312 35.15625 zM94.14062 36.71875 C92.77344 36.71875 90.03906 36.71875 88.67188 36.71875 Q85.9375 36.71875 85.9375 39.45312 C85.9375 41.27604 85.9375 43.55469 85.9375 44.92188 Q85.9375 48.4375 90.23438 50 C91.66667 49.86979 93.45703 49.70703 94.53125 49.60938 Q100 49.60938 100 46.48438 C100 44.66146 100 42.38281 100 41.01562 Q100 38.08594 94.14062 36.71875 zM13.86719 35.44922 C11.84082 35.7666 7.78809 36.40137 5.76172 36.71875 Q0 37.59766 0 40.23438 C0 42.57812 0 45.50781 0 47.26562 Q1.85547 49.51172 5.07812 49.51172 C7.91016 49.44661 11.4502 49.36523 13.57422 49.31641 Q16.30859 49.21875 16.30859 40.82031 Q16.30859 35.44922 13.86719 35.44922 zM56.64062 34.375 C54.10156 34.375 49.02344 34.375 46.48438 34.375 Q42.96875 35.15625 42.96875 36.32812 C42.96875 39.71354 42.96875 43.94531 42.96875 46.48438 Q42.96875 48.4375 45.3125 49.60938 C49.34896 49.60938 54.39453 49.60938 57.42188 49.60938 Q61.71875 48.73047 61.71875 44.92188 C61.71875 43.61979 61.71875 41.99219 61.71875 41.01562 Q61.13281 34.375 56.64062 34.375 zM13.67188 20.3125 C11.91406 20.50781 8.39844 20.89844 6.64062 21.09375 Q1.95312 21.09375 1.95312 30.07812 Q3.22266 33.20312 5.46875 33.20312 Q8.88672 32.03125 14.84375 31.64062 Q17.1875 29.29688 17.1875 22.26562 Q17.1875 21.09375 13.67188 20.3125 zM36.32812 18.75 Q35.54688 18.75 25.39062 19.53125 Q22.07031 19.53125 21.09375 24.60938 C21.09375 25.91146 21.09375 27.53906 21.09375 28.51562 Q21.58203 32.03125 24.60938 32.03125 C27.99479 32.03125 32.22656 32.03125 34.76562 32.03125 Q38.28125 30.85938 38.28125 28.51562 C38.28125 26.43229 38.28125 23.82812 38.28125 22.26562 Q37.5 18.75 36.32812 18.75 zM56.64062 18.75 C53.71094 18.75 47.85156 18.75 44.92188 18.75 Q43.75 18.75 42.96875 22.26562 C42.96875 24.34896 42.96875 26.95312 42.96875 28.51562 Q42.96875 31.25 45.70312 31.25 C49.34896 31.51042 53.90625 31.83594 56.64062 32.03125 Q60.9375 31.15234 60.9375 28.51562 Q59.96094 20.01953 58.59375 19.14062 C57.94271 19.01042 57.12891 18.84766 56.64062 18.75 zM67.57812 19.53125 C67.38281 19.53125 66.99219 19.53125 66.79688 19.53125 Q65.625 19.53125 64.84375 23.04688 C64.84375 24.86979 64.84375 27.14844 64.84375 28.51562 Q65.33203 32.03125 69.14062 32.03125 C72.26562 32.03125 76.17188 32.03125 78.51562 32.03125 Q81.25 32.03125 81.25 29.29688 C81.25 27.99479 81.25 26.36719 81.25 25.39062 Q81.25 20.99609 72.26562 20.3125 C70.70312 20.05208 68.75 19.72656 67.57812 19.53125 zM79.29688 0 Q79.00391 0 66.79688 13.67188 C66.79688 13.93229 66.79688 14.25781 66.79688 14.45312 Q66.79688 15.42969 70.70312 16.40625 C72.78646 16.53646 75.39062 16.69922 76.95312 16.79688 Q80.56641 16.79688 85.9375 9.375 Q86.71875 9.17969 87.5 7.42188 Q87.5 6.34766 84.57031 3.17383 Q81.64062 0 79.29688 0 zM23.82812 0 Q21.875 0 15.625 6.64062 C15.625 7.16146 15.625 7.8125 15.625 8.20312 Q22.55859 16.40625 25.39062 16.40625 C27.47396 16.40625 30.07812 16.40625 31.64062 16.40625 Q35.9375 15.13672 35.9375 13.67188 C31.90104 9.11458 26.85547 3.41797 23.82812 0 zM80.46875 70.01953 C77.02637 70.01953 70.1416 70.01953 66.69922 70.01953 Q65.13672 72.07031 65.03906 72.65625 C64.84375 74.96745 64.59961 77.85645 64.45312 79.58984 C65.40527 80.15137 67.30957 81.27441 68.26172 81.83594 C68.84766 81.86035 70.01953 81.90918 70.60547 81.93359 C72.48535 81.86035 76.24512 81.71387 78.125 81.64062 C78.95508 81.22559 80.61523 80.39551 81.44531 79.98047 C81.4209 78.14941 81.37207 74.4873 81.34766 72.65625 C81.12793 71.99707 80.68848 70.67871 80.46875 70.01953 zM68.45703 52.44141 Q65.42969 53.22266 65.42969 55.76172 C65.42969 58.43099 65.42969 61.76758 65.42969 63.76953 Q65.82031 66.50391 68.45703 66.50391 C71.77734 66.50391 75.92773 66.50391 78.41797 66.50391 Q81.15234 66.50391 82.03125 63.76953 C82.03125 61.10026 82.03125 57.76367 82.03125 55.76172 Q82.03125 52.83203 80.22461 52.63672 Q78.41797 52.44141 68.45703 52.44141 zM23.73047 52.44141 Q20.50781 53.22266 20.50781 55.76172 C20.50781 58.43099 20.50781 61.76758 20.50781 63.76953 Q20.99609 66.50391 23.73047 66.50391 C27.24609 66.50391 31.64063 66.50391 34.27734 66.50391 Q37.30469 66.50391 38.18359 63.76953 C38.18359 61.10026 38.18359 57.76367 38.18359 55.76172 Q38.18359 52.83203 36.23047 52.63672 Q34.27734 52.44141 23.73047 52.44141 zM12.01172 52.34375 C10.4248 52.46582 7.25098 52.70996 5.66406 52.83203 Q0.87891 53.02734 0.39062 55.76172 Q0.58594 60.35156 1.17188 64.94141 Q1.36719 66.21094 4.58984 66.21094 C7.0638 66.27604 10.15625 66.35742 12.01172 66.40625 C12.20703 66.38184 12.59766 66.33301 12.79297 66.30859 Q16.40625 65.91797 16.40625 62.89062 C16.27604 60.80729 16.11328 58.20312 16.01562 56.64062 Q15.72266 52.34375 12.01172 52.34375 z" />
+<glyph unicode="" horiz-adv-x="100" d="M8.98438 0 Q6.15234 11.52344 -0.58594 19.14062 C-0.58594 34.3099 -0.58594 53.27148 -0.58594 64.64844 Q-0.58594 71.875 48.4375 76.46484 Q48.04688 90.72266 39.55078 92.67578 C46.28906 92.2526 54.71191 91.72363 59.76562 91.40625 Q52.63672 91.89453 52.14844 76.66016 C53.74349 76.66016 55.7373 76.66016 56.93359 76.66016 C59.8877 79.46777 65.7959 85.08301 68.75 87.89062 C70.58105 87.59766 74.24316 87.01172 76.07422 86.71875 Q66.50391 80.37109 66.50391 79.00391 C68.09896 79.00391 70.09277 79.00391 71.28906 79.00391 Q74.21875 79.00391 92.67578 80.76172 Q100.58594 78.61328 98.92578 70.60547 Q73.63281 24.70703 71.28906 12.01172 Q61.03516 12.20703 59.86328 0.09766 Q54.49219 2.44141 54.49219 9.57031 C43.32682 9.57031 29.37012 9.57031 20.99609 9.57031 C19.65332 9.59473 16.96777 9.64355 15.625 9.66797 Q13.08594 0 8.98438 0 zM36.62109 16.30859 Q60.83984 16.50391 61.42578 24.51172 Q65.91797 52.83203 68.35938 65.23438 C63.41146 65.46224 57.22656 65.74707 53.51562 65.91797 C48.2666 65.9668 37.76855 66.06445 32.51953 66.11328 Q6.54297 66.11328 6.54297 59.08203 C6.54297 47.26562 6.54297 32.49512 6.54297 23.63281 Q8.88672 16.50391 20.70312 16.50391 C26.00911 16.4388 32.6416 16.35742 36.62109 16.30859 zM72.85156 49.41406 Q78.71094 48.73047 81.34766 53.41797 C81.83594 55.27344 82.44629 57.59277 82.8125 58.98438 C80.32227 59.22852 75.3418 59.7168 72.85156 59.96094 C72.3877 58.3252 71.45996 55.05371 70.99609 53.41797 Q70.70312 49.41406 72.85156 49.41406 zM70.50781 31.25 Q72.07031 33.10547 74.60938 33.10547 Q77.73438 40.52734 69.23828 39.25781 C68.65234 38.76953 67.91992 38.15918 67.48047 37.79297 Q67.48047 35.25391 66.30859 32.91016 Q68.45703 32.12891 70.50781 31.25 z" />
 <glyph unicode="" horiz-adv-x="100" d="M47.55859 20.80078 C45.50781 20.80078 41.40625 20.80078 39.35547 20.80078 C39.35547 24.90234 39.35547 33.10547 39.35547 37.20703 C38.52539 37.20703 36.86523 37.20703 36.03516 37.20703 C36.03516 33.10547 36.03516 24.90234 36.03516 20.80078 C33.59375 20.80078 28.71094 20.80078 26.26953 20.80078 C26.26953 24.90234 26.26953 33.10547 26.26953 37.20703 C25.43945 37.20703 23.7793 37.20703 22.94922 37.20703 C22.94922 33.10547 22.94922 24.90234 22.94922 20.80078 C20.89844 20.80078 16.79688 20.80078 14.74609 20.80078 C14.74609 32.2998 14.74609 55.29785 14.74609 66.79688 C16.38184 66.79688 19.65332 66.79688 21.28906 66.79688 Q26.26953 51.85547 31.15234 51.85547 Q36.03516 51.85547 39.35547 66.79688 C42.08984 66.79688 45.50781 66.79688 47.55859 66.79688 C47.55859 55.29785 47.55859 32.2998 47.55859 20.80078 zM63.96484 20.80078 C61.01074 20.80078 55.10254 20.80078 52.14844 20.80078 C52.14844 32.2998 52.14844 55.29785 52.14844 66.79688 C54.6875 66.79688 59.76563 66.79688 62.30469 66.79688 Q75.39062 66.69922 75.39062 53.61328 C75.39062 47.07031 75.39062 38.8916 75.39062 33.98438 Q75.39062 20.80078 63.96484 20.80078 zM88.08594 20.80078 C85.74219 20.80078 81.05469 20.80078 78.71094 20.80078 C78.71094 32.27539 78.71094 55.22461 78.71094 66.69922 C80.83496 66.69922 85.08301 66.69922 87.20703 66.69922 C87.20703 63.0127 87.20703 55.63965 87.20703 51.95312 Q99.90234 51.95312 99.90234 44.62891 C99.90234 39.77865 99.90234 33.71582 99.90234 30.07812 Q99.90234 20.80078 88.08594 20.80078 zM8.20312 20.80078 C6.15234 20.80078 2.05078 20.80078 0 20.80078 C0 32.2998 0 55.29785 0 66.79688 C2.05078 66.79688 6.15234 66.79688 8.20312 66.79688 C8.20312 55.29785 8.20312 32.2998 8.20312 20.80078 zM63.96484 27.34375 Q67.1875 27.44141 67.1875 30.37109 C67.1875 39.22526 67.1875 50.29297 67.1875 56.93359 Q67.1875 60.15625 63.96484 60.15625 C62.53255 60.15625 60.74219 60.15625 59.66797 60.15625 C59.66797 51.95312 59.66797 35.54688 59.66797 27.34375 C60.74219 27.34375 62.89063 27.34375 63.96484 27.34375 zM87.20703 27.34375 Q93.06641 27.34375 93.06641 30.66406 C93.06641 34.63542 93.06641 39.59961 93.06641 42.57812 Q93.06641 45.41016 87.20703 45.41016 C87.20703 39.38802 87.20703 31.86035 87.20703 27.34375 zM8.20312 72.75391 C6.15234 72.75391 2.05078 72.75391 0 72.75391 C0 75.92773 0 82.27539 0 85.44922 C2.05078 85.44922 6.15234 85.44922 8.20312 85.44922 C8.20312 82.27539 8.20312 75.92773 8.20312 72.75391 zM100 73.33984 C97.94922 73.33984 93.84766 73.33984 91.79688 73.33984 C91.79688 76.3916 91.79688 82.49512 91.79688 85.54688 C68.84766 85.54688 22.94922 85.54688 0 85.54688 C0 87.18262 0 90.4541 0 92.08984 C25 92.08984 75 92.08984 100 92.08984 C100 87.40234 100 78.02734 100 73.33984 zM99.90234 0.29297 C99.90234 -1.26953 99.90234 -4.39453 99.90234 -5.95703 C74.92676 -5.95703 24.97559 -5.95703 0 -5.95703 C0 -4.39453 0 -1.26953 0 0.29297 C24.97559 0.29297 74.92676 0.29297 99.90234 0.29297 zM99.90234 0.39062 C97.85156 0.39062 93.75 0.39062 91.69922 0.39062 C91.69922 3.56445 91.69922 9.91211 91.69922 13.08594 C93.75 13.08594 97.85156 13.08594 99.90234 13.08594 C99.90234 9.91211 99.90234 3.56445 99.90234 0.39062 zM8.20312 0.39062 C6.15234 0.39062 2.05078 0.39062 0 0.39062 C0 3.56445 0 9.91211 0 13.08594 C2.05078 13.08594 6.15234 13.08594 8.20312 13.08594 C8.20312 9.91211 8.20312 3.56445 8.20312 0.39062 z" />
 <glyph unicode="" horiz-adv-x="100.09766" d="M49.90234 9.08203 Q35.44922 9.08203 24.60938 20.21484 C29.91536 25.52083 36.54785 32.15332 40.52734 36.13281 C46.45996 30.17578 58.3252 18.26172 64.25781 12.30469 Q57.61719 9.08203 49.90234 9.08203 zM67.48047 13.67188 C60.74219 20.50781 47.26563 34.17969 40.52734 41.01562 C36.03516 36.4502 27.05078 27.31934 22.55859 22.75391 Q15.72266 32.03125 15.72266 43.75 Q15.72266 57.91016 25.78125 68.06641 Q35.83984 78.22266 49.90234 78.22266 Q55.76172 78.22266 61.23047 76.36719 C47.46094 62.5651 30.24902 45.3125 19.92188 34.96094 C20.55664 34.32617 21.82617 33.05664 22.46094 32.42188 C26.95313 36.96289 35.9375 46.04492 40.42969 50.58594 C40.50293 50.61035 40.64941 50.65918 40.72266 50.68359 C48.82812 42.5293 65.03906 26.2207 73.14453 18.06641 C72.82715 17.77344 72.19238 17.1875 71.875 16.89453 C64.03809 24.73145 48.36426 40.40527 40.52734 48.24219 C35.57129 43.28613 25.65918 33.37402 20.70312 28.41797 C21.33789 27.80762 22.60742 26.58691 23.24219 25.97656 C27.56348 30.32227 36.20605 39.01367 40.52734 43.35938 C47.65625 36.20605 61.91406 21.89941 69.04297 14.74609 C68.65234 14.47754 67.87109 13.94043 67.48047 13.67188 zM75.58594 20.41016 C67.40723 28.6377 51.0498 45.09277 42.87109 53.32031 C48.31543 58.74023 59.2041 69.58008 64.64844 75 Q84.27734 65.72266 84.27734 43.75 Q84.27734 28.41797 75.58594 20.41016 zM51.26953 46.875 C55.51758 51.17188 64.01367 59.76562 68.26172 64.0625 C67.67578 64.67285 66.50391 65.89355 65.91797 66.50391 C61.64551 62.23145 53.10059 53.68652 48.82812 49.41406 C49.43848 48.7793 50.65918 47.50977 51.26953 46.875 zM47.85156 50.78125 C52.73437 55.71289 62.5 65.57617 67.38281 70.50781 C66.79687 71.11816 65.625 72.33887 65.03906 72.94922 C60.13184 68.01758 50.31738 58.1543 45.41016 53.22266 C46.02051 52.6123 47.24121 51.3916 47.85156 50.78125 zM50 -6.25 Q40.03906 -6.25 30.85938 -2.44141 Q21.67969 1.36719 14.64844 8.39844 Q7.61719 15.42969 3.80859 24.60938 Q0 33.78906 0 43.75 Q0 53.71094 3.80859 62.93945 Q7.61719 72.16797 14.64844 79.19922 Q21.67969 86.23047 30.85938 90.03906 Q40.03906 93.84766 50 93.84766 Q70.80078 93.84766 85.44922 79.19922 Q100.09766 64.55078 100.09766 43.75 Q100.09766 23.04688 85.44922 8.39844 Q70.80078 -6.25 50 -6.25 zM50 3.02734 Q58.10547 3.02734 65.625 6.15234 Q73.14453 9.27734 78.80859 14.94141 Q84.57031 20.70312 87.69531 28.17383 Q90.82031 35.64453 90.82031 43.75 Q90.82031 61.03516 78.75977 72.80273 Q66.69922 84.57031 50 84.57031 Q33.20312 84.57031 21.24023 72.60742 Q9.27734 60.64453 9.27734 43.75 Q9.27734 26.85547 21.77734 14.55078 Q33.49609 3.02734 50 3.02734 z" />
 <glyph unicode="" horiz-adv-x="0" d="M56.15234 0.09766 C53.05176 0.09766 46.85059 0.09766 43.75 0.09766 Q24.02344 0.09766 12.40234 8.69141 Q4.19922 14.74609 0 25.09766 C0 35.48177 0 48.46191 0 56.25 Q0 71.875 25 75 C22.91667 79.16667 20.3125 84.375 18.75 87.5 C18.75 89.0625 18.75 92.1875 18.75 93.75 C20.3125 93.75 23.4375 93.75 25 93.75 C31.22559 90.625 43.67676 84.375 49.90234 81.25 Q70.21484 93.75 81.15234 93.75 C81.15234 91.66667 81.15234 89.0625 81.15234 87.5 C79.58984 84.375 76.46484 78.125 74.90234 75 Q99.90234 71.875 99.90234 56.25 C99.90234 45.86589 99.90234 32.88574 99.90234 25.09766 Q89.74609 0.09766 56.15234 0.09766 zM68.65234 12.59766 Q77.63672 12.59766 87.40234 31.25 C87.40234 37.5 87.40234 45.3125 87.40234 50 Q87.40234 60.54688 49.90234 68.75 Q12.5 60.54688 12.5 50 C12.5 43.75 12.5 35.9375 12.5 31.25 Q12.5 25.19531 20.99609 18.84766 Q25.09766 15.72266 31.25 12.59766 C43.71745 12.59766 59.30176 12.59766 68.65234 12.59766 zM37.5 31.25 C34.375 31.25 28.125 31.25 25 31.25 C25 35.9375 25 45.3125 25 50 C28.125 50 34.375 50 37.5 50 C37.5 45.3125 37.5 35.9375 37.5 31.25 zM74.90234 31.25 C71.77734 31.25 65.52734 31.25 62.40234 31.25 C62.40234 35.9375 62.40234 45.3125 62.40234 50 C65.52734 50 71.77734 50 74.90234 50 C74.90234 45.3125 74.90234 35.9375 74.90234 31.25 z" />
diff --git a/gui/slick/css/fonts/sgicons.ttf b/gui/slick/css/fonts/sgicons.ttf
index dea7a1a..0cab99b 100644
Binary files a/gui/slick/css/fonts/sgicons.ttf and b/gui/slick/css/fonts/sgicons.ttf differ
diff --git a/gui/slick/css/fonts/sgicons.woff b/gui/slick/css/fonts/sgicons.woff
index a5efba7..9e2b476 100644
Binary files a/gui/slick/css/fonts/sgicons.woff and b/gui/slick/css/fonts/sgicons.woff differ
diff --git a/gui/slick/css/light.css b/gui/slick/css/light.css
index 3114368..72dd496 100644
--- a/gui/slick/css/light.css
+++ b/gui/slick/css/light.css
@@ -1470,6 +1470,10 @@ thead.tablesorter-stickyHeader{
 	background-color:#dfdacf
 }
 
+.sort-size-type.tablesorter-headerSorted{
+	background-color:#4a4a4a
+}
+
 .tablesorter tr.tablesorter-filter-row,
 .tablesorter tr.tablesorter-filter-row td{
 	text-align:center;
@@ -1477,11 +1481,23 @@ thead.tablesorter-stickyHeader{
 	border-bottom:1px solid #ddd
 }
 
+.tablesorter-filter-row input[type="search"]{
+	box-shadow:inset rgba(0, 0, 0, 0.2) 0 0 0 1px
+}
+
+#tfoot{
+	text-shadow:-1px -1px 0 rgba(255, 255, 255, 0.6)
+}
+
+#tfoot,
 .tablesorter tfoot tr{
 	color:#ddd;
 	text-align:center;
+	background-color:#333
+}
+
+.tablesorter tfoot tr{
 	text-shadow:-1px -1px 0 rgba(0, 0, 0, 0.3);
-	background-color:#333;
 	border-collapse:collapse
 }
 
@@ -1489,6 +1505,15 @@ thead.tablesorter-stickyHeader{
 	color:#fff
 }
 
+#bulk-change-table .tablesorter-filter-row,
+#bulk-change-table .tablesorter-filter-row td,
+#bulk-change-table-sticky .tablesorter-filter-row,
+#bulk-change-table-sticky .tablesorter-filter-row td,
+#tfoot{
+	background:#d7d7d7;
+	border-bottom:0
+}
+
 /* =======================================================================
 jquery.confirm.css
 ========================================================================== */
diff --git a/gui/slick/css/style.css b/gui/slick/css/style.css
index cf10cad..135405a 100644
--- a/gui/slick/css/style.css
+++ b/gui/slick/css/style.css
@@ -682,6 +682,10 @@ inc_top.tmpl
 	content:"\e891"
 }
 
+.sgicon-ne:before{
+	content:"\e892"
+}
+
 .sgicon-imdb:before{
 	content:"\e898"
 }
@@ -1429,6 +1433,10 @@ home_browseShows.tmpl
 	background-image:url("../images/poster-dark.jpg")
 }
 
+#browse-list.tvcalendar a.browse-image{
+	background-size:145px;
+	background-position:50% 46%
+}
 #browse-list.tvcalendar .browse-image{
 	height:104px /* 62% of image height */
 }
@@ -1448,6 +1456,21 @@ home_browseShows.tmpl
 #browse-list.tvcalendar .show-card-inner .heart.icon-glyph{
 	margin-left:0
 }
+
+#browse-list.nextepisode a.browse-image{
+	background-position-y:45%
+}
+#browse-list.nextepisode .browse-image{
+	height:140px /* 65% of image height */
+}
+
+#browse-list.nextepisode .show-toggle-hide{
+	top:141px
+}
+
+#browse-list.nextepisode.no-votes .show-card{
+	height:209px
+}
 /* =======================================================================
 home_postprocess.tmpl
 ========================================================================== */
@@ -4783,7 +4806,8 @@ tablesorter.css
 }
 
 .tablesorter th,
-.tablesorter td{
+.tablesorter td,
+#tfoot{
 	padding:4px;
 	/*border-top:1px solid;*/
 	/*border-left:1px solid;*/
@@ -4813,6 +4837,7 @@ tablesorter.css
 	vertical-align:middle
 }
 
+.tablesorter thead .sort-size-type.tablesorter-headerSorted,
 #display-show .tablesorter .tablesorter-header,
 #display-show .tablesorter thead .tablesorter-headerDesc,
 #display-show .tablesorter thead .tablesorter-headerAsc{background-image:none}
diff --git a/gui/slick/images/addshows/add-existing16-black.png b/gui/slick/images/addshows/add-existing16-black.png
index 755c7a5..d2787ef 100644
Binary files a/gui/slick/images/addshows/add-existing16-black.png and b/gui/slick/images/addshows/add-existing16-black.png differ
diff --git a/gui/slick/images/addshows/add-existing16-white.png b/gui/slick/images/addshows/add-existing16-white.png
index 4ec2b42..1fee574 100644
Binary files a/gui/slick/images/addshows/add-existing16-white.png and b/gui/slick/images/addshows/add-existing16-white.png differ
diff --git a/gui/slick/images/addshows/add-existing32-black.png b/gui/slick/images/addshows/add-existing32-black.png
index d1003eb..6063de5 100644
Binary files a/gui/slick/images/addshows/add-existing32-black.png and b/gui/slick/images/addshows/add-existing32-black.png differ
diff --git a/gui/slick/images/addshows/add-existing32-white.png b/gui/slick/images/addshows/add-existing32-white.png
index 75c6a32..a5151a5 100644
Binary files a/gui/slick/images/addshows/add-existing32-white.png and b/gui/slick/images/addshows/add-existing32-white.png differ
diff --git a/gui/slick/images/addshows/add-new32-black.png b/gui/slick/images/addshows/add-new32-black.png
index ab8cc0b..0b34ebf 100644
Binary files a/gui/slick/images/addshows/add-new32-black.png and b/gui/slick/images/addshows/add-new32-black.png differ
diff --git a/gui/slick/images/addshows/add-new32-white.png b/gui/slick/images/addshows/add-new32-white.png
index c2cf61b..24043b6 100644
Binary files a/gui/slick/images/addshows/add-new32-white.png and b/gui/slick/images/addshows/add-new32-white.png differ
diff --git a/gui/slick/images/addshows/add-trakt32-black.png b/gui/slick/images/addshows/add-trakt32-black.png
index b412b02..d1c36bc 100644
Binary files a/gui/slick/images/addshows/add-trakt32-black.png and b/gui/slick/images/addshows/add-trakt32-black.png differ
diff --git a/gui/slick/images/addshows/add-trakt32-white.png b/gui/slick/images/addshows/add-trakt32-white.png
index be8d935..dcf86e9 100644
Binary files a/gui/slick/images/addshows/add-trakt32-white.png and b/gui/slick/images/addshows/add-trakt32-white.png differ
diff --git a/gui/slick/images/addshows/add-trending32-black.png b/gui/slick/images/addshows/add-trending32-black.png
index 2d9ade1..105d65b 100644
Binary files a/gui/slick/images/addshows/add-trending32-black.png and b/gui/slick/images/addshows/add-trending32-black.png differ
diff --git a/gui/slick/images/addshows/add-trending32-white.png b/gui/slick/images/addshows/add-trending32-white.png
index 5364ef8..8ee0e25 100644
Binary files a/gui/slick/images/addshows/add-trending32-white.png and b/gui/slick/images/addshows/add-trending32-white.png differ
diff --git a/gui/slick/images/addshows/anime16.png b/gui/slick/images/addshows/anime16.png
index 6e55d7a..fa0f8a8 100644
Binary files a/gui/slick/images/addshows/anime16.png and b/gui/slick/images/addshows/anime16.png differ
diff --git a/gui/slick/images/addshows/imdb16.png b/gui/slick/images/addshows/imdb16.png
index 8405b6e..f33b848 100644
Binary files a/gui/slick/images/addshows/imdb16.png and b/gui/slick/images/addshows/imdb16.png differ
diff --git a/gui/slick/images/addshows/trakt16-black.png b/gui/slick/images/addshows/trakt16-black.png
index ef52292..a59fd51 100644
Binary files a/gui/slick/images/addshows/trakt16-black.png and b/gui/slick/images/addshows/trakt16-black.png differ
diff --git a/gui/slick/images/addshows/trakt16-white.png b/gui/slick/images/addshows/trakt16-white.png
index b0dbb9d..5f4dc00 100644
Binary files a/gui/slick/images/addshows/trakt16-white.png and b/gui/slick/images/addshows/trakt16-white.png differ
diff --git a/gui/slick/images/arrows.png b/gui/slick/images/arrows.png
index 28e7b25..5095d14 100644
Binary files a/gui/slick/images/arrows.png and b/gui/slick/images/arrows.png differ
diff --git a/gui/slick/images/arrows2.png b/gui/slick/images/arrows2.png
index 1aa9d32..106638c 100644
Binary files a/gui/slick/images/arrows2.png and b/gui/slick/images/arrows2.png differ
diff --git a/gui/slick/images/banner.png b/gui/slick/images/banner.png
index fae4d25..b1e158c 100644
Binary files a/gui/slick/images/banner.png and b/gui/slick/images/banner.png differ
diff --git a/gui/slick/images/cancel32.png b/gui/slick/images/cancel32.png
index 1b2e691..8a5edb5 100644
Binary files a/gui/slick/images/cancel32.png and b/gui/slick/images/cancel32.png differ
diff --git a/gui/slick/images/changelog16.png b/gui/slick/images/changelog16.png
index 14f37d1..107a7b3 100644
Binary files a/gui/slick/images/changelog16.png and b/gui/slick/images/changelog16.png differ
diff --git a/gui/slick/images/closed_captioning.png b/gui/slick/images/closed_captioning.png
index 9040ce2..34fbc71 100644
Binary files a/gui/slick/images/closed_captioning.png and b/gui/slick/images/closed_captioning.png differ
diff --git a/gui/slick/images/down-success.png b/gui/slick/images/down-success.png
index f67b390..f1d4cea 100644
Binary files a/gui/slick/images/down-success.png and b/gui/slick/images/down-success.png differ
diff --git a/gui/slick/images/down-upgrade.png b/gui/slick/images/down-upgrade.png
index 9295323..f513452 100644
Binary files a/gui/slick/images/down-upgrade.png and b/gui/slick/images/down-upgrade.png differ
diff --git a/gui/slick/images/error16.png b/gui/slick/images/error16.png
index 7be1f17..17b64c9 100644
Binary files a/gui/slick/images/error16.png and b/gui/slick/images/error16.png differ
diff --git a/gui/slick/images/fanart.png b/gui/slick/images/fanart.png
index 9e907b4..11c0f46 100644
Binary files a/gui/slick/images/fanart.png and b/gui/slick/images/fanart.png differ
diff --git a/gui/slick/images/flags/ad.png b/gui/slick/images/flags/ad.png
index 625ca84..dd4adcd 100644
Binary files a/gui/slick/images/flags/ad.png and b/gui/slick/images/flags/ad.png differ
diff --git a/gui/slick/images/flags/ae.png b/gui/slick/images/flags/ae.png
index ef3a1ec..3aaf20d 100644
Binary files a/gui/slick/images/flags/ae.png and b/gui/slick/images/flags/ae.png differ
diff --git a/gui/slick/images/flags/af.png b/gui/slick/images/flags/af.png
index a4742e2..51e1933 100644
Binary files a/gui/slick/images/flags/af.png and b/gui/slick/images/flags/af.png differ
diff --git a/gui/slick/images/flags/ag.png b/gui/slick/images/flags/ag.png
index 556d550..da53be8 100644
Binary files a/gui/slick/images/flags/ag.png and b/gui/slick/images/flags/ag.png differ
diff --git a/gui/slick/images/flags/ai.png b/gui/slick/images/flags/ai.png
index 74ed29d..9bde3ce 100644
Binary files a/gui/slick/images/flags/ai.png and b/gui/slick/images/flags/ai.png differ
diff --git a/gui/slick/images/flags/al.png b/gui/slick/images/flags/al.png
index 92354cb..a38a730 100644
Binary files a/gui/slick/images/flags/al.png and b/gui/slick/images/flags/al.png differ
diff --git a/gui/slick/images/flags/am.png b/gui/slick/images/flags/am.png
index 344a2a8..763478f 100644
Binary files a/gui/slick/images/flags/am.png and b/gui/slick/images/flags/am.png differ
diff --git a/gui/slick/images/flags/an.png b/gui/slick/images/flags/an.png
index 633e4b8..4e2a57c 100644
Binary files a/gui/slick/images/flags/an.png and b/gui/slick/images/flags/an.png differ
diff --git a/gui/slick/images/flags/ao.png b/gui/slick/images/flags/ao.png
index bcbd1d6..33827bb 100644
Binary files a/gui/slick/images/flags/ao.png and b/gui/slick/images/flags/ao.png differ
diff --git a/gui/slick/images/flags/ar.png b/gui/slick/images/flags/ar.png
index e5ef8f1..86e8dbe 100644
Binary files a/gui/slick/images/flags/ar.png and b/gui/slick/images/flags/ar.png differ
diff --git a/gui/slick/images/flags/as.png b/gui/slick/images/flags/as.png
index 32f30e4..c0729de 100644
Binary files a/gui/slick/images/flags/as.png and b/gui/slick/images/flags/as.png differ
diff --git a/gui/slick/images/flags/at.png b/gui/slick/images/flags/at.png
index 0f15f34..700a656 100644
Binary files a/gui/slick/images/flags/at.png and b/gui/slick/images/flags/at.png differ
diff --git a/gui/slick/images/flags/au.png b/gui/slick/images/flags/au.png
index a01389a..27c4d0a 100644
Binary files a/gui/slick/images/flags/au.png and b/gui/slick/images/flags/au.png differ
diff --git a/gui/slick/images/flags/aw.png b/gui/slick/images/flags/aw.png
index a3579c2..7b7d01c 100644
Binary files a/gui/slick/images/flags/aw.png and b/gui/slick/images/flags/aw.png differ
diff --git a/gui/slick/images/flags/ax.png b/gui/slick/images/flags/ax.png
index 1eea80a..2c7c7f4 100644
Binary files a/gui/slick/images/flags/ax.png and b/gui/slick/images/flags/ax.png differ
diff --git a/gui/slick/images/flags/az.png b/gui/slick/images/flags/az.png
index 4ee9fe5..ba4d61f 100644
Binary files a/gui/slick/images/flags/az.png and b/gui/slick/images/flags/az.png differ
diff --git a/gui/slick/images/flags/ba.png b/gui/slick/images/flags/ba.png
index c774992..688c1af 100644
Binary files a/gui/slick/images/flags/ba.png and b/gui/slick/images/flags/ba.png differ
diff --git a/gui/slick/images/flags/bb.png b/gui/slick/images/flags/bb.png
index 0df19c7..61557ba 100644
Binary files a/gui/slick/images/flags/bb.png and b/gui/slick/images/flags/bb.png differ
diff --git a/gui/slick/images/flags/bd.png b/gui/slick/images/flags/bd.png
index 076a8bf..347601c 100644
Binary files a/gui/slick/images/flags/bd.png and b/gui/slick/images/flags/bd.png differ
diff --git a/gui/slick/images/flags/be.png b/gui/slick/images/flags/be.png
index d86ebc8..12c10f4 100644
Binary files a/gui/slick/images/flags/be.png and b/gui/slick/images/flags/be.png differ
diff --git a/gui/slick/images/flags/bf.png b/gui/slick/images/flags/bf.png
index ab5ce8f..3441675 100644
Binary files a/gui/slick/images/flags/bf.png and b/gui/slick/images/flags/bf.png differ
diff --git a/gui/slick/images/flags/bg.png b/gui/slick/images/flags/bg.png
index 0469f06..41f34d8 100644
Binary files a/gui/slick/images/flags/bg.png and b/gui/slick/images/flags/bg.png differ
diff --git a/gui/slick/images/flags/bh.png b/gui/slick/images/flags/bh.png
index ea8ce68..651934f 100644
Binary files a/gui/slick/images/flags/bh.png and b/gui/slick/images/flags/bh.png differ
diff --git a/gui/slick/images/flags/bi.png b/gui/slick/images/flags/bi.png
index 5cc2e30..5ff589b 100644
Binary files a/gui/slick/images/flags/bi.png and b/gui/slick/images/flags/bi.png differ
diff --git a/gui/slick/images/flags/bj.png b/gui/slick/images/flags/bj.png
index 1cc8b45..5fd1a5a 100644
Binary files a/gui/slick/images/flags/bj.png and b/gui/slick/images/flags/bj.png differ
diff --git a/gui/slick/images/flags/bm.png b/gui/slick/images/flags/bm.png
index c0c7aea..3cb8803 100644
Binary files a/gui/slick/images/flags/bm.png and b/gui/slick/images/flags/bm.png differ
diff --git a/gui/slick/images/flags/bn.png b/gui/slick/images/flags/bn.png
index 8fb0984..2a3d934 100644
Binary files a/gui/slick/images/flags/bn.png and b/gui/slick/images/flags/bn.png differ
diff --git a/gui/slick/images/flags/bo.png b/gui/slick/images/flags/bo.png
index ce7ba52..46b519e 100644
Binary files a/gui/slick/images/flags/bo.png and b/gui/slick/images/flags/bo.png differ
diff --git a/gui/slick/images/flags/br.png b/gui/slick/images/flags/br.png
index 9b1a553..a011b1d 100644
Binary files a/gui/slick/images/flags/br.png and b/gui/slick/images/flags/br.png differ
diff --git a/gui/slick/images/flags/bs.png b/gui/slick/images/flags/bs.png
index 639fa6c..1030207 100644
Binary files a/gui/slick/images/flags/bs.png and b/gui/slick/images/flags/bs.png differ
diff --git a/gui/slick/images/flags/bt.png b/gui/slick/images/flags/bt.png
index 1d512df..dd3bb1c 100644
Binary files a/gui/slick/images/flags/bt.png and b/gui/slick/images/flags/bt.png differ
diff --git a/gui/slick/images/flags/bv.png b/gui/slick/images/flags/bv.png
index 160b6b5..74264c5 100644
Binary files a/gui/slick/images/flags/bv.png and b/gui/slick/images/flags/bv.png differ
diff --git a/gui/slick/images/flags/bw.png b/gui/slick/images/flags/bw.png
index fcb1039..4a840d3 100644
Binary files a/gui/slick/images/flags/bw.png and b/gui/slick/images/flags/bw.png differ
diff --git a/gui/slick/images/flags/by.png b/gui/slick/images/flags/by.png
index 504774e..e9f9c34 100644
Binary files a/gui/slick/images/flags/by.png and b/gui/slick/images/flags/by.png differ
diff --git a/gui/slick/images/flags/bz.png b/gui/slick/images/flags/bz.png
index be63ee1..3b13813 100644
Binary files a/gui/slick/images/flags/bz.png and b/gui/slick/images/flags/bz.png differ
diff --git a/gui/slick/images/flags/ca.png b/gui/slick/images/flags/ca.png
index 1f20419..c4df905 100644
Binary files a/gui/slick/images/flags/ca.png and b/gui/slick/images/flags/ca.png differ
diff --git a/gui/slick/images/flags/cc.png b/gui/slick/images/flags/cc.png
index aed3d3b..bf5dcf1 100644
Binary files a/gui/slick/images/flags/cc.png and b/gui/slick/images/flags/cc.png differ
diff --git a/gui/slick/images/flags/cd.png b/gui/slick/images/flags/cd.png
index 5e48942..932e403 100644
Binary files a/gui/slick/images/flags/cd.png and b/gui/slick/images/flags/cd.png differ
diff --git a/gui/slick/images/flags/cf.png b/gui/slick/images/flags/cf.png
index da687bd..7fcb561 100644
Binary files a/gui/slick/images/flags/cf.png and b/gui/slick/images/flags/cf.png differ
diff --git a/gui/slick/images/flags/cg.png b/gui/slick/images/flags/cg.png
index a859792..a6e0490 100644
Binary files a/gui/slick/images/flags/cg.png and b/gui/slick/images/flags/cg.png differ
diff --git a/gui/slick/images/flags/ch.png b/gui/slick/images/flags/ch.png
index 242ec01..ca4d9be 100644
Binary files a/gui/slick/images/flags/ch.png and b/gui/slick/images/flags/ch.png differ
diff --git a/gui/slick/images/flags/ci.png b/gui/slick/images/flags/ci.png
index 3f2c62e..2ee79a3 100644
Binary files a/gui/slick/images/flags/ci.png and b/gui/slick/images/flags/ci.png differ
diff --git a/gui/slick/images/flags/ck.png b/gui/slick/images/flags/ck.png
index 746d3d6..45254db 100644
Binary files a/gui/slick/images/flags/ck.png and b/gui/slick/images/flags/ck.png differ
diff --git a/gui/slick/images/flags/cl.png b/gui/slick/images/flags/cl.png
index 29c6d61..74a69dc 100644
Binary files a/gui/slick/images/flags/cl.png and b/gui/slick/images/flags/cl.png differ
diff --git a/gui/slick/images/flags/cm.png b/gui/slick/images/flags/cm.png
index f65c5bd..7add66b 100644
Binary files a/gui/slick/images/flags/cm.png and b/gui/slick/images/flags/cm.png differ
diff --git a/gui/slick/images/flags/cn.png b/gui/slick/images/flags/cn.png
index 8914414..9f1b310 100644
Binary files a/gui/slick/images/flags/cn.png and b/gui/slick/images/flags/cn.png differ
diff --git a/gui/slick/images/flags/co.png b/gui/slick/images/flags/co.png
index a118ff4..a2fb476 100644
Binary files a/gui/slick/images/flags/co.png and b/gui/slick/images/flags/co.png differ
diff --git a/gui/slick/images/flags/cr.png b/gui/slick/images/flags/cr.png
index c7a3731..413797b 100644
Binary files a/gui/slick/images/flags/cr.png and b/gui/slick/images/flags/cr.png differ
diff --git a/gui/slick/images/flags/cs.png b/gui/slick/images/flags/cs.png
index 8254790..0e0fb6d 100644
Binary files a/gui/slick/images/flags/cs.png and b/gui/slick/images/flags/cs.png differ
diff --git a/gui/slick/images/flags/cu.png b/gui/slick/images/flags/cu.png
index 083f1d6..8ad51d2 100644
Binary files a/gui/slick/images/flags/cu.png and b/gui/slick/images/flags/cu.png differ
diff --git a/gui/slick/images/flags/cv.png b/gui/slick/images/flags/cv.png
index a63f7ea..eb96f9c 100644
Binary files a/gui/slick/images/flags/cv.png and b/gui/slick/images/flags/cv.png differ
diff --git a/gui/slick/images/flags/cx.png b/gui/slick/images/flags/cx.png
index 48e31ad..35ca80c 100644
Binary files a/gui/slick/images/flags/cx.png and b/gui/slick/images/flags/cx.png differ
diff --git a/gui/slick/images/flags/cy.png b/gui/slick/images/flags/cy.png
index 5b1ad6c..cd9253d 100644
Binary files a/gui/slick/images/flags/cy.png and b/gui/slick/images/flags/cy.png differ
diff --git a/gui/slick/images/flags/cz.png b/gui/slick/images/flags/cz.png
index c8403dd..113c873 100644
Binary files a/gui/slick/images/flags/cz.png and b/gui/slick/images/flags/cz.png differ
diff --git a/gui/slick/images/flags/da.png b/gui/slick/images/flags/da.png
index e2993d3..622cebd 100644
Binary files a/gui/slick/images/flags/da.png and b/gui/slick/images/flags/da.png differ
diff --git a/gui/slick/images/flags/de.png b/gui/slick/images/flags/de.png
index ac4a977..5cf32c7 100644
Binary files a/gui/slick/images/flags/de.png and b/gui/slick/images/flags/de.png differ
diff --git a/gui/slick/images/flags/dj.png b/gui/slick/images/flags/dj.png
index 582af36..de0faaa 100644
Binary files a/gui/slick/images/flags/dj.png and b/gui/slick/images/flags/dj.png differ
diff --git a/gui/slick/images/flags/dk.png b/gui/slick/images/flags/dk.png
index e2993d3..622cebd 100644
Binary files a/gui/slick/images/flags/dk.png and b/gui/slick/images/flags/dk.png differ
diff --git a/gui/slick/images/flags/dm.png b/gui/slick/images/flags/dm.png
index 5fbffcb..9f6a3dd 100644
Binary files a/gui/slick/images/flags/dm.png and b/gui/slick/images/flags/dm.png differ
diff --git a/gui/slick/images/flags/do.png b/gui/slick/images/flags/do.png
index 5a04932..4623099 100644
Binary files a/gui/slick/images/flags/do.png and b/gui/slick/images/flags/do.png differ
diff --git a/gui/slick/images/flags/dz.png b/gui/slick/images/flags/dz.png
index 335c239..cc6b014 100644
Binary files a/gui/slick/images/flags/dz.png and b/gui/slick/images/flags/dz.png differ
diff --git a/gui/slick/images/flags/ec.png b/gui/slick/images/flags/ec.png
index 0caa0b1..4ca1386 100644
Binary files a/gui/slick/images/flags/ec.png and b/gui/slick/images/flags/ec.png differ
diff --git a/gui/slick/images/flags/ee.png b/gui/slick/images/flags/ee.png
index 0c82efb..4bd8180 100644
Binary files a/gui/slick/images/flags/ee.png and b/gui/slick/images/flags/ee.png differ
diff --git a/gui/slick/images/flags/eg.png b/gui/slick/images/flags/eg.png
index 8a3f7a1..a7131a3 100644
Binary files a/gui/slick/images/flags/eg.png and b/gui/slick/images/flags/eg.png differ
diff --git a/gui/slick/images/flags/eh.png b/gui/slick/images/flags/eh.png
index 90a1195..e6566ce 100644
Binary files a/gui/slick/images/flags/eh.png and b/gui/slick/images/flags/eh.png differ
diff --git a/gui/slick/images/flags/el.png b/gui/slick/images/flags/el.png
index 8651ade..e2864b9 100644
Binary files a/gui/slick/images/flags/el.png and b/gui/slick/images/flags/el.png differ
diff --git a/gui/slick/images/flags/en.png b/gui/slick/images/flags/en.png
index ff701e1..405e897 100644
Binary files a/gui/slick/images/flags/en.png and b/gui/slick/images/flags/en.png differ
diff --git a/gui/slick/images/flags/er.png b/gui/slick/images/flags/er.png
index 13065ae..8223dbf 100644
Binary files a/gui/slick/images/flags/er.png and b/gui/slick/images/flags/er.png differ
diff --git a/gui/slick/images/flags/es.png b/gui/slick/images/flags/es.png
index c2de2d7..ef15681 100644
Binary files a/gui/slick/images/flags/es.png and b/gui/slick/images/flags/es.png differ
diff --git a/gui/slick/images/flags/et.png b/gui/slick/images/flags/et.png
index 2e893fa..11f79b0 100644
Binary files a/gui/slick/images/flags/et.png and b/gui/slick/images/flags/et.png differ
diff --git a/gui/slick/images/flags/fam.png b/gui/slick/images/flags/fam.png
index cf50c75..9499870 100644
Binary files a/gui/slick/images/flags/fam.png and b/gui/slick/images/flags/fam.png differ
diff --git a/gui/slick/images/flags/fi.png b/gui/slick/images/flags/fi.png
index 14ec091..541a872 100644
Binary files a/gui/slick/images/flags/fi.png and b/gui/slick/images/flags/fi.png differ
diff --git a/gui/slick/images/flags/fj.png b/gui/slick/images/flags/fj.png
index cee9988..4e8d073 100644
Binary files a/gui/slick/images/flags/fj.png and b/gui/slick/images/flags/fj.png differ
diff --git a/gui/slick/images/flags/fk.png b/gui/slick/images/flags/fk.png
index ceaeb27..0c80c6e 100644
Binary files a/gui/slick/images/flags/fk.png and b/gui/slick/images/flags/fk.png differ
diff --git a/gui/slick/images/flags/fm.png b/gui/slick/images/flags/fm.png
index 066bb24..a77a777 100644
Binary files a/gui/slick/images/flags/fm.png and b/gui/slick/images/flags/fm.png differ
diff --git a/gui/slick/images/flags/fo.png b/gui/slick/images/flags/fo.png
index cbceb80..957b0df 100644
Binary files a/gui/slick/images/flags/fo.png and b/gui/slick/images/flags/fo.png differ
diff --git a/gui/slick/images/flags/fr.png b/gui/slick/images/flags/fr.png
index 8332c4e..25cbe70 100644
Binary files a/gui/slick/images/flags/fr.png and b/gui/slick/images/flags/fr.png differ
diff --git a/gui/slick/images/flags/ga.png b/gui/slick/images/flags/ga.png
index 0e0d434..476fcf7 100644
Binary files a/gui/slick/images/flags/ga.png and b/gui/slick/images/flags/ga.png differ
diff --git a/gui/slick/images/flags/gb.png b/gui/slick/images/flags/gb.png
index ff701e1..405e897 100644
Binary files a/gui/slick/images/flags/gb.png and b/gui/slick/images/flags/gb.png differ
diff --git a/gui/slick/images/flags/gd.png b/gui/slick/images/flags/gd.png
index 9ab57f5..e533b30 100644
Binary files a/gui/slick/images/flags/gd.png and b/gui/slick/images/flags/gd.png differ
diff --git a/gui/slick/images/flags/ge.png b/gui/slick/images/flags/ge.png
index 728d970..38a2a8b 100644
Binary files a/gui/slick/images/flags/ge.png and b/gui/slick/images/flags/ge.png differ
diff --git a/gui/slick/images/flags/gf.png b/gui/slick/images/flags/gf.png
index 8332c4e..25cbe70 100644
Binary files a/gui/slick/images/flags/gf.png and b/gui/slick/images/flags/gf.png differ
diff --git a/gui/slick/images/flags/gh.png b/gui/slick/images/flags/gh.png
index 4e2f896..952b162 100644
Binary files a/gui/slick/images/flags/gh.png and b/gui/slick/images/flags/gh.png differ
diff --git a/gui/slick/images/flags/gi.png b/gui/slick/images/flags/gi.png
index e76797f..dbf58f9 100644
Binary files a/gui/slick/images/flags/gi.png and b/gui/slick/images/flags/gi.png differ
diff --git a/gui/slick/images/flags/gl.png b/gui/slick/images/flags/gl.png
index ef12a73..1a429de 100644
Binary files a/gui/slick/images/flags/gl.png and b/gui/slick/images/flags/gl.png differ
diff --git a/gui/slick/images/flags/gm.png b/gui/slick/images/flags/gm.png
index 0720b66..483e0dd 100644
Binary files a/gui/slick/images/flags/gm.png and b/gui/slick/images/flags/gm.png differ
diff --git a/gui/slick/images/flags/gn.png b/gui/slick/images/flags/gn.png
index ea660b0..72e879a 100644
Binary files a/gui/slick/images/flags/gn.png and b/gui/slick/images/flags/gn.png differ
diff --git a/gui/slick/images/flags/gp.png b/gui/slick/images/flags/gp.png
index dbb086d..160dae8 100644
Binary files a/gui/slick/images/flags/gp.png and b/gui/slick/images/flags/gp.png differ
diff --git a/gui/slick/images/flags/gq.png b/gui/slick/images/flags/gq.png
index ebe20a2..2cf6cf2 100644
Binary files a/gui/slick/images/flags/gq.png and b/gui/slick/images/flags/gq.png differ
diff --git a/gui/slick/images/flags/gr.png b/gui/slick/images/flags/gr.png
index 8651ade..e2864b9 100644
Binary files a/gui/slick/images/flags/gr.png and b/gui/slick/images/flags/gr.png differ
diff --git a/gui/slick/images/flags/gs.png b/gui/slick/images/flags/gs.png
index 7ef0bf5..e37521f 100644
Binary files a/gui/slick/images/flags/gs.png and b/gui/slick/images/flags/gs.png differ
diff --git a/gui/slick/images/flags/gt.png b/gui/slick/images/flags/gt.png
index c43a70d..abeaa19 100644
Binary files a/gui/slick/images/flags/gt.png and b/gui/slick/images/flags/gt.png differ
diff --git a/gui/slick/images/flags/gu.png b/gui/slick/images/flags/gu.png
index 92f37c0..f1248c5 100644
Binary files a/gui/slick/images/flags/gu.png and b/gui/slick/images/flags/gu.png differ
diff --git a/gui/slick/images/flags/gw.png b/gui/slick/images/flags/gw.png
index b37bcf0..2ad970b 100644
Binary files a/gui/slick/images/flags/gw.png and b/gui/slick/images/flags/gw.png differ
diff --git a/gui/slick/images/flags/gy.png b/gui/slick/images/flags/gy.png
index 22cbe2f..b8f6a04 100644
Binary files a/gui/slick/images/flags/gy.png and b/gui/slick/images/flags/gy.png differ
diff --git a/gui/slick/images/flags/he.png b/gui/slick/images/flags/he.png
index 31b61bc..986a6c3 100644
Binary files a/gui/slick/images/flags/he.png and b/gui/slick/images/flags/he.png differ
diff --git a/gui/slick/images/flags/hi.png b/gui/slick/images/flags/hi.png
index e4d7e81..6be798c 100644
Binary files a/gui/slick/images/flags/hi.png and b/gui/slick/images/flags/hi.png differ
diff --git a/gui/slick/images/flags/hk.png b/gui/slick/images/flags/hk.png
index d5c380c..5a3663a 100644
Binary files a/gui/slick/images/flags/hk.png and b/gui/slick/images/flags/hk.png differ
diff --git a/gui/slick/images/flags/hm.png b/gui/slick/images/flags/hm.png
index a01389a..27c4d0a 100644
Binary files a/gui/slick/images/flags/hm.png and b/gui/slick/images/flags/hm.png differ
diff --git a/gui/slick/images/flags/hn.png b/gui/slick/images/flags/hn.png
index 96f8388..97630a3 100644
Binary files a/gui/slick/images/flags/hn.png and b/gui/slick/images/flags/hn.png differ
diff --git a/gui/slick/images/flags/hr.png b/gui/slick/images/flags/hr.png
index 696b515..42d6f07 100644
Binary files a/gui/slick/images/flags/hr.png and b/gui/slick/images/flags/hr.png differ
diff --git a/gui/slick/images/flags/ht.png b/gui/slick/images/flags/ht.png
index 416052a..674ec29 100644
Binary files a/gui/slick/images/flags/ht.png and b/gui/slick/images/flags/ht.png differ
diff --git a/gui/slick/images/flags/hu.png b/gui/slick/images/flags/hu.png
index 7baafe4..2d01818 100644
Binary files a/gui/slick/images/flags/hu.png and b/gui/slick/images/flags/hu.png differ
diff --git a/gui/slick/images/flags/id.png b/gui/slick/images/flags/id.png
index c6bc0fa..ba72a73 100644
Binary files a/gui/slick/images/flags/id.png and b/gui/slick/images/flags/id.png differ
diff --git a/gui/slick/images/flags/ie.png b/gui/slick/images/flags/ie.png
index 26baa31..fc3a455 100644
Binary files a/gui/slick/images/flags/ie.png and b/gui/slick/images/flags/ie.png differ
diff --git a/gui/slick/images/flags/il.png b/gui/slick/images/flags/il.png
index 2ca772d..a6a4331 100644
Binary files a/gui/slick/images/flags/il.png and b/gui/slick/images/flags/il.png differ
diff --git a/gui/slick/images/flags/in.png b/gui/slick/images/flags/in.png
index e4d7e81..6be798c 100644
Binary files a/gui/slick/images/flags/in.png and b/gui/slick/images/flags/in.png differ
diff --git a/gui/slick/images/flags/io.png b/gui/slick/images/flags/io.png
index 3e74b6a..d87ed5f 100644
Binary files a/gui/slick/images/flags/io.png and b/gui/slick/images/flags/io.png differ
diff --git a/gui/slick/images/flags/iq.png b/gui/slick/images/flags/iq.png
index 878a351..9ac7f01 100644
Binary files a/gui/slick/images/flags/iq.png and b/gui/slick/images/flags/iq.png differ
diff --git a/gui/slick/images/flags/ir.png b/gui/slick/images/flags/ir.png
index c5fd136..f038dc9 100644
Binary files a/gui/slick/images/flags/ir.png and b/gui/slick/images/flags/ir.png differ
diff --git a/gui/slick/images/flags/is.png b/gui/slick/images/flags/is.png
index b8f6d0f..a4f5462 100644
Binary files a/gui/slick/images/flags/is.png and b/gui/slick/images/flags/is.png differ
diff --git a/gui/slick/images/flags/it.png b/gui/slick/images/flags/it.png
index 89692f7..8f248c5 100644
Binary files a/gui/slick/images/flags/it.png and b/gui/slick/images/flags/it.png differ
diff --git a/gui/slick/images/flags/ja.png b/gui/slick/images/flags/ja.png
index 4fbc123..ed113f5 100644
Binary files a/gui/slick/images/flags/ja.png and b/gui/slick/images/flags/ja.png differ
diff --git a/gui/slick/images/flags/jm.png b/gui/slick/images/flags/jm.png
index 7be119e..7a301fb 100644
Binary files a/gui/slick/images/flags/jm.png and b/gui/slick/images/flags/jm.png differ
diff --git a/gui/slick/images/flags/jo.png b/gui/slick/images/flags/jo.png
index 11bd497..f7beba7 100644
Binary files a/gui/slick/images/flags/jo.png and b/gui/slick/images/flags/jo.png differ
diff --git a/gui/slick/images/flags/jp.png b/gui/slick/images/flags/jp.png
index 325fbad..fcb41a1 100644
Binary files a/gui/slick/images/flags/jp.png and b/gui/slick/images/flags/jp.png differ
diff --git a/gui/slick/images/flags/ke.png b/gui/slick/images/flags/ke.png
index 51879ad..dde4b7a 100644
Binary files a/gui/slick/images/flags/ke.png and b/gui/slick/images/flags/ke.png differ
diff --git a/gui/slick/images/flags/kg.png b/gui/slick/images/flags/kg.png
index 0a818f6..6ded1b1 100644
Binary files a/gui/slick/images/flags/kg.png and b/gui/slick/images/flags/kg.png differ
diff --git a/gui/slick/images/flags/kh.png b/gui/slick/images/flags/kh.png
index 30f6bb1..d8a0f04 100644
Binary files a/gui/slick/images/flags/kh.png and b/gui/slick/images/flags/kh.png differ
diff --git a/gui/slick/images/flags/ki.png b/gui/slick/images/flags/ki.png
index 2dcce4b..36bc728 100644
Binary files a/gui/slick/images/flags/ki.png and b/gui/slick/images/flags/ki.png differ
diff --git a/gui/slick/images/flags/km.png b/gui/slick/images/flags/km.png
index 812b2f5..a2e1c62 100644
Binary files a/gui/slick/images/flags/km.png and b/gui/slick/images/flags/km.png differ
diff --git a/gui/slick/images/flags/kn.png b/gui/slick/images/flags/kn.png
index febd5b4..4570fc6 100644
Binary files a/gui/slick/images/flags/kn.png and b/gui/slick/images/flags/kn.png differ
diff --git a/gui/slick/images/flags/ko.png b/gui/slick/images/flags/ko.png
index c1179b5..3ab8dfe 100644
Binary files a/gui/slick/images/flags/ko.png and b/gui/slick/images/flags/ko.png differ
diff --git a/gui/slick/images/flags/kp.png b/gui/slick/images/flags/kp.png
index d3d509a..0a01c5e 100644
Binary files a/gui/slick/images/flags/kp.png and b/gui/slick/images/flags/kp.png differ
diff --git a/gui/slick/images/flags/kr.png b/gui/slick/images/flags/kr.png
index 9c0a78e..cdffba1 100644
Binary files a/gui/slick/images/flags/kr.png and b/gui/slick/images/flags/kr.png differ
diff --git a/gui/slick/images/flags/kw.png b/gui/slick/images/flags/kw.png
index 96546da..00e1c89 100644
Binary files a/gui/slick/images/flags/kw.png and b/gui/slick/images/flags/kw.png differ
diff --git a/gui/slick/images/flags/ky.png b/gui/slick/images/flags/ky.png
index 15c5f8e..13de72e 100644
Binary files a/gui/slick/images/flags/ky.png and b/gui/slick/images/flags/ky.png differ
diff --git a/gui/slick/images/flags/kz.png b/gui/slick/images/flags/kz.png
index 45a8c88..947e721 100644
Binary files a/gui/slick/images/flags/kz.png and b/gui/slick/images/flags/kz.png differ
diff --git a/gui/slick/images/flags/la.png b/gui/slick/images/flags/la.png
index e28acd0..257d2bc 100644
Binary files a/gui/slick/images/flags/la.png and b/gui/slick/images/flags/la.png differ
diff --git a/gui/slick/images/flags/lb.png b/gui/slick/images/flags/lb.png
index d0d452b..8affe4a 100644
Binary files a/gui/slick/images/flags/lb.png and b/gui/slick/images/flags/lb.png differ
diff --git a/gui/slick/images/flags/lc.png b/gui/slick/images/flags/lc.png
index a47d065..e610fe7 100644
Binary files a/gui/slick/images/flags/lc.png and b/gui/slick/images/flags/lc.png differ
diff --git a/gui/slick/images/flags/li.png b/gui/slick/images/flags/li.png
index 6469909..0d7ad97 100644
Binary files a/gui/slick/images/flags/li.png and b/gui/slick/images/flags/li.png differ
diff --git a/gui/slick/images/flags/lk.png b/gui/slick/images/flags/lk.png
index 088aad6..165bcd2 100644
Binary files a/gui/slick/images/flags/lk.png and b/gui/slick/images/flags/lk.png differ
diff --git a/gui/slick/images/flags/lr.png b/gui/slick/images/flags/lr.png
index 89a5bc7..111aae8 100644
Binary files a/gui/slick/images/flags/lr.png and b/gui/slick/images/flags/lr.png differ
diff --git a/gui/slick/images/flags/ls.png b/gui/slick/images/flags/ls.png
index 33fdef1..e9c653a 100644
Binary files a/gui/slick/images/flags/ls.png and b/gui/slick/images/flags/ls.png differ
diff --git a/gui/slick/images/flags/lt.png b/gui/slick/images/flags/lt.png
index c8ef0da..2e3b86f 100644
Binary files a/gui/slick/images/flags/lt.png and b/gui/slick/images/flags/lt.png differ
diff --git a/gui/slick/images/flags/lu.png b/gui/slick/images/flags/lu.png
index 4cabba9..8e400a8 100644
Binary files a/gui/slick/images/flags/lu.png and b/gui/slick/images/flags/lu.png differ
diff --git a/gui/slick/images/flags/lv.png b/gui/slick/images/flags/lv.png
index 49b6998..d9236f9 100644
Binary files a/gui/slick/images/flags/lv.png and b/gui/slick/images/flags/lv.png differ
diff --git a/gui/slick/images/flags/ly.png b/gui/slick/images/flags/ly.png
index b163a9f..4277cc3 100644
Binary files a/gui/slick/images/flags/ly.png and b/gui/slick/images/flags/ly.png differ
diff --git a/gui/slick/images/flags/ma.png b/gui/slick/images/flags/ma.png
index f386770..44f2961 100644
Binary files a/gui/slick/images/flags/ma.png and b/gui/slick/images/flags/ma.png differ
diff --git a/gui/slick/images/flags/mc.png b/gui/slick/images/flags/mc.png
index 1aa830f..6647ff9 100644
Binary files a/gui/slick/images/flags/mc.png and b/gui/slick/images/flags/mc.png differ
diff --git a/gui/slick/images/flags/md.png b/gui/slick/images/flags/md.png
index 4e92c18..7601ee5 100644
Binary files a/gui/slick/images/flags/md.png and b/gui/slick/images/flags/md.png differ
diff --git a/gui/slick/images/flags/me.png b/gui/slick/images/flags/me.png
index ac72535..9b316f1 100644
Binary files a/gui/slick/images/flags/me.png and b/gui/slick/images/flags/me.png differ
diff --git a/gui/slick/images/flags/mg.png b/gui/slick/images/flags/mg.png
index d2715b3..b8740f8 100644
Binary files a/gui/slick/images/flags/mg.png and b/gui/slick/images/flags/mg.png differ
diff --git a/gui/slick/images/flags/mh.png b/gui/slick/images/flags/mh.png
index fb523a8..ae1ca1d 100644
Binary files a/gui/slick/images/flags/mh.png and b/gui/slick/images/flags/mh.png differ
diff --git a/gui/slick/images/flags/mk.png b/gui/slick/images/flags/mk.png
index db173aa..c2b84b7 100644
Binary files a/gui/slick/images/flags/mk.png and b/gui/slick/images/flags/mk.png differ
diff --git a/gui/slick/images/flags/ml.png b/gui/slick/images/flags/ml.png
index 2cec8ba..0796eaa 100644
Binary files a/gui/slick/images/flags/ml.png and b/gui/slick/images/flags/ml.png differ
diff --git a/gui/slick/images/flags/mm.png b/gui/slick/images/flags/mm.png
index f464f67..d931b1d 100644
Binary files a/gui/slick/images/flags/mm.png and b/gui/slick/images/flags/mm.png differ
diff --git a/gui/slick/images/flags/mn.png b/gui/slick/images/flags/mn.png
index 9396355..8efe371 100644
Binary files a/gui/slick/images/flags/mn.png and b/gui/slick/images/flags/mn.png differ
diff --git a/gui/slick/images/flags/mo.png b/gui/slick/images/flags/mo.png
index deb801d..fc49f58 100644
Binary files a/gui/slick/images/flags/mo.png and b/gui/slick/images/flags/mo.png differ
diff --git a/gui/slick/images/flags/mp.png b/gui/slick/images/flags/mp.png
index 298d588..df0c4b8 100644
Binary files a/gui/slick/images/flags/mp.png and b/gui/slick/images/flags/mp.png differ
diff --git a/gui/slick/images/flags/mq.png b/gui/slick/images/flags/mq.png
index 010143b..0545200 100644
Binary files a/gui/slick/images/flags/mq.png and b/gui/slick/images/flags/mq.png differ
diff --git a/gui/slick/images/flags/mr.png b/gui/slick/images/flags/mr.png
index 319546b..6700d1c 100644
Binary files a/gui/slick/images/flags/mr.png and b/gui/slick/images/flags/mr.png differ
diff --git a/gui/slick/images/flags/ms.png b/gui/slick/images/flags/ms.png
index d4cbb43..aef23fc 100644
Binary files a/gui/slick/images/flags/ms.png and b/gui/slick/images/flags/ms.png differ
diff --git a/gui/slick/images/flags/mt.png b/gui/slick/images/flags/mt.png
index 00af948..a370319 100644
Binary files a/gui/slick/images/flags/mt.png and b/gui/slick/images/flags/mt.png differ
diff --git a/gui/slick/images/flags/mu.png b/gui/slick/images/flags/mu.png
index b7fdce1..c1e8b90 100644
Binary files a/gui/slick/images/flags/mu.png and b/gui/slick/images/flags/mu.png differ
diff --git a/gui/slick/images/flags/mv.png b/gui/slick/images/flags/mv.png
index 5073d9e..f03f90a 100644
Binary files a/gui/slick/images/flags/mv.png and b/gui/slick/images/flags/mv.png differ
diff --git a/gui/slick/images/flags/mw.png b/gui/slick/images/flags/mw.png
index 13886e9..1ee6485 100644
Binary files a/gui/slick/images/flags/mw.png and b/gui/slick/images/flags/mw.png differ
diff --git a/gui/slick/images/flags/mx.png b/gui/slick/images/flags/mx.png
index 5bc58ab..755f3be 100644
Binary files a/gui/slick/images/flags/mx.png and b/gui/slick/images/flags/mx.png differ
diff --git a/gui/slick/images/flags/my.png b/gui/slick/images/flags/my.png
index 9034cba..1680e0f 100644
Binary files a/gui/slick/images/flags/my.png and b/gui/slick/images/flags/my.png differ
diff --git a/gui/slick/images/flags/mz.png b/gui/slick/images/flags/mz.png
index 76405e0..9128db2 100644
Binary files a/gui/slick/images/flags/mz.png and b/gui/slick/images/flags/mz.png differ
diff --git a/gui/slick/images/flags/na.png b/gui/slick/images/flags/na.png
index 63358c6..a94c230 100644
Binary files a/gui/slick/images/flags/na.png and b/gui/slick/images/flags/na.png differ
diff --git a/gui/slick/images/flags/nc.png b/gui/slick/images/flags/nc.png
index 2cad283..b8f8654 100644
Binary files a/gui/slick/images/flags/nc.png and b/gui/slick/images/flags/nc.png differ
diff --git a/gui/slick/images/flags/ne.png b/gui/slick/images/flags/ne.png
index d85f424..60c8934 100644
Binary files a/gui/slick/images/flags/ne.png and b/gui/slick/images/flags/ne.png differ
diff --git a/gui/slick/images/flags/nf.png b/gui/slick/images/flags/nf.png
index f9bcdda..659bc0f 100644
Binary files a/gui/slick/images/flags/nf.png and b/gui/slick/images/flags/nf.png differ
diff --git a/gui/slick/images/flags/ng.png b/gui/slick/images/flags/ng.png
index 3eea2e0..6a1e6ee 100644
Binary files a/gui/slick/images/flags/ng.png and b/gui/slick/images/flags/ng.png differ
diff --git a/gui/slick/images/flags/ni.png b/gui/slick/images/flags/ni.png
index 3969aaa..6aab83f 100644
Binary files a/gui/slick/images/flags/ni.png and b/gui/slick/images/flags/ni.png differ
diff --git a/gui/slick/images/flags/nl.png b/gui/slick/images/flags/nl.png
index fe44791..3d09d5e 100644
Binary files a/gui/slick/images/flags/nl.png and b/gui/slick/images/flags/nl.png differ
diff --git a/gui/slick/images/flags/no.png b/gui/slick/images/flags/no.png
index 160b6b5..74264c5 100644
Binary files a/gui/slick/images/flags/no.png and b/gui/slick/images/flags/no.png differ
diff --git a/gui/slick/images/flags/np.png b/gui/slick/images/flags/np.png
index aeb058b..58d2666 100644
Binary files a/gui/slick/images/flags/np.png and b/gui/slick/images/flags/np.png differ
diff --git a/gui/slick/images/flags/nr.png b/gui/slick/images/flags/nr.png
index 705fc33..2c319ca 100644
Binary files a/gui/slick/images/flags/nr.png and b/gui/slick/images/flags/nr.png differ
diff --git a/gui/slick/images/flags/nu.png b/gui/slick/images/flags/nu.png
index c3ce4ae..5e365e1 100644
Binary files a/gui/slick/images/flags/nu.png and b/gui/slick/images/flags/nu.png differ
diff --git a/gui/slick/images/flags/nz.png b/gui/slick/images/flags/nz.png
index 10d6306..be935de 100644
Binary files a/gui/slick/images/flags/nz.png and b/gui/slick/images/flags/nz.png differ
diff --git a/gui/slick/images/flags/om.png b/gui/slick/images/flags/om.png
index 2ffba7e..dce4f36 100644
Binary files a/gui/slick/images/flags/om.png and b/gui/slick/images/flags/om.png differ
diff --git a/gui/slick/images/flags/pa.png b/gui/slick/images/flags/pa.png
index 9b2ee9a..59a45a1 100644
Binary files a/gui/slick/images/flags/pa.png and b/gui/slick/images/flags/pa.png differ
diff --git a/gui/slick/images/flags/pb.png b/gui/slick/images/flags/pb.png
index 9b1a553..a011b1d 100644
Binary files a/gui/slick/images/flags/pb.png and b/gui/slick/images/flags/pb.png differ
diff --git a/gui/slick/images/flags/pe.png b/gui/slick/images/flags/pe.png
index 62a0497..b14d04d 100644
Binary files a/gui/slick/images/flags/pe.png and b/gui/slick/images/flags/pe.png differ
diff --git a/gui/slick/images/flags/pf.png b/gui/slick/images/flags/pf.png
index 771a0f6..0da2b6c 100644
Binary files a/gui/slick/images/flags/pf.png and b/gui/slick/images/flags/pf.png differ
diff --git a/gui/slick/images/flags/pg.png b/gui/slick/images/flags/pg.png
index 10d6233..bcd1ea2 100644
Binary files a/gui/slick/images/flags/pg.png and b/gui/slick/images/flags/pg.png differ
diff --git a/gui/slick/images/flags/ph.png b/gui/slick/images/flags/ph.png
index b89e159..89083e9 100644
Binary files a/gui/slick/images/flags/ph.png and b/gui/slick/images/flags/ph.png differ
diff --git a/gui/slick/images/flags/pk.png b/gui/slick/images/flags/pk.png
index e9df70c..fc036d2 100644
Binary files a/gui/slick/images/flags/pk.png and b/gui/slick/images/flags/pk.png differ
diff --git a/gui/slick/images/flags/pl.png b/gui/slick/images/flags/pl.png
index d413d01..52c7a9d 100644
Binary files a/gui/slick/images/flags/pl.png and b/gui/slick/images/flags/pl.png differ
diff --git a/gui/slick/images/flags/pm.png b/gui/slick/images/flags/pm.png
index ba91d2c..0eea37c 100644
Binary files a/gui/slick/images/flags/pm.png and b/gui/slick/images/flags/pm.png differ
diff --git a/gui/slick/images/flags/pn.png b/gui/slick/images/flags/pn.png
index aa9344f..edf6e57 100644
Binary files a/gui/slick/images/flags/pn.png and b/gui/slick/images/flags/pn.png differ
diff --git a/gui/slick/images/flags/pr.png b/gui/slick/images/flags/pr.png
index 82d9130..5eb084e 100644
Binary files a/gui/slick/images/flags/pr.png and b/gui/slick/images/flags/pr.png differ
diff --git a/gui/slick/images/flags/ps.png b/gui/slick/images/flags/ps.png
index f5f5477..12a338a 100644
Binary files a/gui/slick/images/flags/ps.png and b/gui/slick/images/flags/ps.png differ
diff --git a/gui/slick/images/flags/pt.png b/gui/slick/images/flags/pt.png
index ece7980..dfe00c4 100644
Binary files a/gui/slick/images/flags/pt.png and b/gui/slick/images/flags/pt.png differ
diff --git a/gui/slick/images/flags/pw.png b/gui/slick/images/flags/pw.png
index 6178b25..0581288 100644
Binary files a/gui/slick/images/flags/pw.png and b/gui/slick/images/flags/pw.png differ
diff --git a/gui/slick/images/flags/py.png b/gui/slick/images/flags/py.png
index cb8723c..7010556 100644
Binary files a/gui/slick/images/flags/py.png and b/gui/slick/images/flags/py.png differ
diff --git a/gui/slick/images/flags/qa.png b/gui/slick/images/flags/qa.png
index ed4c621..b8dab33 100644
Binary files a/gui/slick/images/flags/qa.png and b/gui/slick/images/flags/qa.png differ
diff --git a/gui/slick/images/flags/re.png b/gui/slick/images/flags/re.png
index 8332c4e..25cbe70 100644
Binary files a/gui/slick/images/flags/re.png and b/gui/slick/images/flags/re.png differ
diff --git a/gui/slick/images/flags/ro.png b/gui/slick/images/flags/ro.png
index 57e74a6..2535bc8 100644
Binary files a/gui/slick/images/flags/ro.png and b/gui/slick/images/flags/ro.png differ
diff --git a/gui/slick/images/flags/rs.png b/gui/slick/images/flags/rs.png
index 9439a5b..23f716d 100644
Binary files a/gui/slick/images/flags/rs.png and b/gui/slick/images/flags/rs.png differ
diff --git a/gui/slick/images/flags/ru.png b/gui/slick/images/flags/ru.png
index 47da421..17641a6 100644
Binary files a/gui/slick/images/flags/ru.png and b/gui/slick/images/flags/ru.png differ
diff --git a/gui/slick/images/flags/rw.png b/gui/slick/images/flags/rw.png
index 5356491..f4b0136 100644
Binary files a/gui/slick/images/flags/rw.png and b/gui/slick/images/flags/rw.png differ
diff --git a/gui/slick/images/flags/sa.png b/gui/slick/images/flags/sa.png
index b4641c7..36ebcb7 100644
Binary files a/gui/slick/images/flags/sa.png and b/gui/slick/images/flags/sa.png differ
diff --git a/gui/slick/images/flags/sb.png b/gui/slick/images/flags/sb.png
index a9937cc..9293fa4 100644
Binary files a/gui/slick/images/flags/sb.png and b/gui/slick/images/flags/sb.png differ
diff --git a/gui/slick/images/flags/sc.png b/gui/slick/images/flags/sc.png
index 39ee371..8ad512b 100644
Binary files a/gui/slick/images/flags/sc.png and b/gui/slick/images/flags/sc.png differ
diff --git a/gui/slick/images/flags/sd.png b/gui/slick/images/flags/sd.png
index eaab69e..eba0a20 100644
Binary files a/gui/slick/images/flags/sd.png and b/gui/slick/images/flags/sd.png differ
diff --git a/gui/slick/images/flags/se.png b/gui/slick/images/flags/se.png
index 1994653..e2b347c 100644
Binary files a/gui/slick/images/flags/se.png and b/gui/slick/images/flags/se.png differ
diff --git a/gui/slick/images/flags/sg.png b/gui/slick/images/flags/sg.png
index dd34d61..975d6bb 100644
Binary files a/gui/slick/images/flags/sg.png and b/gui/slick/images/flags/sg.png differ
diff --git a/gui/slick/images/flags/sh.png b/gui/slick/images/flags/sh.png
index 4b1d2a2..9b6d05e 100644
Binary files a/gui/slick/images/flags/sh.png and b/gui/slick/images/flags/sh.png differ
diff --git a/gui/slick/images/flags/si.png b/gui/slick/images/flags/si.png
index bb1476f..266b9df 100644
Binary files a/gui/slick/images/flags/si.png and b/gui/slick/images/flags/si.png differ
diff --git a/gui/slick/images/flags/sj.png b/gui/slick/images/flags/sj.png
index 160b6b5..74264c5 100644
Binary files a/gui/slick/images/flags/sj.png and b/gui/slick/images/flags/sj.png differ
diff --git a/gui/slick/images/flags/sk.png b/gui/slick/images/flags/sk.png
index 7ccbc82..3d96e0b 100644
Binary files a/gui/slick/images/flags/sk.png and b/gui/slick/images/flags/sk.png differ
diff --git a/gui/slick/images/flags/sl.png b/gui/slick/images/flags/sl.png
index 12d812d..c59445b 100644
Binary files a/gui/slick/images/flags/sl.png and b/gui/slick/images/flags/sl.png differ
diff --git a/gui/slick/images/flags/sm.png b/gui/slick/images/flags/sm.png
index 3df2fdc..07282bb 100644
Binary files a/gui/slick/images/flags/sm.png and b/gui/slick/images/flags/sm.png differ
diff --git a/gui/slick/images/flags/sn.png b/gui/slick/images/flags/sn.png
index eabb71d..89961cb 100644
Binary files a/gui/slick/images/flags/sn.png and b/gui/slick/images/flags/sn.png differ
diff --git a/gui/slick/images/flags/so.png b/gui/slick/images/flags/so.png
index 4a1ea4b..ee5d955 100644
Binary files a/gui/slick/images/flags/so.png and b/gui/slick/images/flags/so.png differ
diff --git a/gui/slick/images/flags/sr.png b/gui/slick/images/flags/sr.png
index 5eff927..a217ac4 100644
Binary files a/gui/slick/images/flags/sr.png and b/gui/slick/images/flags/sr.png differ
diff --git a/gui/slick/images/flags/st.png b/gui/slick/images/flags/st.png
index 2978557..fb78130 100644
Binary files a/gui/slick/images/flags/st.png and b/gui/slick/images/flags/st.png differ
diff --git a/gui/slick/images/flags/sv.png b/gui/slick/images/flags/sv.png
index 1994653..e2b347c 100644
Binary files a/gui/slick/images/flags/sv.png and b/gui/slick/images/flags/sv.png differ
diff --git a/gui/slick/images/flags/sy.png b/gui/slick/images/flags/sy.png
index f5ce30d..6b9e535 100644
Binary files a/gui/slick/images/flags/sy.png and b/gui/slick/images/flags/sy.png differ
diff --git a/gui/slick/images/flags/sz.png b/gui/slick/images/flags/sz.png
index 914ee86..aadce52 100644
Binary files a/gui/slick/images/flags/sz.png and b/gui/slick/images/flags/sz.png differ
diff --git a/gui/slick/images/flags/tc.png b/gui/slick/images/flags/tc.png
index 8fc1156..729ce5a 100644
Binary files a/gui/slick/images/flags/tc.png and b/gui/slick/images/flags/tc.png differ
diff --git a/gui/slick/images/flags/td.png b/gui/slick/images/flags/td.png
index 667f21f..24421ad 100644
Binary files a/gui/slick/images/flags/td.png and b/gui/slick/images/flags/td.png differ
diff --git a/gui/slick/images/flags/tf.png b/gui/slick/images/flags/tf.png
index 80529a4..faf0e20 100644
Binary files a/gui/slick/images/flags/tf.png and b/gui/slick/images/flags/tf.png differ
diff --git a/gui/slick/images/flags/tg.png b/gui/slick/images/flags/tg.png
index 3aa00ad..6f70947 100644
Binary files a/gui/slick/images/flags/tg.png and b/gui/slick/images/flags/tg.png differ
diff --git a/gui/slick/images/flags/th.png b/gui/slick/images/flags/th.png
index dd8ba91..c1817eb 100644
Binary files a/gui/slick/images/flags/th.png and b/gui/slick/images/flags/th.png differ
diff --git a/gui/slick/images/flags/tj.png b/gui/slick/images/flags/tj.png
index 617bf64..68dba1a 100644
Binary files a/gui/slick/images/flags/tj.png and b/gui/slick/images/flags/tj.png differ
diff --git a/gui/slick/images/flags/tk.png b/gui/slick/images/flags/tk.png
index 67b8c8c..f3aa0f7 100644
Binary files a/gui/slick/images/flags/tk.png and b/gui/slick/images/flags/tk.png differ
diff --git a/gui/slick/images/flags/tl.png b/gui/slick/images/flags/tl.png
index 77da181..0fa1b59 100644
Binary files a/gui/slick/images/flags/tl.png and b/gui/slick/images/flags/tl.png differ
diff --git a/gui/slick/images/flags/tm.png b/gui/slick/images/flags/tm.png
index 828020e..cb1b24d 100644
Binary files a/gui/slick/images/flags/tm.png and b/gui/slick/images/flags/tm.png differ
diff --git a/gui/slick/images/flags/tn.png b/gui/slick/images/flags/tn.png
index 183cdd3..35215a5 100644
Binary files a/gui/slick/images/flags/tn.png and b/gui/slick/images/flags/tn.png differ
diff --git a/gui/slick/images/flags/to.png b/gui/slick/images/flags/to.png
index f89b8ba..4a208a5 100644
Binary files a/gui/slick/images/flags/to.png and b/gui/slick/images/flags/to.png differ
diff --git a/gui/slick/images/flags/tr.png b/gui/slick/images/flags/tr.png
index be32f77..97c147b 100644
Binary files a/gui/slick/images/flags/tr.png and b/gui/slick/images/flags/tr.png differ
diff --git a/gui/slick/images/flags/tt.png b/gui/slick/images/flags/tt.png
index 2a11c1e..add5c9a 100644
Binary files a/gui/slick/images/flags/tt.png and b/gui/slick/images/flags/tt.png differ
diff --git a/gui/slick/images/flags/tv.png b/gui/slick/images/flags/tv.png
index 28274c5..f439e47 100644
Binary files a/gui/slick/images/flags/tv.png and b/gui/slick/images/flags/tv.png differ
diff --git a/gui/slick/images/flags/tw.png b/gui/slick/images/flags/tw.png
index f31c654..242fa9e 100644
Binary files a/gui/slick/images/flags/tw.png and b/gui/slick/images/flags/tw.png differ
diff --git a/gui/slick/images/flags/tz.png b/gui/slick/images/flags/tz.png
index c00ff79..80f0bda 100644
Binary files a/gui/slick/images/flags/tz.png and b/gui/slick/images/flags/tz.png differ
diff --git a/gui/slick/images/flags/ua.png b/gui/slick/images/flags/ua.png
index 09563a2..7182cb3 100644
Binary files a/gui/slick/images/flags/ua.png and b/gui/slick/images/flags/ua.png differ
diff --git a/gui/slick/images/flags/ug.png b/gui/slick/images/flags/ug.png
index 33f4aff..3397745 100644
Binary files a/gui/slick/images/flags/ug.png and b/gui/slick/images/flags/ug.png differ
diff --git a/gui/slick/images/flags/uk.png b/gui/slick/images/flags/uk.png
index ff701e1..405e897 100644
Binary files a/gui/slick/images/flags/uk.png and b/gui/slick/images/flags/uk.png differ
diff --git a/gui/slick/images/flags/um.png b/gui/slick/images/flags/um.png
index c1dd965..714556b 100644
Binary files a/gui/slick/images/flags/um.png and b/gui/slick/images/flags/um.png differ
diff --git a/gui/slick/images/flags/unknown.png b/gui/slick/images/flags/unknown.png
index 41ab4e6..0d50794 100644
Binary files a/gui/slick/images/flags/unknown.png and b/gui/slick/images/flags/unknown.png differ
diff --git a/gui/slick/images/flags/us.png b/gui/slick/images/flags/us.png
index 10f451f..e1a5880 100644
Binary files a/gui/slick/images/flags/us.png and b/gui/slick/images/flags/us.png differ
diff --git a/gui/slick/images/flags/uy.png b/gui/slick/images/flags/uy.png
index 31d948a..52d0430 100644
Binary files a/gui/slick/images/flags/uy.png and b/gui/slick/images/flags/uy.png differ
diff --git a/gui/slick/images/flags/uz.png b/gui/slick/images/flags/uz.png
index fef5dc1..e387bea 100644
Binary files a/gui/slick/images/flags/uz.png and b/gui/slick/images/flags/uz.png differ
diff --git a/gui/slick/images/flags/va.png b/gui/slick/images/flags/va.png
index b31eaf2..557f514 100644
Binary files a/gui/slick/images/flags/va.png and b/gui/slick/images/flags/va.png differ
diff --git a/gui/slick/images/flags/vc.png b/gui/slick/images/flags/vc.png
index 8fa17b0..22d5eaa 100644
Binary files a/gui/slick/images/flags/vc.png and b/gui/slick/images/flags/vc.png differ
diff --git a/gui/slick/images/flags/ve.png b/gui/slick/images/flags/ve.png
index 00c90f9..3b59ee6 100644
Binary files a/gui/slick/images/flags/ve.png and b/gui/slick/images/flags/ve.png differ
diff --git a/gui/slick/images/flags/vg.png b/gui/slick/images/flags/vg.png
index 4156907..da34b84 100644
Binary files a/gui/slick/images/flags/vg.png and b/gui/slick/images/flags/vg.png differ
diff --git a/gui/slick/images/flags/vi.png b/gui/slick/images/flags/vi.png
index ed26915..581cb92 100644
Binary files a/gui/slick/images/flags/vi.png and b/gui/slick/images/flags/vi.png differ
diff --git a/gui/slick/images/flags/vn.png b/gui/slick/images/flags/vn.png
index ec7cd48..a2cd8a1 100644
Binary files a/gui/slick/images/flags/vn.png and b/gui/slick/images/flags/vn.png differ
diff --git a/gui/slick/images/flags/vu.png b/gui/slick/images/flags/vu.png
index b3397bc..32d7756 100644
Binary files a/gui/slick/images/flags/vu.png and b/gui/slick/images/flags/vu.png differ
diff --git a/gui/slick/images/flags/wf.png b/gui/slick/images/flags/wf.png
index 9f95587..d60c5b4 100644
Binary files a/gui/slick/images/flags/wf.png and b/gui/slick/images/flags/wf.png differ
diff --git a/gui/slick/images/flags/ws.png b/gui/slick/images/flags/ws.png
index c169508..8b40fdd 100644
Binary files a/gui/slick/images/flags/ws.png and b/gui/slick/images/flags/ws.png differ
diff --git a/gui/slick/images/flags/ye.png b/gui/slick/images/flags/ye.png
index 468dfad..9279e7e 100644
Binary files a/gui/slick/images/flags/ye.png and b/gui/slick/images/flags/ye.png differ
diff --git a/gui/slick/images/flags/yt.png b/gui/slick/images/flags/yt.png
index c298f37..a12f24d 100644
Binary files a/gui/slick/images/flags/yt.png and b/gui/slick/images/flags/yt.png differ
diff --git a/gui/slick/images/flags/za.png b/gui/slick/images/flags/za.png
index 57c58e2..489545f 100644
Binary files a/gui/slick/images/flags/za.png and b/gui/slick/images/flags/za.png differ
diff --git a/gui/slick/images/flags/zh.png b/gui/slick/images/flags/zh.png
index 8914414..9f1b310 100644
Binary files a/gui/slick/images/flags/zh.png and b/gui/slick/images/flags/zh.png differ
diff --git a/gui/slick/images/flags/zm.png b/gui/slick/images/flags/zm.png
index c25b07b..69dddb8 100644
Binary files a/gui/slick/images/flags/zm.png and b/gui/slick/images/flags/zm.png differ
diff --git a/gui/slick/images/flags/zw.png b/gui/slick/images/flags/zw.png
index 53c9725..a795223 100644
Binary files a/gui/slick/images/flags/zw.png and b/gui/slick/images/flags/zw.png differ
diff --git a/gui/slick/images/glyphicons-config.png b/gui/slick/images/glyphicons-config.png
index 3c1b55b..abf378b 100644
Binary files a/gui/slick/images/glyphicons-config.png and b/gui/slick/images/glyphicons-config.png differ
diff --git a/gui/slick/images/glyphicons-halflings-white.png b/gui/slick/images/glyphicons-halflings-white.png
index c3bf323..0465cfe 100644
Binary files a/gui/slick/images/glyphicons-halflings-white.png and b/gui/slick/images/glyphicons-halflings-white.png differ
diff --git a/gui/slick/images/glyphicons-halflings.png b/gui/slick/images/glyphicons-halflings.png
index e28c40e..4af2419 100644
Binary files a/gui/slick/images/glyphicons-halflings.png and b/gui/slick/images/glyphicons-halflings.png differ
diff --git a/gui/slick/images/heart.png b/gui/slick/images/heart.png
index 0e3bdd1..9554823 100644
Binary files a/gui/slick/images/heart.png and b/gui/slick/images/heart.png differ
diff --git a/gui/slick/images/iidrn.png b/gui/slick/images/iidrn.png
index 43e12d0..5b54610 100644
Binary files a/gui/slick/images/iidrn.png and b/gui/slick/images/iidrn.png differ
diff --git a/gui/slick/images/imdb16.png b/gui/slick/images/imdb16.png
index 5255868..8fafd72 100644
Binary files a/gui/slick/images/imdb16.png and b/gui/slick/images/imdb16.png differ
diff --git a/gui/slick/images/info32.png b/gui/slick/images/info32.png
index b00c672..4c8c78c 100644
Binary files a/gui/slick/images/info32.png and b/gui/slick/images/info32.png differ
diff --git a/gui/slick/images/legend16.png b/gui/slick/images/legend16.png
index fe9567c..ad29e78 100644
Binary files a/gui/slick/images/legend16.png and b/gui/slick/images/legend16.png differ
diff --git a/gui/slick/images/menu/system18-2.png b/gui/slick/images/menu/system18-2.png
index 97f6990..88ab6d4 100644
Binary files a/gui/slick/images/menu/system18-2.png and b/gui/slick/images/menu/system18-2.png differ
diff --git a/gui/slick/images/menu/system18.png b/gui/slick/images/menu/system18.png
index 55224ad..50acd1f 100644
Binary files a/gui/slick/images/menu/system18.png and b/gui/slick/images/menu/system18.png differ
diff --git a/gui/slick/images/metac16.png b/gui/slick/images/metac16.png
index 3b4a0c0..d09e0e6 100644
Binary files a/gui/slick/images/metac16.png and b/gui/slick/images/metac16.png differ
diff --git a/gui/slick/images/minus.png b/gui/slick/images/minus.png
index 03fb9be..f411f6f 100644
Binary files a/gui/slick/images/minus.png and b/gui/slick/images/minus.png differ
diff --git a/gui/slick/images/network/1live.png b/gui/slick/images/network/1live.png
index a1c2f72..283b668 100644
Binary files a/gui/slick/images/network/1live.png and b/gui/slick/images/network/1live.png differ
diff --git a/gui/slick/images/network/2be.png b/gui/slick/images/network/2be.png
index 8d2f0b4..36a4025 100644
Binary files a/gui/slick/images/network/2be.png and b/gui/slick/images/network/2be.png differ
diff --git a/gui/slick/images/network/33.png b/gui/slick/images/network/33.png
index 2954115..a052fc6 100644
Binary files a/gui/slick/images/network/33.png and b/gui/slick/images/network/33.png differ
diff --git a/gui/slick/images/network/3sat.png b/gui/slick/images/network/3sat.png
index 37c6890..00ebcd5 100644
Binary files a/gui/slick/images/network/3sat.png and b/gui/slick/images/network/3sat.png differ
diff --git a/gui/slick/images/network/7mate.png b/gui/slick/images/network/7mate.png
index c92c508..206f4e8 100644
Binary files a/gui/slick/images/network/7mate.png and b/gui/slick/images/network/7mate.png differ
diff --git a/gui/slick/images/network/a&e.png b/gui/slick/images/network/a&e.png
index a71b714..bffdaac 100644
Binary files a/gui/slick/images/network/a&e.png and b/gui/slick/images/network/a&e.png differ
diff --git a/gui/slick/images/network/abc (australia).png b/gui/slick/images/network/abc (australia).png
index 28b5824..ba5ece1 100644
Binary files a/gui/slick/images/network/abc (australia).png and b/gui/slick/images/network/abc (australia).png differ
diff --git a/gui/slick/images/network/abc australia.png b/gui/slick/images/network/abc australia.png
index 28b5824..ba5ece1 100644
Binary files a/gui/slick/images/network/abc australia.png and b/gui/slick/images/network/abc australia.png differ
diff --git a/gui/slick/images/network/abc family.png b/gui/slick/images/network/abc family.png
index dd890da..386bcd1 100644
Binary files a/gui/slick/images/network/abc family.png and b/gui/slick/images/network/abc family.png differ
diff --git a/gui/slick/images/network/abc news 24.png b/gui/slick/images/network/abc news 24.png
index 75a179f..d0aba50 100644
Binary files a/gui/slick/images/network/abc news 24.png and b/gui/slick/images/network/abc news 24.png differ
diff --git a/gui/slick/images/network/abc news.png b/gui/slick/images/network/abc news.png
index 36107dc..8a63ae4 100644
Binary files a/gui/slick/images/network/abc news.png and b/gui/slick/images/network/abc news.png differ
diff --git a/gui/slick/images/network/abc.png b/gui/slick/images/network/abc.png
index 2a63010..7da8061 100644
Binary files a/gui/slick/images/network/abc.png and b/gui/slick/images/network/abc.png differ
diff --git a/gui/slick/images/network/abc1.png b/gui/slick/images/network/abc1.png
index a14c453..61fb853 100644
Binary files a/gui/slick/images/network/abc1.png and b/gui/slick/images/network/abc1.png differ
diff --git a/gui/slick/images/network/abc2.png b/gui/slick/images/network/abc2.png
index 32e138c..399b487 100644
Binary files a/gui/slick/images/network/abc2.png and b/gui/slick/images/network/abc2.png differ
diff --git a/gui/slick/images/network/abc3.png b/gui/slick/images/network/abc3.png
index 1d5e5e9..0906439 100644
Binary files a/gui/slick/images/network/abc3.png and b/gui/slick/images/network/abc3.png differ
diff --git a/gui/slick/images/network/adult swim.png b/gui/slick/images/network/adult swim.png
index 2bd4fec..f538af4 100644
Binary files a/gui/slick/images/network/adult swim.png and b/gui/slick/images/network/adult swim.png differ
diff --git a/gui/slick/images/network/ahc.png b/gui/slick/images/network/ahc.png
index 410a514..b92dbc4 100644
Binary files a/gui/slick/images/network/ahc.png and b/gui/slick/images/network/ahc.png differ
diff --git a/gui/slick/images/network/amazon.png b/gui/slick/images/network/amazon.png
index 42e2b40..c46428d 100644
Binary files a/gui/slick/images/network/amazon.png and b/gui/slick/images/network/amazon.png differ
diff --git a/gui/slick/images/network/amc.png b/gui/slick/images/network/amc.png
index 8ef30db..ccef285 100644
Binary files a/gui/slick/images/network/amc.png and b/gui/slick/images/network/amc.png differ
diff --git a/gui/slick/images/network/animal planet.png b/gui/slick/images/network/animal planet.png
index 58c88b6..9d45582 100644
Binary files a/gui/slick/images/network/animal planet.png and b/gui/slick/images/network/animal planet.png differ
diff --git a/gui/slick/images/network/animax.png b/gui/slick/images/network/animax.png
index 5c3bed4..5f4fc72 100644
Binary files a/gui/slick/images/network/animax.png and b/gui/slick/images/network/animax.png differ
diff --git a/gui/slick/images/network/anime network.png b/gui/slick/images/network/anime network.png
index 1e2df23..caf8ce2 100644
Binary files a/gui/slick/images/network/anime network.png and b/gui/slick/images/network/anime network.png differ
diff --git a/gui/slick/images/network/antena 3.png b/gui/slick/images/network/antena 3.png
index 569f801..6f147a7 100644
Binary files a/gui/slick/images/network/antena 3.png and b/gui/slick/images/network/antena 3.png differ
diff --git a/gui/slick/images/network/ard.png b/gui/slick/images/network/ard.png
index 849367f..364f7ab 100644
Binary files a/gui/slick/images/network/ard.png and b/gui/slick/images/network/ard.png differ
diff --git a/gui/slick/images/network/arte.png b/gui/slick/images/network/arte.png
index e5db57e..2690dbf 100644
Binary files a/gui/slick/images/network/arte.png and b/gui/slick/images/network/arte.png differ
diff --git a/gui/slick/images/network/at-x.png b/gui/slick/images/network/at-x.png
index ff7a1b0..02b829d 100644
Binary files a/gui/slick/images/network/at-x.png and b/gui/slick/images/network/at-x.png differ
diff --git a/gui/slick/images/network/at5.png b/gui/slick/images/network/at5.png
index 0832882..e550a4d 100644
Binary files a/gui/slick/images/network/at5.png and b/gui/slick/images/network/at5.png differ
diff --git a/gui/slick/images/network/audience network.png b/gui/slick/images/network/audience network.png
index 964db67..9f059fb 100644
Binary files a/gui/slick/images/network/audience network.png and b/gui/slick/images/network/audience network.png differ
diff --git a/gui/slick/images/network/avro.png b/gui/slick/images/network/avro.png
index 68779da..302bccc 100644
Binary files a/gui/slick/images/network/avro.png and b/gui/slick/images/network/avro.png differ
diff --git a/gui/slick/images/network/axn.png b/gui/slick/images/network/axn.png
index b0b0001..e3f89bb 100644
Binary files a/gui/slick/images/network/axn.png and b/gui/slick/images/network/axn.png differ
diff --git a/gui/slick/images/network/bandai visual.png b/gui/slick/images/network/bandai visual.png
index 05f453d..7179e57 100644
Binary files a/gui/slick/images/network/bandai visual.png and b/gui/slick/images/network/bandai visual.png differ
diff --git a/gui/slick/images/network/bandai.png b/gui/slick/images/network/bandai.png
index a4eb402..8c01407 100644
Binary files a/gui/slick/images/network/bandai.png and b/gui/slick/images/network/bandai.png differ
diff --git a/gui/slick/images/network/bbc america.png b/gui/slick/images/network/bbc america.png
index b0ededd..59627f1 100644
Binary files a/gui/slick/images/network/bbc america.png and b/gui/slick/images/network/bbc america.png differ
diff --git a/gui/slick/images/network/bbc canada.png b/gui/slick/images/network/bbc canada.png
index 11ef742..d1dd5d7 100644
Binary files a/gui/slick/images/network/bbc canada.png and b/gui/slick/images/network/bbc canada.png differ
diff --git a/gui/slick/images/network/bbc entertainment.png b/gui/slick/images/network/bbc entertainment.png
index 720fafd..fe8e2ef 100644
Binary files a/gui/slick/images/network/bbc entertainment.png and b/gui/slick/images/network/bbc entertainment.png differ
diff --git a/gui/slick/images/network/bbc four.png b/gui/slick/images/network/bbc four.png
index 221b9b3..c1db528 100644
Binary files a/gui/slick/images/network/bbc four.png and b/gui/slick/images/network/bbc four.png differ
diff --git a/gui/slick/images/network/bbc hd.png b/gui/slick/images/network/bbc hd.png
index f2a3e33..5001352 100644
Binary files a/gui/slick/images/network/bbc hd.png and b/gui/slick/images/network/bbc hd.png differ
diff --git a/gui/slick/images/network/bbc news.png b/gui/slick/images/network/bbc news.png
index ae59225..5a997ca 100644
Binary files a/gui/slick/images/network/bbc news.png and b/gui/slick/images/network/bbc news.png differ
diff --git a/gui/slick/images/network/bbc one.png b/gui/slick/images/network/bbc one.png
index a23d45e..42b999e 100644
Binary files a/gui/slick/images/network/bbc one.png and b/gui/slick/images/network/bbc one.png differ
diff --git a/gui/slick/images/network/bbc parliament.png b/gui/slick/images/network/bbc parliament.png
index ceb57a8..9580ee3 100644
Binary files a/gui/slick/images/network/bbc parliament.png and b/gui/slick/images/network/bbc parliament.png differ
diff --git a/gui/slick/images/network/bbc prime.png b/gui/slick/images/network/bbc prime.png
index 9ca37c5..fd6a10d 100644
Binary files a/gui/slick/images/network/bbc prime.png and b/gui/slick/images/network/bbc prime.png differ
diff --git a/gui/slick/images/network/bbc three.png b/gui/slick/images/network/bbc three.png
index e53134d..70679c2 100644
Binary files a/gui/slick/images/network/bbc three.png and b/gui/slick/images/network/bbc three.png differ
diff --git a/gui/slick/images/network/bbc two.png b/gui/slick/images/network/bbc two.png
index 8101488..1e9d53f 100644
Binary files a/gui/slick/images/network/bbc two.png and b/gui/slick/images/network/bbc two.png differ
diff --git a/gui/slick/images/network/bbc.png b/gui/slick/images/network/bbc.png
index 720fafd..fe8e2ef 100644
Binary files a/gui/slick/images/network/bbc.png and b/gui/slick/images/network/bbc.png differ
diff --git a/gui/slick/images/network/bet.png b/gui/slick/images/network/bet.png
index f256706..1286e43 100644
Binary files a/gui/slick/images/network/bet.png and b/gui/slick/images/network/bet.png differ
diff --git a/gui/slick/images/network/bio.png b/gui/slick/images/network/bio.png
index 4fd26fd..d85b4f2 100644
Binary files a/gui/slick/images/network/bio.png and b/gui/slick/images/network/bio.png differ
diff --git a/gui/slick/images/network/biography channel.png b/gui/slick/images/network/biography channel.png
index 4fd26fd..d85b4f2 100644
Binary files a/gui/slick/images/network/biography channel.png and b/gui/slick/images/network/biography channel.png differ
diff --git a/gui/slick/images/network/bloomberg.png b/gui/slick/images/network/bloomberg.png
index 68d4057..da62eb5 100644
Binary files a/gui/slick/images/network/bloomberg.png and b/gui/slick/images/network/bloomberg.png differ
diff --git a/gui/slick/images/network/bnn.png b/gui/slick/images/network/bnn.png
index ff9d9f6..8dffd00 100644
Binary files a/gui/slick/images/network/bnn.png and b/gui/slick/images/network/bnn.png differ
diff --git a/gui/slick/images/network/bravo!.png b/gui/slick/images/network/bravo!.png
index dff7fd4..6d2edf7 100644
Binary files a/gui/slick/images/network/bravo!.png and b/gui/slick/images/network/bravo!.png differ
diff --git a/gui/slick/images/network/bravo.png b/gui/slick/images/network/bravo.png
index 9ba6cc7..262232c 100644
Binary files a/gui/slick/images/network/bravo.png and b/gui/slick/images/network/bravo.png differ
diff --git a/gui/slick/images/network/bs11.png b/gui/slick/images/network/bs11.png
index c6e6720..0051bf2 100644
Binary files a/gui/slick/images/network/bs11.png and b/gui/slick/images/network/bs11.png differ
diff --git a/gui/slick/images/network/byu television.png b/gui/slick/images/network/byu television.png
index d0540f1..a0d6261 100644
Binary files a/gui/slick/images/network/byu television.png and b/gui/slick/images/network/byu television.png differ
diff --git a/gui/slick/images/network/canal+.png b/gui/slick/images/network/canal+.png
index 4af0a29..3648532 100644
Binary files a/gui/slick/images/network/canal+.png and b/gui/slick/images/network/canal+.png differ
diff --git a/gui/slick/images/network/canvas.png b/gui/slick/images/network/canvas.png
index 8e0df2f..e625f02 100644
Binary files a/gui/slick/images/network/canvas.png and b/gui/slick/images/network/canvas.png differ
diff --git a/gui/slick/images/network/cartoon network.png b/gui/slick/images/network/cartoon network.png
index 93c39f1..42ae9d1 100644
Binary files a/gui/slick/images/network/cartoon network.png and b/gui/slick/images/network/cartoon network.png differ
diff --git a/gui/slick/images/network/cbbc.png b/gui/slick/images/network/cbbc.png
index 20fb6f3..9d91326 100644
Binary files a/gui/slick/images/network/cbbc.png and b/gui/slick/images/network/cbbc.png differ
diff --git a/gui/slick/images/network/cbc.png b/gui/slick/images/network/cbc.png
index 699a6f6..ed7bab6 100644
Binary files a/gui/slick/images/network/cbc.png and b/gui/slick/images/network/cbc.png differ
diff --git a/gui/slick/images/network/cbeebies.png b/gui/slick/images/network/cbeebies.png
index fc3a1a0..80936cc 100644
Binary files a/gui/slick/images/network/cbeebies.png and b/gui/slick/images/network/cbeebies.png differ
diff --git a/gui/slick/images/network/cbs all access.png b/gui/slick/images/network/cbs all access.png
index 95bd36b..f641f91 100644
Binary files a/gui/slick/images/network/cbs all access.png and b/gui/slick/images/network/cbs all access.png differ
diff --git a/gui/slick/images/network/cbs.png b/gui/slick/images/network/cbs.png
index d061839..599a468 100644
Binary files a/gui/slick/images/network/cbs.png and b/gui/slick/images/network/cbs.png differ
diff --git a/gui/slick/images/network/cctv.png b/gui/slick/images/network/cctv.png
index 0fb1c31..4e4a50b 100644
Binary files a/gui/slick/images/network/cctv.png and b/gui/slick/images/network/cctv.png differ
diff --git a/gui/slick/images/network/channel 4.png b/gui/slick/images/network/channel 4.png
index 57befa1..912a38e 100644
Binary files a/gui/slick/images/network/channel 4.png and b/gui/slick/images/network/channel 4.png differ
diff --git a/gui/slick/images/network/channel 5 (uk).png b/gui/slick/images/network/channel 5 (uk).png
index 35d8596..f9f3452 100644
Binary files a/gui/slick/images/network/channel 5 (uk).png and b/gui/slick/images/network/channel 5 (uk).png differ
diff --git a/gui/slick/images/network/channel 5.png b/gui/slick/images/network/channel 5.png
index 35d8596..f9f3452 100644
Binary files a/gui/slick/images/network/channel 5.png and b/gui/slick/images/network/channel 5.png differ
diff --git a/gui/slick/images/network/channel ten.png b/gui/slick/images/network/channel ten.png
index 6a39b6c..0c03197 100644
Binary files a/gui/slick/images/network/channel ten.png and b/gui/slick/images/network/channel ten.png differ
diff --git a/gui/slick/images/network/chiller.png b/gui/slick/images/network/chiller.png
index 8ebd956..a52f05c 100644
Binary files a/gui/slick/images/network/chiller.png and b/gui/slick/images/network/chiller.png differ
diff --git a/gui/slick/images/network/cinemax.png b/gui/slick/images/network/cinemax.png
index 24d080c..2c6df2f 100644
Binary files a/gui/slick/images/network/cinemax.png and b/gui/slick/images/network/cinemax.png differ
diff --git a/gui/slick/images/network/city.png b/gui/slick/images/network/city.png
index ced9e83..9bc42f1 100644
Binary files a/gui/slick/images/network/city.png and b/gui/slick/images/network/city.png differ
diff --git a/gui/slick/images/network/cmt.png b/gui/slick/images/network/cmt.png
index 1fa4c08..b2542a1 100644
Binary files a/gui/slick/images/network/cmt.png and b/gui/slick/images/network/cmt.png differ
diff --git a/gui/slick/images/network/cnbc.png b/gui/slick/images/network/cnbc.png
index 7512607..2858d50 100644
Binary files a/gui/slick/images/network/cnbc.png and b/gui/slick/images/network/cnbc.png differ
diff --git a/gui/slick/images/network/cnn.png b/gui/slick/images/network/cnn.png
index 2b06149..5cdc9cb 100644
Binary files a/gui/slick/images/network/cnn.png and b/gui/slick/images/network/cnn.png differ
diff --git a/gui/slick/images/network/comedy central hd.png b/gui/slick/images/network/comedy central hd.png
index 457cbb3..53faac8 100644
Binary files a/gui/slick/images/network/comedy central hd.png and b/gui/slick/images/network/comedy central hd.png differ
diff --git a/gui/slick/images/network/comedy central.png b/gui/slick/images/network/comedy central.png
index 457cbb3..53faac8 100644
Binary files a/gui/slick/images/network/comedy central.png and b/gui/slick/images/network/comedy central.png differ
diff --git a/gui/slick/images/network/cooking channel.png b/gui/slick/images/network/cooking channel.png
index 3971359..1d5f118 100644
Binary files a/gui/slick/images/network/cooking channel.png and b/gui/slick/images/network/cooking channel.png differ
diff --git a/gui/slick/images/network/crackle.png b/gui/slick/images/network/crackle.png
index c4d482f..a0442b5 100644
Binary files a/gui/slick/images/network/crackle.png and b/gui/slick/images/network/crackle.png differ
diff --git a/gui/slick/images/network/crime & investigation network.png b/gui/slick/images/network/crime & investigation network.png
index f380595..1b0b7d9 100644
Binary files a/gui/slick/images/network/crime & investigation network.png and b/gui/slick/images/network/crime & investigation network.png differ
diff --git a/gui/slick/images/network/crime and investigation network.png b/gui/slick/images/network/crime and investigation network.png
index f380595..1b0b7d9 100644
Binary files a/gui/slick/images/network/crime and investigation network.png and b/gui/slick/images/network/crime and investigation network.png differ
diff --git a/gui/slick/images/network/ctc.png b/gui/slick/images/network/ctc.png
index c9d3b46..8134016 100644
Binary files a/gui/slick/images/network/ctc.png and b/gui/slick/images/network/ctc.png differ
diff --git a/gui/slick/images/network/ctv.png b/gui/slick/images/network/ctv.png
index 0dd8a66..174a7b6 100644
Binary files a/gui/slick/images/network/ctv.png and b/gui/slick/images/network/ctv.png differ
diff --git a/gui/slick/images/network/cuatro.png b/gui/slick/images/network/cuatro.png
index 6da3834..6b6f16d 100644
Binary files a/gui/slick/images/network/cuatro.png and b/gui/slick/images/network/cuatro.png differ
diff --git a/gui/slick/images/network/cw.png b/gui/slick/images/network/cw.png
index 1c7fd52..70ad363 100644
Binary files a/gui/slick/images/network/cw.png and b/gui/slick/images/network/cw.png differ
diff --git a/gui/slick/images/network/dave.png b/gui/slick/images/network/dave.png
index 6d4088a..cfa5761 100644
Binary files a/gui/slick/images/network/dave.png and b/gui/slick/images/network/dave.png differ
diff --git a/gui/slick/images/network/destination america.png b/gui/slick/images/network/destination america.png
index 66e7d53..7e39941 100644
Binary files a/gui/slick/images/network/destination america.png and b/gui/slick/images/network/destination america.png differ
diff --git a/gui/slick/images/network/discovery channel.png b/gui/slick/images/network/discovery channel.png
index 7baa530..8f09aef 100644
Binary files a/gui/slick/images/network/discovery channel.png and b/gui/slick/images/network/discovery channel.png differ
diff --git a/gui/slick/images/network/discovery family.png b/gui/slick/images/network/discovery family.png
index 47a71b0..e013ec6 100644
Binary files a/gui/slick/images/network/discovery family.png and b/gui/slick/images/network/discovery family.png differ
diff --git a/gui/slick/images/network/discovery kids.png b/gui/slick/images/network/discovery kids.png
index fd85ebc..5e42d70 100644
Binary files a/gui/slick/images/network/discovery kids.png and b/gui/slick/images/network/discovery kids.png differ
diff --git a/gui/slick/images/network/discovery real time.png b/gui/slick/images/network/discovery real time.png
index 0874de1..59d3c9b 100644
Binary files a/gui/slick/images/network/discovery real time.png and b/gui/slick/images/network/discovery real time.png differ
diff --git a/gui/slick/images/network/discovery science.png b/gui/slick/images/network/discovery science.png
index 917e498..316786a 100644
Binary files a/gui/slick/images/network/discovery science.png and b/gui/slick/images/network/discovery science.png differ
diff --git a/gui/slick/images/network/discovery.png b/gui/slick/images/network/discovery.png
index 7baa530..8f09aef 100644
Binary files a/gui/slick/images/network/discovery.png and b/gui/slick/images/network/discovery.png differ
diff --git a/gui/slick/images/network/disney channel.png b/gui/slick/images/network/disney channel.png
index 2cf0c64..8d52275 100644
Binary files a/gui/slick/images/network/disney channel.png and b/gui/slick/images/network/disney channel.png differ
diff --git a/gui/slick/images/network/disney xd.png b/gui/slick/images/network/disney xd.png
index b29555e..0521518 100644
Binary files a/gui/slick/images/network/disney xd.png and b/gui/slick/images/network/disney xd.png differ
diff --git a/gui/slick/images/network/disney.png b/gui/slick/images/network/disney.png
index 2cf0c64..8d52275 100644
Binary files a/gui/slick/images/network/disney.png and b/gui/slick/images/network/disney.png differ
diff --git a/gui/slick/images/network/diy network.png b/gui/slick/images/network/diy network.png
index ce62e7b..c244034 100644
Binary files a/gui/slick/images/network/diy network.png and b/gui/slick/images/network/diy network.png differ
diff --git a/gui/slick/images/network/dmax.png b/gui/slick/images/network/dmax.png
index 0b3202a..0d21977 100644
Binary files a/gui/slick/images/network/dmax.png and b/gui/slick/images/network/dmax.png differ
diff --git a/gui/slick/images/network/dr1.png b/gui/slick/images/network/dr1.png
index 55b2d42..70bd61e 100644
Binary files a/gui/slick/images/network/dr1.png and b/gui/slick/images/network/dr1.png differ
diff --git a/gui/slick/images/network/dr2.png b/gui/slick/images/network/dr2.png
index 4459099..990b25e 100644
Binary files a/gui/slick/images/network/dr2.png and b/gui/slick/images/network/dr2.png differ
diff --git a/gui/slick/images/network/e!.png b/gui/slick/images/network/e!.png
index a6fa502..7491573 100644
Binary files a/gui/slick/images/network/e!.png and b/gui/slick/images/network/e!.png differ
diff --git a/gui/slick/images/network/e4.png b/gui/slick/images/network/e4.png
index 855742d..7a566c0 100644
Binary files a/gui/slick/images/network/e4.png and b/gui/slick/images/network/e4.png differ
diff --git a/gui/slick/images/network/een.png b/gui/slick/images/network/een.png
index 4716247..27a879d 100644
Binary files a/gui/slick/images/network/een.png and b/gui/slick/images/network/een.png differ
diff --git a/gui/slick/images/network/einslive.png b/gui/slick/images/network/einslive.png
index a1c2f72..283b668 100644
Binary files a/gui/slick/images/network/einslive.png and b/gui/slick/images/network/einslive.png differ
diff --git a/gui/slick/images/network/el rey network.png b/gui/slick/images/network/el rey network.png
index 3bd42b5..fa4d391 100644
Binary files a/gui/slick/images/network/el rey network.png and b/gui/slick/images/network/el rey network.png differ
diff --git a/gui/slick/images/network/endemol.png b/gui/slick/images/network/endemol.png
index 9d74bb3..5f9a32f 100644
Binary files a/gui/slick/images/network/endemol.png and b/gui/slick/images/network/endemol.png differ
diff --git a/gui/slick/images/network/entertainment.png b/gui/slick/images/network/entertainment.png
index a6fa502..7491573 100644
Binary files a/gui/slick/images/network/entertainment.png and b/gui/slick/images/network/entertainment.png differ
diff --git a/gui/slick/images/network/eredivisie live 1.png b/gui/slick/images/network/eredivisie live 1.png
index bdd83c3..45bfba9 100644
Binary files a/gui/slick/images/network/eredivisie live 1.png and b/gui/slick/images/network/eredivisie live 1.png differ
diff --git a/gui/slick/images/network/eredivisie live 2.png b/gui/slick/images/network/eredivisie live 2.png
index bdd83c3..45bfba9 100644
Binary files a/gui/slick/images/network/eredivisie live 2.png and b/gui/slick/images/network/eredivisie live 2.png differ
diff --git a/gui/slick/images/network/eredivisie live.png b/gui/slick/images/network/eredivisie live.png
index bdd83c3..45bfba9 100644
Binary files a/gui/slick/images/network/eredivisie live.png and b/gui/slick/images/network/eredivisie live.png differ
diff --git a/gui/slick/images/network/espn.png b/gui/slick/images/network/espn.png
index 5b570b5..520f43b 100644
Binary files a/gui/slick/images/network/espn.png and b/gui/slick/images/network/espn.png differ
diff --git a/gui/slick/images/network/esquire network.png b/gui/slick/images/network/esquire network.png
index ca99bdb..2becea0 100644
Binary files a/gui/slick/images/network/esquire network.png and b/gui/slick/images/network/esquire network.png differ
diff --git a/gui/slick/images/network/eurosport 1.png b/gui/slick/images/network/eurosport 1.png
index 66237df..b9032fa 100644
Binary files a/gui/slick/images/network/eurosport 1.png and b/gui/slick/images/network/eurosport 1.png differ
diff --git a/gui/slick/images/network/eurosport 2.png b/gui/slick/images/network/eurosport 2.png
index 66237df..b9032fa 100644
Binary files a/gui/slick/images/network/eurosport 2.png and b/gui/slick/images/network/eurosport 2.png differ
diff --git a/gui/slick/images/network/eurosport hd.png b/gui/slick/images/network/eurosport hd.png
index 66237df..b9032fa 100644
Binary files a/gui/slick/images/network/eurosport hd.png and b/gui/slick/images/network/eurosport hd.png differ
diff --git a/gui/slick/images/network/eurosport.png b/gui/slick/images/network/eurosport.png
index 66237df..b9032fa 100644
Binary files a/gui/slick/images/network/eurosport.png and b/gui/slick/images/network/eurosport.png differ
diff --git a/gui/slick/images/network/five us.png b/gui/slick/images/network/five us.png
index 4c2cb58..6fbe224 100644
Binary files a/gui/slick/images/network/five us.png and b/gui/slick/images/network/five us.png differ
diff --git a/gui/slick/images/network/five.png b/gui/slick/images/network/five.png
index 35d8596..f9f3452 100644
Binary files a/gui/slick/images/network/five.png and b/gui/slick/images/network/five.png differ
diff --git a/gui/slick/images/network/food network canada.png b/gui/slick/images/network/food network canada.png
index b25c1cf..b53e9e0 100644
Binary files a/gui/slick/images/network/food network canada.png and b/gui/slick/images/network/food network canada.png differ
diff --git a/gui/slick/images/network/food network.png b/gui/slick/images/network/food network.png
index fc086cc..d3fd1d1 100644
Binary files a/gui/slick/images/network/food network.png and b/gui/slick/images/network/food network.png differ
diff --git a/gui/slick/images/network/fox channel.png b/gui/slick/images/network/fox channel.png
index e2c595d..4c69c5f 100644
Binary files a/gui/slick/images/network/fox channel.png and b/gui/slick/images/network/fox channel.png differ
diff --git a/gui/slick/images/network/fox television classics.png b/gui/slick/images/network/fox television classics.png
index 74c854c..ccee5fa 100644
Binary files a/gui/slick/images/network/fox television classics.png and b/gui/slick/images/network/fox television classics.png differ
diff --git a/gui/slick/images/network/fox.png b/gui/slick/images/network/fox.png
index e1d5fa6..7686ebb 100644
Binary files a/gui/slick/images/network/fox.png and b/gui/slick/images/network/fox.png differ
diff --git a/gui/slick/images/network/france 2.png b/gui/slick/images/network/france 2.png
index 4f5578f..1524845 100644
Binary files a/gui/slick/images/network/france 2.png and b/gui/slick/images/network/france 2.png differ
diff --git a/gui/slick/images/network/france 3.png b/gui/slick/images/network/france 3.png
index abe4845..b7e1b30 100644
Binary files a/gui/slick/images/network/france 3.png and b/gui/slick/images/network/france 3.png differ
diff --git a/gui/slick/images/network/freeform.png b/gui/slick/images/network/freeform.png
index b20e416..7ea145a 100644
Binary files a/gui/slick/images/network/freeform.png and b/gui/slick/images/network/freeform.png differ
diff --git a/gui/slick/images/network/fuji tv.png b/gui/slick/images/network/fuji tv.png
index b71ea5e..dddfde8 100644
Binary files a/gui/slick/images/network/fuji tv.png and b/gui/slick/images/network/fuji tv.png differ
diff --git a/gui/slick/images/network/funimation.png b/gui/slick/images/network/funimation.png
index 8c64656..28b2b3a 100644
Binary files a/gui/slick/images/network/funimation.png and b/gui/slick/images/network/funimation.png differ
diff --git a/gui/slick/images/network/fx.png b/gui/slick/images/network/fx.png
index f39249e..cb7f10c 100644
Binary files a/gui/slick/images/network/fx.png and b/gui/slick/images/network/fx.png differ
diff --git a/gui/slick/images/network/fxx.png b/gui/slick/images/network/fxx.png
index c551e44..b48f6e9 100644
Binary files a/gui/slick/images/network/fxx.png and b/gui/slick/images/network/fxx.png differ
diff --git a/gui/slick/images/network/g4.png b/gui/slick/images/network/g4.png
index 2a142a2..9c295c1 100644
Binary files a/gui/slick/images/network/g4.png and b/gui/slick/images/network/g4.png differ
diff --git a/gui/slick/images/network/game show network.png b/gui/slick/images/network/game show network.png
index c4cf2bd..718fa26 100644
Binary files a/gui/slick/images/network/game show network.png and b/gui/slick/images/network/game show network.png differ
diff --git a/gui/slick/images/network/global tv.png b/gui/slick/images/network/global tv.png
index 0243305..2849aac 100644
Binary files a/gui/slick/images/network/global tv.png and b/gui/slick/images/network/global tv.png differ
diff --git a/gui/slick/images/network/global.png b/gui/slick/images/network/global.png
index 0243305..2849aac 100644
Binary files a/gui/slick/images/network/global.png and b/gui/slick/images/network/global.png differ
diff --git a/gui/slick/images/network/great american country.png b/gui/slick/images/network/great american country.png
index 57bb957..442522c 100644
Binary files a/gui/slick/images/network/great american country.png and b/gui/slick/images/network/great american country.png differ
diff --git a/gui/slick/images/network/hallmark channel.png b/gui/slick/images/network/hallmark channel.png
index 259e013..c13832d 100644
Binary files a/gui/slick/images/network/hallmark channel.png and b/gui/slick/images/network/hallmark channel.png differ
diff --git a/gui/slick/images/network/hbo canada.png b/gui/slick/images/network/hbo canada.png
index 0f5ddb1..75b00f5 100644
Binary files a/gui/slick/images/network/hbo canada.png and b/gui/slick/images/network/hbo canada.png differ
diff --git a/gui/slick/images/network/hbo.png b/gui/slick/images/network/hbo.png
index babf48d..f99f8ac 100644
Binary files a/gui/slick/images/network/hbo.png and b/gui/slick/images/network/hbo.png differ
diff --git a/gui/slick/images/network/hdnet.png b/gui/slick/images/network/hdnet.png
index 9629de8..12dc721 100644
Binary files a/gui/slick/images/network/hdnet.png and b/gui/slick/images/network/hdnet.png differ
diff --git a/gui/slick/images/network/hgtv canada.png b/gui/slick/images/network/hgtv canada.png
index 6cb5391..df9d6eb 100644
Binary files a/gui/slick/images/network/hgtv canada.png and b/gui/slick/images/network/hgtv canada.png differ
diff --git a/gui/slick/images/network/hgtv.png b/gui/slick/images/network/hgtv.png
index a5b8135..c184a9d 100644
Binary files a/gui/slick/images/network/hgtv.png and b/gui/slick/images/network/hgtv.png differ
diff --git a/gui/slick/images/network/history.png b/gui/slick/images/network/history.png
index 4a2c202..66772c3 100644
Binary files a/gui/slick/images/network/history.png and b/gui/slick/images/network/history.png differ
diff --git a/gui/slick/images/network/historychannel.png b/gui/slick/images/network/historychannel.png
index 92c1669..e89c93f 100644
Binary files a/gui/slick/images/network/historychannel.png and b/gui/slick/images/network/historychannel.png differ
diff --git a/gui/slick/images/network/hulu presents.png b/gui/slick/images/network/hulu presents.png
index 7397994..bbec7ce 100644
Binary files a/gui/slick/images/network/hulu presents.png and b/gui/slick/images/network/hulu presents.png differ
diff --git a/gui/slick/images/network/hulu.png b/gui/slick/images/network/hulu.png
index 7397994..bbec7ce 100644
Binary files a/gui/slick/images/network/hulu.png and b/gui/slick/images/network/hulu.png differ
diff --git a/gui/slick/images/network/ifc.png b/gui/slick/images/network/ifc.png
index fe4c59c..9f828b0 100644
Binary files a/gui/slick/images/network/ifc.png and b/gui/slick/images/network/ifc.png differ
diff --git a/gui/slick/images/network/investigation discovery.png b/gui/slick/images/network/investigation discovery.png
index d88931e..ab8aab9 100644
Binary files a/gui/slick/images/network/investigation discovery.png and b/gui/slick/images/network/investigation discovery.png differ
diff --git a/gui/slick/images/network/ion television.png b/gui/slick/images/network/ion television.png
index 21a2487..2cc1b5a 100644
Binary files a/gui/slick/images/network/ion television.png and b/gui/slick/images/network/ion television.png differ
diff --git a/gui/slick/images/network/itv.png b/gui/slick/images/network/itv.png
index 75d3eb2..f4e6aa5 100644
Binary files a/gui/slick/images/network/itv.png and b/gui/slick/images/network/itv.png differ
diff --git a/gui/slick/images/network/itv1.png b/gui/slick/images/network/itv1.png
index 75d3eb2..f4e6aa5 100644
Binary files a/gui/slick/images/network/itv1.png and b/gui/slick/images/network/itv1.png differ
diff --git a/gui/slick/images/network/itv2.png b/gui/slick/images/network/itv2.png
index 3473c0f..d68da89 100644
Binary files a/gui/slick/images/network/itv2.png and b/gui/slick/images/network/itv2.png differ
diff --git a/gui/slick/images/network/itv3.png b/gui/slick/images/network/itv3.png
index 059d418..7b35afd 100644
Binary files a/gui/slick/images/network/itv3.png and b/gui/slick/images/network/itv3.png differ
diff --git a/gui/slick/images/network/itv4.png b/gui/slick/images/network/itv4.png
index 72ce018..d7177ac 100644
Binary files a/gui/slick/images/network/itv4.png and b/gui/slick/images/network/itv4.png differ
diff --git a/gui/slick/images/network/ketnet.png b/gui/slick/images/network/ketnet.png
index 63b0568..6e43abf 100644
Binary files a/gui/slick/images/network/ketnet.png and b/gui/slick/images/network/ketnet.png differ
diff --git a/gui/slick/images/network/kro.png b/gui/slick/images/network/kro.png
index 2878f6f..ac48976 100644
Binary files a/gui/slick/images/network/kro.png and b/gui/slick/images/network/kro.png differ
diff --git a/gui/slick/images/network/la1.png b/gui/slick/images/network/la1.png
index f7e3fa6..55c3664 100644
Binary files a/gui/slick/images/network/la1.png and b/gui/slick/images/network/la1.png differ
diff --git a/gui/slick/images/network/la2.png b/gui/slick/images/network/la2.png
index de91dc0..7b06d01 100644
Binary files a/gui/slick/images/network/la2.png and b/gui/slick/images/network/la2.png differ
diff --git a/gui/slick/images/network/lasexta.png b/gui/slick/images/network/lasexta.png
index 935501b..e9f2b7a 100644
Binary files a/gui/slick/images/network/lasexta.png and b/gui/slick/images/network/lasexta.png differ
diff --git a/gui/slick/images/network/lifetime.png b/gui/slick/images/network/lifetime.png
index 9e44b93..9e89dd9 100644
Binary files a/gui/slick/images/network/lifetime.png and b/gui/slick/images/network/lifetime.png differ
diff --git a/gui/slick/images/network/living.png b/gui/slick/images/network/living.png
index 6a69660..ee35831 100644
Binary files a/gui/slick/images/network/living.png and b/gui/slick/images/network/living.png differ
diff --git a/gui/slick/images/network/lmn.png b/gui/slick/images/network/lmn.png
index de6fcbb..bcfd455 100644
Binary files a/gui/slick/images/network/lmn.png and b/gui/slick/images/network/lmn.png differ
diff --git a/gui/slick/images/network/m6.png b/gui/slick/images/network/m6.png
index d65bc34..6781437 100644
Binary files a/gui/slick/images/network/m6.png and b/gui/slick/images/network/m6.png differ
diff --git a/gui/slick/images/network/manhattan neighborhood network.png b/gui/slick/images/network/manhattan neighborhood network.png
index bdf7df9..f784d29 100644
Binary files a/gui/slick/images/network/manhattan neighborhood network.png and b/gui/slick/images/network/manhattan neighborhood network.png differ
diff --git a/gui/slick/images/network/mbs.png b/gui/slick/images/network/mbs.png
index 44176e1..f4bced4 100644
Binary files a/gui/slick/images/network/mbs.png and b/gui/slick/images/network/mbs.png differ
diff --git a/gui/slick/images/network/mdr.png b/gui/slick/images/network/mdr.png
index a7f8b78..3428253 100644
Binary files a/gui/slick/images/network/mdr.png and b/gui/slick/images/network/mdr.png differ
diff --git a/gui/slick/images/network/motorvision tv.png b/gui/slick/images/network/motorvision tv.png
index 26b542c..f72ab44 100644
Binary files a/gui/slick/images/network/motorvision tv.png and b/gui/slick/images/network/motorvision tv.png differ
diff --git a/gui/slick/images/network/motorvision.png b/gui/slick/images/network/motorvision.png
index 820675d..7e68a4e 100644
Binary files a/gui/slick/images/network/motorvision.png and b/gui/slick/images/network/motorvision.png differ
diff --git a/gui/slick/images/network/mtv.png b/gui/slick/images/network/mtv.png
index 38ba5e3..c88d1ae 100644
Binary files a/gui/slick/images/network/mtv.png and b/gui/slick/images/network/mtv.png differ
diff --git a/gui/slick/images/network/mtv2.png b/gui/slick/images/network/mtv2.png
index b1790f6..c452aee 100644
Binary files a/gui/slick/images/network/mtv2.png and b/gui/slick/images/network/mtv2.png differ
diff --git a/gui/slick/images/network/much.png b/gui/slick/images/network/much.png
index 00faf9f..1de5911 100644
Binary files a/gui/slick/images/network/much.png and b/gui/slick/images/network/much.png differ
diff --git a/gui/slick/images/network/nat geo wild.png b/gui/slick/images/network/nat geo wild.png
index f75ff2a..29d7ed3 100644
Binary files a/gui/slick/images/network/nat geo wild.png and b/gui/slick/images/network/nat geo wild.png differ
diff --git a/gui/slick/images/network/national geographic.png b/gui/slick/images/network/national geographic.png
index cb6457e..eff7d5b 100644
Binary files a/gui/slick/images/network/national geographic.png and b/gui/slick/images/network/national geographic.png differ
diff --git a/gui/slick/images/network/nbc.png b/gui/slick/images/network/nbc.png
index f454dde..2858d50 100644
Binary files a/gui/slick/images/network/nbc.png and b/gui/slick/images/network/nbc.png differ
diff --git a/gui/slick/images/network/nbcu tv.png b/gui/slick/images/network/nbcu tv.png
index f454dde..2858d50 100644
Binary files a/gui/slick/images/network/nbcu tv.png and b/gui/slick/images/network/nbcu tv.png differ
diff --git a/gui/slick/images/network/ndr.png b/gui/slick/images/network/ndr.png
index 45c28eb..13e43f2 100644
Binary files a/gui/slick/images/network/ndr.png and b/gui/slick/images/network/ndr.png differ
diff --git a/gui/slick/images/network/nederland 1.png b/gui/slick/images/network/nederland 1.png
index 8a277ea..a6a0376 100644
Binary files a/gui/slick/images/network/nederland 1.png and b/gui/slick/images/network/nederland 1.png differ
diff --git a/gui/slick/images/network/nederland 2.png b/gui/slick/images/network/nederland 2.png
index e9194d5..e9c3c70 100644
Binary files a/gui/slick/images/network/nederland 2.png and b/gui/slick/images/network/nederland 2.png differ
diff --git a/gui/slick/images/network/nederland 3.png b/gui/slick/images/network/nederland 3.png
index 6b7646e..f63520c 100644
Binary files a/gui/slick/images/network/nederland 3.png and b/gui/slick/images/network/nederland 3.png differ
diff --git a/gui/slick/images/network/net 5.png b/gui/slick/images/network/net 5.png
index b75e70e..f3101fe 100644
Binary files a/gui/slick/images/network/net 5.png and b/gui/slick/images/network/net 5.png differ
diff --git a/gui/slick/images/network/net5.png b/gui/slick/images/network/net5.png
index b75e70e..f3101fe 100644
Binary files a/gui/slick/images/network/net5.png and b/gui/slick/images/network/net5.png differ
diff --git a/gui/slick/images/network/netflix.png b/gui/slick/images/network/netflix.png
index 598d87c..1dd1812 100644
Binary files a/gui/slick/images/network/netflix.png and b/gui/slick/images/network/netflix.png differ
diff --git a/gui/slick/images/network/network ten.png b/gui/slick/images/network/network ten.png
index 6a39b6c..0c03197 100644
Binary files a/gui/slick/images/network/network ten.png and b/gui/slick/images/network/network ten.png differ
diff --git a/gui/slick/images/network/ngc.png b/gui/slick/images/network/ngc.png
index cb6457e..eff7d5b 100644
Binary files a/gui/slick/images/network/ngc.png and b/gui/slick/images/network/ngc.png differ
diff --git a/gui/slick/images/network/nhk.png b/gui/slick/images/network/nhk.png
index a012435..42ad943 100644
Binary files a/gui/slick/images/network/nhk.png and b/gui/slick/images/network/nhk.png differ
diff --git a/gui/slick/images/network/nick at nite.png b/gui/slick/images/network/nick at nite.png
index 1458149..7d84e29 100644
Binary files a/gui/slick/images/network/nick at nite.png and b/gui/slick/images/network/nick at nite.png differ
diff --git a/gui/slick/images/network/nick jr..png b/gui/slick/images/network/nick jr..png
index 567a5ae..f0ef765 100644
Binary files a/gui/slick/images/network/nick jr..png and b/gui/slick/images/network/nick jr..png differ
diff --git a/gui/slick/images/network/nickelodeon.png b/gui/slick/images/network/nickelodeon.png
index 43ca2b1..dac6bbf 100644
Binary files a/gui/slick/images/network/nickelodeon.png and b/gui/slick/images/network/nickelodeon.png differ
diff --git a/gui/slick/images/network/nicktoons network.png b/gui/slick/images/network/nicktoons network.png
index 43ca2b1..dac6bbf 100644
Binary files a/gui/slick/images/network/nicktoons network.png and b/gui/slick/images/network/nicktoons network.png differ
diff --git a/gui/slick/images/network/niconico.png b/gui/slick/images/network/niconico.png
index d0fff95..278cda2 100644
Binary files a/gui/slick/images/network/niconico.png and b/gui/slick/images/network/niconico.png differ
diff --git a/gui/slick/images/network/nine network.png b/gui/slick/images/network/nine network.png
index 6482bdd..b2b162c 100644
Binary files a/gui/slick/images/network/nine network.png and b/gui/slick/images/network/nine network.png differ
diff --git a/gui/slick/images/network/nonetwork.png b/gui/slick/images/network/nonetwork.png
index 15702ff..3ff1f9c 100644
Binary files a/gui/slick/images/network/nonetwork.png and b/gui/slick/images/network/nonetwork.png differ
diff --git a/gui/slick/images/network/nrk1.png b/gui/slick/images/network/nrk1.png
index a229a7b..c37c3a0 100644
Binary files a/gui/slick/images/network/nrk1.png and b/gui/slick/images/network/nrk1.png differ
diff --git a/gui/slick/images/network/ntv.png b/gui/slick/images/network/ntv.png
index 21817b5..8b61aad 100644
Binary files a/gui/slick/images/network/ntv.png and b/gui/slick/images/network/ntv.png differ
diff --git a/gui/slick/images/network/omroep max.png b/gui/slick/images/network/omroep max.png
index cd66e69..7500587 100644
Binary files a/gui/slick/images/network/omroep max.png and b/gui/slick/images/network/omroep max.png differ
diff --git a/gui/slick/images/network/orf.png b/gui/slick/images/network/orf.png
index f78a904..b934675 100644
Binary files a/gui/slick/images/network/orf.png and b/gui/slick/images/network/orf.png differ
diff --git a/gui/slick/images/network/orf1 hd.png b/gui/slick/images/network/orf1 hd.png
index f78a904..b934675 100644
Binary files a/gui/slick/images/network/orf1 hd.png and b/gui/slick/images/network/orf1 hd.png differ
diff --git a/gui/slick/images/network/oxygen.png b/gui/slick/images/network/oxygen.png
index f600ac0..fe351ea 100644
Binary files a/gui/slick/images/network/oxygen.png and b/gui/slick/images/network/oxygen.png differ
diff --git a/gui/slick/images/network/paramount network.png b/gui/slick/images/network/paramount network.png
index edba8d2..03ee712 100644
Binary files a/gui/slick/images/network/paramount network.png and b/gui/slick/images/network/paramount network.png differ
diff --git a/gui/slick/images/network/pay-per-view.png b/gui/slick/images/network/pay-per-view.png
index 93de9d2..ad447b0 100644
Binary files a/gui/slick/images/network/pay-per-view.png and b/gui/slick/images/network/pay-per-view.png differ
diff --git a/gui/slick/images/network/pbs.png b/gui/slick/images/network/pbs.png
index b1230f9..334fb93 100644
Binary files a/gui/slick/images/network/pbs.png and b/gui/slick/images/network/pbs.png differ
diff --git a/gui/slick/images/network/playboy tv.png b/gui/slick/images/network/playboy tv.png
index b500065..e74381d 100644
Binary files a/gui/slick/images/network/playboy tv.png and b/gui/slick/images/network/playboy tv.png differ
diff --git a/gui/slick/images/network/playstation network.png b/gui/slick/images/network/playstation network.png
index 699a787..2ba2650 100644
Binary files a/gui/slick/images/network/playstation network.png and b/gui/slick/images/network/playstation network.png differ
diff --git a/gui/slick/images/network/prime.png b/gui/slick/images/network/prime.png
index 474f6f6..0a50d78 100644
Binary files a/gui/slick/images/network/prime.png and b/gui/slick/images/network/prime.png differ
diff --git a/gui/slick/images/network/private spice.png b/gui/slick/images/network/private spice.png
index fca0f74..4587cd8 100644
Binary files a/gui/slick/images/network/private spice.png and b/gui/slick/images/network/private spice.png differ
diff --git a/gui/slick/images/network/pro7.png b/gui/slick/images/network/pro7.png
index 921abcf..837b381 100644
Binary files a/gui/slick/images/network/pro7.png and b/gui/slick/images/network/pro7.png differ
diff --git a/gui/slick/images/network/production i.g.png b/gui/slick/images/network/production i.g.png
index 6a2e587..220010e 100644
Binary files a/gui/slick/images/network/production i.g.png and b/gui/slick/images/network/production i.g.png differ
diff --git a/gui/slick/images/network/radio west.png b/gui/slick/images/network/radio west.png
index 0799a7d..fbf0aee 100644
Binary files a/gui/slick/images/network/radio west.png and b/gui/slick/images/network/radio west.png differ
diff --git a/gui/slick/images/network/reelzchannel.png b/gui/slick/images/network/reelzchannel.png
index 7c0d4a2..9a24596 100644
Binary files a/gui/slick/images/network/reelzchannel.png and b/gui/slick/images/network/reelzchannel.png differ
diff --git a/gui/slick/images/network/revision3.png b/gui/slick/images/network/revision3.png
index c6cb319..7495a07 100644
Binary files a/gui/slick/images/network/revision3.png and b/gui/slick/images/network/revision3.png differ
diff --git a/gui/slick/images/network/rooster teeth.png b/gui/slick/images/network/rooster teeth.png
index 3bfa5a5..149c19b 100644
Binary files a/gui/slick/images/network/rooster teeth.png and b/gui/slick/images/network/rooster teeth.png differ
diff --git a/gui/slick/images/network/rte one.png b/gui/slick/images/network/rte one.png
index 9cc103b..59af483 100644
Binary files a/gui/slick/images/network/rte one.png and b/gui/slick/images/network/rte one.png differ
diff --git a/gui/slick/images/network/rtl 4.png b/gui/slick/images/network/rtl 4.png
index 1d24d46..139be69 100644
Binary files a/gui/slick/images/network/rtl 4.png and b/gui/slick/images/network/rtl 4.png differ
diff --git a/gui/slick/images/network/rtl 5.png b/gui/slick/images/network/rtl 5.png
index c470121..c58b609 100644
Binary files a/gui/slick/images/network/rtl 5.png and b/gui/slick/images/network/rtl 5.png differ
diff --git a/gui/slick/images/network/rtl 7.png b/gui/slick/images/network/rtl 7.png
index 1220baf..0e418a8 100644
Binary files a/gui/slick/images/network/rtl 7.png and b/gui/slick/images/network/rtl 7.png differ
diff --git a/gui/slick/images/network/rtl 8.png b/gui/slick/images/network/rtl 8.png
index 7c080c4..bbf4172 100644
Binary files a/gui/slick/images/network/rtl 8.png and b/gui/slick/images/network/rtl 8.png differ
diff --git a/gui/slick/images/network/rtl television.png b/gui/slick/images/network/rtl television.png
index a616c76..5ca2bec 100644
Binary files a/gui/slick/images/network/rtl television.png and b/gui/slick/images/network/rtl television.png differ
diff --git a/gui/slick/images/network/rtl4.png b/gui/slick/images/network/rtl4.png
index 1d24d46..139be69 100644
Binary files a/gui/slick/images/network/rtl4.png and b/gui/slick/images/network/rtl4.png differ
diff --git a/gui/slick/images/network/rtl5.png b/gui/slick/images/network/rtl5.png
index c470121..c58b609 100644
Binary files a/gui/slick/images/network/rtl5.png and b/gui/slick/images/network/rtl5.png differ
diff --git a/gui/slick/images/network/rtl7.png b/gui/slick/images/network/rtl7.png
index 1220baf..0e418a8 100644
Binary files a/gui/slick/images/network/rtl7.png and b/gui/slick/images/network/rtl7.png differ
diff --git a/gui/slick/images/network/rtl8.png b/gui/slick/images/network/rtl8.png
index 7c080c4..bbf4172 100644
Binary files a/gui/slick/images/network/rtl8.png and b/gui/slick/images/network/rtl8.png differ
diff --git a/gui/slick/images/network/sat1.png b/gui/slick/images/network/sat1.png
index 7c0a2dd..2694360 100644
Binary files a/gui/slick/images/network/sat1.png and b/gui/slick/images/network/sat1.png differ
diff --git a/gui/slick/images/network/sbs 6.png b/gui/slick/images/network/sbs 6.png
index 518de46..0c60a5c 100644
Binary files a/gui/slick/images/network/sbs 6.png and b/gui/slick/images/network/sbs 6.png differ
diff --git a/gui/slick/images/network/sbs australia.png b/gui/slick/images/network/sbs australia.png
index 0dba1d0..05b8e8c 100644
Binary files a/gui/slick/images/network/sbs australia.png and b/gui/slick/images/network/sbs australia.png differ
diff --git a/gui/slick/images/network/sbs.png b/gui/slick/images/network/sbs.png
index 0dba1d0..05b8e8c 100644
Binary files a/gui/slick/images/network/sbs.png and b/gui/slick/images/network/sbs.png differ
diff --git a/gui/slick/images/network/sbs6.png b/gui/slick/images/network/sbs6.png
index 518de46..0c60a5c 100644
Binary files a/gui/slick/images/network/sbs6.png and b/gui/slick/images/network/sbs6.png differ
diff --git a/gui/slick/images/network/science channel.png b/gui/slick/images/network/science channel.png
index 917e498..316786a 100644
Binary files a/gui/slick/images/network/science channel.png and b/gui/slick/images/network/science channel.png differ
diff --git a/gui/slick/images/network/scifi.png b/gui/slick/images/network/scifi.png
index 665c4e6..098bac5 100644
Binary files a/gui/slick/images/network/scifi.png and b/gui/slick/images/network/scifi.png differ
diff --git a/gui/slick/images/network/seven network.png b/gui/slick/images/network/seven network.png
index eaeb27b..9e598cf 100644
Binary files a/gui/slick/images/network/seven network.png and b/gui/slick/images/network/seven network.png differ
diff --git a/gui/slick/images/network/showcase.png b/gui/slick/images/network/showcase.png
index 852eea5..2ac9b07 100644
Binary files a/gui/slick/images/network/showcase.png and b/gui/slick/images/network/showcase.png differ
diff --git a/gui/slick/images/network/showtime.png b/gui/slick/images/network/showtime.png
index 5173f03..35320b0 100644
Binary files a/gui/slick/images/network/showtime.png and b/gui/slick/images/network/showtime.png differ
diff --git a/gui/slick/images/network/sky arts.png b/gui/slick/images/network/sky arts.png
index 68fbdff..445dccf 100644
Binary files a/gui/slick/images/network/sky arts.png and b/gui/slick/images/network/sky arts.png differ
diff --git a/gui/slick/images/network/sky atlantic.png b/gui/slick/images/network/sky atlantic.png
index 8417a16..95cbe3b 100644
Binary files a/gui/slick/images/network/sky atlantic.png and b/gui/slick/images/network/sky atlantic.png differ
diff --git a/gui/slick/images/network/sky living.png b/gui/slick/images/network/sky living.png
index 6a69660..ee35831 100644
Binary files a/gui/slick/images/network/sky living.png and b/gui/slick/images/network/sky living.png differ
diff --git a/gui/slick/images/network/sky sports.png b/gui/slick/images/network/sky sports.png
index 588e32a..989b82f 100644
Binary files a/gui/slick/images/network/sky sports.png and b/gui/slick/images/network/sky sports.png differ
diff --git a/gui/slick/images/network/sky.png b/gui/slick/images/network/sky.png
index 5076f68..6c05067 100644
Binary files a/gui/slick/images/network/sky.png and b/gui/slick/images/network/sky.png differ
diff --git a/gui/slick/images/network/sky1.png b/gui/slick/images/network/sky1.png
index e46522b..4e85041 100644
Binary files a/gui/slick/images/network/sky1.png and b/gui/slick/images/network/sky1.png differ
diff --git a/gui/slick/images/network/smithsonian channel.png b/gui/slick/images/network/smithsonian channel.png
index 5fc63e1..8e07ee1 100644
Binary files a/gui/slick/images/network/smithsonian channel.png and b/gui/slick/images/network/smithsonian channel.png differ
diff --git a/gui/slick/images/network/space.png b/gui/slick/images/network/space.png
index c03106c..6fc08ee 100644
Binary files a/gui/slick/images/network/space.png and b/gui/slick/images/network/space.png differ
diff --git a/gui/slick/images/network/speed channel.png b/gui/slick/images/network/speed channel.png
index 4a62673..8bca48e 100644
Binary files a/gui/slick/images/network/speed channel.png and b/gui/slick/images/network/speed channel.png differ
diff --git a/gui/slick/images/network/spike tv.png b/gui/slick/images/network/spike tv.png
index 52aa064..26a2eec 100644
Binary files a/gui/slick/images/network/spike tv.png and b/gui/slick/images/network/spike tv.png differ
diff --git a/gui/slick/images/network/stan.png b/gui/slick/images/network/stan.png
index b9b2e0a..99b3338 100644
Binary files a/gui/slick/images/network/stan.png and b/gui/slick/images/network/stan.png differ
diff --git a/gui/slick/images/network/starz!.png b/gui/slick/images/network/starz!.png
index a3948b7..00ec57c 100644
Binary files a/gui/slick/images/network/starz!.png and b/gui/slick/images/network/starz!.png differ
diff --git a/gui/slick/images/network/starz.png b/gui/slick/images/network/starz.png
index a3948b7..00ec57c 100644
Binary files a/gui/slick/images/network/starz.png and b/gui/slick/images/network/starz.png differ
diff --git a/gui/slick/images/network/stv.png b/gui/slick/images/network/stv.png
index 6b59979..f617e7a 100644
Binary files a/gui/slick/images/network/stv.png and b/gui/slick/images/network/stv.png differ
diff --git a/gui/slick/images/network/style network.png b/gui/slick/images/network/style network.png
index 5c8436a..a6b8f73 100644
Binary files a/gui/slick/images/network/style network.png and b/gui/slick/images/network/style network.png differ
diff --git a/gui/slick/images/network/sundance.png b/gui/slick/images/network/sundance.png
index 13e068e..619ccf2 100644
Binary files a/gui/slick/images/network/sundance.png and b/gui/slick/images/network/sundance.png differ
diff --git a/gui/slick/images/network/sundancetv.png b/gui/slick/images/network/sundancetv.png
index 13e068e..619ccf2 100644
Binary files a/gui/slick/images/network/sundancetv.png and b/gui/slick/images/network/sundancetv.png differ
diff --git a/gui/slick/images/network/sunrise.png b/gui/slick/images/network/sunrise.png
index d919e3e..abf9520 100644
Binary files a/gui/slick/images/network/sunrise.png and b/gui/slick/images/network/sunrise.png differ
diff --git a/gui/slick/images/network/super channel.png b/gui/slick/images/network/super channel.png
index c690471..a00ec4b 100644
Binary files a/gui/slick/images/network/super channel.png and b/gui/slick/images/network/super channel.png differ
diff --git a/gui/slick/images/network/svt.png b/gui/slick/images/network/svt.png
index fb2679b..99fb84f 100644
Binary files a/gui/slick/images/network/svt.png and b/gui/slick/images/network/svt.png differ
diff --git a/gui/slick/images/network/syfy.png b/gui/slick/images/network/syfy.png
index fd5ce1d..ee0a6bc 100644
Binary files a/gui/slick/images/network/syfy.png and b/gui/slick/images/network/syfy.png differ
diff --git a/gui/slick/images/network/syndicated.png b/gui/slick/images/network/syndicated.png
index 755a176..f5e997e 100644
Binary files a/gui/slick/images/network/syndicated.png and b/gui/slick/images/network/syndicated.png differ
diff --git a/gui/slick/images/network/tbs superstation.png b/gui/slick/images/network/tbs superstation.png
index 77643e0..61dbed7 100644
Binary files a/gui/slick/images/network/tbs superstation.png and b/gui/slick/images/network/tbs superstation.png differ
diff --git a/gui/slick/images/network/tbs.png b/gui/slick/images/network/tbs.png
index 77643e0..61dbed7 100644
Binary files a/gui/slick/images/network/tbs.png and b/gui/slick/images/network/tbs.png differ
diff --git a/gui/slick/images/network/teennick.png b/gui/slick/images/network/teennick.png
index 1732f89..58e6ff8 100644
Binary files a/gui/slick/images/network/teennick.png and b/gui/slick/images/network/teennick.png differ
diff --git a/gui/slick/images/network/telecinco.png b/gui/slick/images/network/telecinco.png
index 0b13d15..aae8356 100644
Binary files a/gui/slick/images/network/telecinco.png and b/gui/slick/images/network/telecinco.png differ
diff --git a/gui/slick/images/network/teletoon.png b/gui/slick/images/network/teletoon.png
index 1cc5c57..741d95d 100644
Binary files a/gui/slick/images/network/teletoon.png and b/gui/slick/images/network/teletoon.png differ
diff --git a/gui/slick/images/network/tf1.png b/gui/slick/images/network/tf1.png
index 79a98d6..c165203 100644
Binary files a/gui/slick/images/network/tf1.png and b/gui/slick/images/network/tf1.png differ
diff --git a/gui/slick/images/network/the anime network.png b/gui/slick/images/network/the anime network.png
index 1e2df23..caf8ce2 100644
Binary files a/gui/slick/images/network/the anime network.png and b/gui/slick/images/network/the anime network.png differ
diff --git a/gui/slick/images/network/the cw.png b/gui/slick/images/network/the cw.png
index 1c7fd52..70ad363 100644
Binary files a/gui/slick/images/network/the cw.png and b/gui/slick/images/network/the cw.png differ
diff --git a/gui/slick/images/network/the discovery channel.png b/gui/slick/images/network/the discovery channel.png
index 7baa530..8f09aef 100644
Binary files a/gui/slick/images/network/the discovery channel.png and b/gui/slick/images/network/the discovery channel.png differ
diff --git a/gui/slick/images/network/the hub.png b/gui/slick/images/network/the hub.png
index f30e88e..e428bc4 100644
Binary files a/gui/slick/images/network/the hub.png and b/gui/slick/images/network/the hub.png differ
diff --git a/gui/slick/images/network/the movie network.png b/gui/slick/images/network/the movie network.png
index 2fb21a1..26474d7 100644
Binary files a/gui/slick/images/network/the movie network.png and b/gui/slick/images/network/the movie network.png differ
diff --git a/gui/slick/images/network/the science channel.png b/gui/slick/images/network/the science channel.png
index 917e498..316786a 100644
Binary files a/gui/slick/images/network/the science channel.png and b/gui/slick/images/network/the science channel.png differ
diff --git a/gui/slick/images/network/the wb.png b/gui/slick/images/network/the wb.png
index 2dabe32..eed11cd 100644
Binary files a/gui/slick/images/network/the wb.png and b/gui/slick/images/network/the wb.png differ
diff --git a/gui/slick/images/network/tlc.png b/gui/slick/images/network/tlc.png
index 9d2c1b8..fb765d0 100644
Binary files a/gui/slick/images/network/tlc.png and b/gui/slick/images/network/tlc.png differ
diff --git a/gui/slick/images/network/tmf.png b/gui/slick/images/network/tmf.png
index 43170d5..ffec1dd 100644
Binary files a/gui/slick/images/network/tmf.png and b/gui/slick/images/network/tmf.png differ
diff --git a/gui/slick/images/network/tnt.png b/gui/slick/images/network/tnt.png
index 28dedb2..ffb4652 100644
Binary files a/gui/slick/images/network/tnt.png and b/gui/slick/images/network/tnt.png differ
diff --git a/gui/slick/images/network/toei animation.png b/gui/slick/images/network/toei animation.png
index 4453fe3..bb3dbaa 100644
Binary files a/gui/slick/images/network/toei animation.png and b/gui/slick/images/network/toei animation.png differ
diff --git a/gui/slick/images/network/tokyo broadcasting system.png b/gui/slick/images/network/tokyo broadcasting system.png
index c88b4f4..e3babdd 100644
Binary files a/gui/slick/images/network/tokyo broadcasting system.png and b/gui/slick/images/network/tokyo broadcasting system.png differ
diff --git a/gui/slick/images/network/tokyo mx.png b/gui/slick/images/network/tokyo mx.png
index 64087cb..d0b51af 100644
Binary files a/gui/slick/images/network/tokyo mx.png and b/gui/slick/images/network/tokyo mx.png differ
diff --git a/gui/slick/images/network/toon disney.png b/gui/slick/images/network/toon disney.png
index 10f284c..4f486a9 100644
Binary files a/gui/slick/images/network/toon disney.png and b/gui/slick/images/network/toon disney.png differ
diff --git a/gui/slick/images/network/travel channel.png b/gui/slick/images/network/travel channel.png
index 37ab809..ae6caf0 100644
Binary files a/gui/slick/images/network/travel channel.png and b/gui/slick/images/network/travel channel.png differ
diff --git a/gui/slick/images/network/tros.png b/gui/slick/images/network/tros.png
index 1b8d82a..b8f825f 100644
Binary files a/gui/slick/images/network/tros.png and b/gui/slick/images/network/tros.png differ
diff --git a/gui/slick/images/network/trutv.png b/gui/slick/images/network/trutv.png
index f2c22ec..f190ed8 100644
Binary files a/gui/slick/images/network/trutv.png and b/gui/slick/images/network/trutv.png differ
diff --git a/gui/slick/images/network/tv 2.png b/gui/slick/images/network/tv 2.png
index 5eda16f..264b0cf 100644
Binary files a/gui/slick/images/network/tv 2.png and b/gui/slick/images/network/tv 2.png differ
diff --git a/gui/slick/images/network/tv asahi.png b/gui/slick/images/network/tv asahi.png
index 20e3447..6b22e5a 100644
Binary files a/gui/slick/images/network/tv asahi.png and b/gui/slick/images/network/tv asahi.png differ
diff --git a/gui/slick/images/network/tv guide.png b/gui/slick/images/network/tv guide.png
index f1ffd13..df62884 100644
Binary files a/gui/slick/images/network/tv guide.png and b/gui/slick/images/network/tv guide.png differ
diff --git a/gui/slick/images/network/tv land.png b/gui/slick/images/network/tv land.png
index e9f097c..c6f98bb 100644
Binary files a/gui/slick/images/network/tv land.png and b/gui/slick/images/network/tv land.png differ
diff --git a/gui/slick/images/network/tv saitama.png b/gui/slick/images/network/tv saitama.png
index 5cd1eef..23b10bf 100644
Binary files a/gui/slick/images/network/tv saitama.png and b/gui/slick/images/network/tv saitama.png differ
diff --git a/gui/slick/images/network/tv tokyo.png b/gui/slick/images/network/tv tokyo.png
index 7bc9f7a..f550b15 100644
Binary files a/gui/slick/images/network/tv tokyo.png and b/gui/slick/images/network/tv tokyo.png differ
diff --git a/gui/slick/images/network/tv west.png b/gui/slick/images/network/tv west.png
index 0799a7d..fbf0aee 100644
Binary files a/gui/slick/images/network/tv west.png and b/gui/slick/images/network/tv west.png differ
diff --git a/gui/slick/images/network/tv2.png b/gui/slick/images/network/tv2.png
index 5eda16f..264b0cf 100644
Binary files a/gui/slick/images/network/tv2.png and b/gui/slick/images/network/tv2.png differ
diff --git a/gui/slick/images/network/tv3.png b/gui/slick/images/network/tv3.png
index 451f5da..eb8b7ac 100644
Binary files a/gui/slick/images/network/tv3.png and b/gui/slick/images/network/tv3.png differ
diff --git a/gui/slick/images/network/tv7.png b/gui/slick/images/network/tv7.png
index 7992fae..6ceb1df 100644
Binary files a/gui/slick/images/network/tv7.png and b/gui/slick/images/network/tv7.png differ
diff --git a/gui/slick/images/network/tve.png b/gui/slick/images/network/tve.png
index f7e3fa6..55c3664 100644
Binary files a/gui/slick/images/network/tve.png and b/gui/slick/images/network/tve.png differ
diff --git a/gui/slick/images/network/tve1.png b/gui/slick/images/network/tve1.png
index f7e3fa6..55c3664 100644
Binary files a/gui/slick/images/network/tve1.png and b/gui/slick/images/network/tve1.png differ
diff --git a/gui/slick/images/network/tve2.png b/gui/slick/images/network/tve2.png
index a016440..7b06d01 100644
Binary files a/gui/slick/images/network/tve2.png and b/gui/slick/images/network/tve2.png differ
diff --git a/gui/slick/images/network/tvnz.png b/gui/slick/images/network/tvnz.png
index 8f2d203..f92a589 100644
Binary files a/gui/slick/images/network/tvnz.png and b/gui/slick/images/network/tvnz.png differ
diff --git a/gui/slick/images/network/upn.png b/gui/slick/images/network/upn.png
index 743a5f5..bbceacd 100644
Binary files a/gui/slick/images/network/upn.png and b/gui/slick/images/network/upn.png differ
diff --git a/gui/slick/images/network/usa network.png b/gui/slick/images/network/usa network.png
index 3bd2d9e..d6aa4d0 100644
Binary files a/gui/slick/images/network/usa network.png and b/gui/slick/images/network/usa network.png differ
diff --git a/gui/slick/images/network/usa.png b/gui/slick/images/network/usa.png
index 3bd2d9e..d6aa4d0 100644
Binary files a/gui/slick/images/network/usa.png and b/gui/slick/images/network/usa.png differ
diff --git a/gui/slick/images/network/vara.png b/gui/slick/images/network/vara.png
index 423f0de..e1af034 100644
Binary files a/gui/slick/images/network/vara.png and b/gui/slick/images/network/vara.png differ
diff --git a/gui/slick/images/network/velocity.png b/gui/slick/images/network/velocity.png
index a3f5cdf..f63ff71 100644
Binary files a/gui/slick/images/network/velocity.png and b/gui/slick/images/network/velocity.png differ
diff --git a/gui/slick/images/network/veronica.png b/gui/slick/images/network/veronica.png
index d2166e9..8872131 100644
Binary files a/gui/slick/images/network/veronica.png and b/gui/slick/images/network/veronica.png differ
diff --git a/gui/slick/images/network/vh1.png b/gui/slick/images/network/vh1.png
index e68c8d0..f55194d 100644
Binary files a/gui/slick/images/network/vh1.png and b/gui/slick/images/network/vh1.png differ
diff --git a/gui/slick/images/network/viz media.png b/gui/slick/images/network/viz media.png
index 7155608..481af1e 100644
Binary files a/gui/slick/images/network/viz media.png and b/gui/slick/images/network/viz media.png differ
diff --git a/gui/slick/images/network/vox.png b/gui/slick/images/network/vox.png
index e0d525f..e524ac6 100644
Binary files a/gui/slick/images/network/vox.png and b/gui/slick/images/network/vox.png differ
diff --git a/gui/slick/images/network/vpro.png b/gui/slick/images/network/vpro.png
index c682adf..5e492e3 100644
Binary files a/gui/slick/images/network/vpro.png and b/gui/slick/images/network/vpro.png differ
diff --git a/gui/slick/images/network/vtm.png b/gui/slick/images/network/vtm.png
index 41cc56b..6e82a87 100644
Binary files a/gui/slick/images/network/vtm.png and b/gui/slick/images/network/vtm.png differ
diff --git a/gui/slick/images/network/watch.png b/gui/slick/images/network/watch.png
index ab3f3cc..d5362fd 100644
Binary files a/gui/slick/images/network/watch.png and b/gui/slick/images/network/watch.png differ
diff --git a/gui/slick/images/network/we tv.png b/gui/slick/images/network/we tv.png
index 22a498e..a8129e8 100644
Binary files a/gui/slick/images/network/we tv.png and b/gui/slick/images/network/we tv.png differ
diff --git a/gui/slick/images/network/wgn america.png b/gui/slick/images/network/wgn america.png
index 6ad66eb..db42c12 100644
Binary files a/gui/slick/images/network/wgn america.png and b/gui/slick/images/network/wgn america.png differ
diff --git a/gui/slick/images/network/wowow.png b/gui/slick/images/network/wowow.png
index 48b3f89..5ca37a4 100644
Binary files a/gui/slick/images/network/wowow.png and b/gui/slick/images/network/wowow.png differ
diff --git a/gui/slick/images/network/xbox video.png b/gui/slick/images/network/xbox video.png
index 53142c5..474158d 100644
Binary files a/gui/slick/images/network/xbox video.png and b/gui/slick/images/network/xbox video.png differ
diff --git a/gui/slick/images/network/xebec.png b/gui/slick/images/network/xebec.png
index 7b96325..bcac620 100644
Binary files a/gui/slick/images/network/xebec.png and b/gui/slick/images/network/xebec.png differ
diff --git a/gui/slick/images/network/yahoo! screen.png b/gui/slick/images/network/yahoo! screen.png
index d7698e7..41bb104 100644
Binary files a/gui/slick/images/network/yahoo! screen.png and b/gui/slick/images/network/yahoo! screen.png differ
diff --git a/gui/slick/images/network/youtube.png b/gui/slick/images/network/youtube.png
index ede43ee..eb3918a 100644
Binary files a/gui/slick/images/network/youtube.png and b/gui/slick/images/network/youtube.png differ
diff --git a/gui/slick/images/network/ytv.png b/gui/slick/images/network/ytv.png
index 62409ea..bf8da30 100644
Binary files a/gui/slick/images/network/ytv.png and b/gui/slick/images/network/ytv.png differ
diff --git a/gui/slick/images/network/zdf.png b/gui/slick/images/network/zdf.png
index 73542e7..a53bb5e 100644
Binary files a/gui/slick/images/network/zdf.png and b/gui/slick/images/network/zdf.png differ
diff --git a/gui/slick/images/network/קשת.png b/gui/slick/images/network/קשת.png
index 04d9613..d14b064 100644
Binary files a/gui/slick/images/network/קשת.png and b/gui/slick/images/network/קשת.png differ
diff --git a/gui/slick/images/next.png b/gui/slick/images/next.png
index 14294a1..bfd8fc1 100644
Binary files a/gui/slick/images/next.png and b/gui/slick/images/next.png differ
diff --git a/gui/slick/images/nextepisode16.png b/gui/slick/images/nextepisode16.png
new file mode 100644
index 0000000..9cd0997
Binary files /dev/null and b/gui/slick/images/nextepisode16.png differ
diff --git a/gui/slick/images/no16.png b/gui/slick/images/no16.png
index acd87e1..4759c77 100644
Binary files a/gui/slick/images/no16.png and b/gui/slick/images/no16.png differ
diff --git a/gui/slick/images/notifiers/boxcar2.png b/gui/slick/images/notifiers/boxcar2.png
index e25888f..5e4f35a 100644
Binary files a/gui/slick/images/notifiers/boxcar2.png and b/gui/slick/images/notifiers/boxcar2.png differ
diff --git a/gui/slick/images/notifiers/discord.png b/gui/slick/images/notifiers/discord.png
index cdd63be..0dc1609 100644
Binary files a/gui/slick/images/notifiers/discord.png and b/gui/slick/images/notifiers/discord.png differ
diff --git a/gui/slick/images/notifiers/email.png b/gui/slick/images/notifiers/email.png
index 432ef77..339c562 100644
Binary files a/gui/slick/images/notifiers/email.png and b/gui/slick/images/notifiers/email.png differ
diff --git a/gui/slick/images/notifiers/emby.png b/gui/slick/images/notifiers/emby.png
index 3b9ce26..016cf42 100644
Binary files a/gui/slick/images/notifiers/emby.png and b/gui/slick/images/notifiers/emby.png differ
diff --git a/gui/slick/images/notifiers/gitter.png b/gui/slick/images/notifiers/gitter.png
index d2a31aa..b049957 100644
Binary files a/gui/slick/images/notifiers/gitter.png and b/gui/slick/images/notifiers/gitter.png differ
diff --git a/gui/slick/images/notifiers/growl.png b/gui/slick/images/notifiers/growl.png
index a270d46..82ea9fd 100644
Binary files a/gui/slick/images/notifiers/growl.png and b/gui/slick/images/notifiers/growl.png differ
diff --git a/gui/slick/images/notifiers/kodi.png b/gui/slick/images/notifiers/kodi.png
index d1fee15..2a04fb4 100644
Binary files a/gui/slick/images/notifiers/kodi.png and b/gui/slick/images/notifiers/kodi.png differ
diff --git a/gui/slick/images/notifiers/libnotify.png b/gui/slick/images/notifiers/libnotify.png
index 55f6873..5efde55 100644
Binary files a/gui/slick/images/notifiers/libnotify.png and b/gui/slick/images/notifiers/libnotify.png differ
diff --git a/gui/slick/images/notifiers/nmj.png b/gui/slick/images/notifiers/nmj.png
index e0eecef..c8a448e 100644
Binary files a/gui/slick/images/notifiers/nmj.png and b/gui/slick/images/notifiers/nmj.png differ
diff --git a/gui/slick/images/notifiers/notifo.png b/gui/slick/images/notifiers/notifo.png
index bc1cc21..fa2a4c7 100644
Binary files a/gui/slick/images/notifiers/notifo.png and b/gui/slick/images/notifiers/notifo.png differ
diff --git a/gui/slick/images/notifiers/plex.png b/gui/slick/images/notifiers/plex.png
index 2b6204d..b9cf665 100644
Binary files a/gui/slick/images/notifiers/plex.png and b/gui/slick/images/notifiers/plex.png differ
diff --git a/gui/slick/images/notifiers/prowl.png b/gui/slick/images/notifiers/prowl.png
index c28641f..39faf90 100644
Binary files a/gui/slick/images/notifiers/prowl.png and b/gui/slick/images/notifiers/prowl.png differ
diff --git a/gui/slick/images/notifiers/pushalot.png b/gui/slick/images/notifiers/pushalot.png
index f1d9008..ddcaaca 100644
Binary files a/gui/slick/images/notifiers/pushalot.png and b/gui/slick/images/notifiers/pushalot.png differ
diff --git a/gui/slick/images/notifiers/pushbullet.png b/gui/slick/images/notifiers/pushbullet.png
index a044631..0c953b7 100644
Binary files a/gui/slick/images/notifiers/pushbullet.png and b/gui/slick/images/notifiers/pushbullet.png differ
diff --git a/gui/slick/images/notifiers/pushover.png b/gui/slick/images/notifiers/pushover.png
index a1f5d38..bdb997c 100644
Binary files a/gui/slick/images/notifiers/pushover.png and b/gui/slick/images/notifiers/pushover.png differ
diff --git a/gui/slick/images/notifiers/pytivo.png b/gui/slick/images/notifiers/pytivo.png
index f5fec9b..e3faf45 100644
Binary files a/gui/slick/images/notifiers/pytivo.png and b/gui/slick/images/notifiers/pytivo.png differ
diff --git a/gui/slick/images/notifiers/slack.png b/gui/slick/images/notifiers/slack.png
index f348c2d..a8b9766 100644
Binary files a/gui/slick/images/notifiers/slack.png and b/gui/slick/images/notifiers/slack.png differ
diff --git a/gui/slick/images/notifiers/synoindex.png b/gui/slick/images/notifiers/synoindex.png
index 7aebaa1..41a6651 100644
Binary files a/gui/slick/images/notifiers/synoindex.png and b/gui/slick/images/notifiers/synoindex.png differ
diff --git a/gui/slick/images/notifiers/synologynotifier.png b/gui/slick/images/notifiers/synologynotifier.png
index 27d1713..bb88cac 100644
Binary files a/gui/slick/images/notifiers/synologynotifier.png and b/gui/slick/images/notifiers/synologynotifier.png differ
diff --git a/gui/slick/images/notifiers/telegram.png b/gui/slick/images/notifiers/telegram.png
index 41a2cb1..adc9a03 100644
Binary files a/gui/slick/images/notifiers/telegram.png and b/gui/slick/images/notifiers/telegram.png differ
diff --git a/gui/slick/images/notifiers/trakt.png b/gui/slick/images/notifiers/trakt.png
index 411e1fc..b681f54 100644
Binary files a/gui/slick/images/notifiers/trakt.png and b/gui/slick/images/notifiers/trakt.png differ
diff --git a/gui/slick/images/notifiers/xbmc.png b/gui/slick/images/notifiers/xbmc.png
index 16bc1a0..8b5cb5c 100644
Binary files a/gui/slick/images/notifiers/xbmc.png and b/gui/slick/images/notifiers/xbmc.png differ
diff --git a/gui/slick/images/plus.png b/gui/slick/images/plus.png
index 7428c48..6822286 100644
Binary files a/gui/slick/images/plus.png and b/gui/slick/images/plus.png differ
diff --git a/gui/slick/images/poster.png b/gui/slick/images/poster.png
index 5f213b3..6cc3a70 100644
Binary files a/gui/slick/images/poster.png and b/gui/slick/images/poster.png differ
diff --git a/gui/slick/images/predb16.png b/gui/slick/images/predb16.png
index 4fa51bb..8674c49 100644
Binary files a/gui/slick/images/predb16.png and b/gui/slick/images/predb16.png differ
diff --git a/gui/slick/images/prev.png b/gui/slick/images/prev.png
index 2a06c99..7e4519d 100644
Binary files a/gui/slick/images/prev.png and b/gui/slick/images/prev.png differ
diff --git a/gui/slick/images/providers/6box.png b/gui/slick/images/providers/6box.png
index 3e77530..8ccb3aa 100644
Binary files a/gui/slick/images/providers/6box.png and b/gui/slick/images/providers/6box.png differ
diff --git a/gui/slick/images/providers/alpharatio.png b/gui/slick/images/providers/alpharatio.png
index 1b48358..eb40af5 100644
Binary files a/gui/slick/images/providers/alpharatio.png and b/gui/slick/images/providers/alpharatio.png differ
diff --git a/gui/slick/images/providers/bb.png b/gui/slick/images/providers/bb.png
index 679a1e4..4acc202 100644
Binary files a/gui/slick/images/providers/bb.png and b/gui/slick/images/providers/bb.png differ
diff --git a/gui/slick/images/providers/bithdtv.png b/gui/slick/images/providers/bithdtv.png
index b3de190..5a85333 100644
Binary files a/gui/slick/images/providers/bithdtv.png and b/gui/slick/images/providers/bithdtv.png differ
diff --git a/gui/slick/images/providers/blutopia.png b/gui/slick/images/providers/blutopia.png
index d1c3f8f..a965942 100644
Binary files a/gui/slick/images/providers/blutopia.png and b/gui/slick/images/providers/blutopia.png differ
diff --git a/gui/slick/images/providers/btn.png b/gui/slick/images/providers/btn.png
index 923f5bf..0a5b932 100644
Binary files a/gui/slick/images/providers/btn.png and b/gui/slick/images/providers/btn.png differ
diff --git a/gui/slick/images/providers/drunkenslug.png b/gui/slick/images/providers/drunkenslug.png
index 8099e5b..480c65d 100644
Binary files a/gui/slick/images/providers/drunkenslug.png and b/gui/slick/images/providers/drunkenslug.png differ
diff --git a/gui/slick/images/providers/ettv.png b/gui/slick/images/providers/ettv.png
index f4fddd4..bb213ff 100644
Binary files a/gui/slick/images/providers/ettv.png and b/gui/slick/images/providers/ettv.png differ
diff --git a/gui/slick/images/providers/ezrss.png b/gui/slick/images/providers/ezrss.png
index 3080504..4694286 100644
Binary files a/gui/slick/images/providers/ezrss.png and b/gui/slick/images/providers/ezrss.png differ
diff --git a/gui/slick/images/providers/eztv.png b/gui/slick/images/providers/eztv.png
index b39e3aa..0b9983d 100644
Binary files a/gui/slick/images/providers/eztv.png and b/gui/slick/images/providers/eztv.png differ
diff --git a/gui/slick/images/providers/eztv_bt_chat.png b/gui/slick/images/providers/eztv_bt_chat.png
index 5ccd1a4..0b9983d 100644
Binary files a/gui/slick/images/providers/eztv_bt_chat.png and b/gui/slick/images/providers/eztv_bt_chat.png differ
diff --git a/gui/slick/images/providers/fano.png b/gui/slick/images/providers/fano.png
index 8465f92..4ae4f9e 100644
Binary files a/gui/slick/images/providers/fano.png and b/gui/slick/images/providers/fano.png differ
diff --git a/gui/slick/images/providers/filelist.png b/gui/slick/images/providers/filelist.png
index b8ad6df..9c1f0dd 100644
Binary files a/gui/slick/images/providers/filelist.png and b/gui/slick/images/providers/filelist.png differ
diff --git a/gui/slick/images/providers/filesharingtalk.png b/gui/slick/images/providers/filesharingtalk.png
new file mode 100644
index 0000000..9255e40
Binary files /dev/null and b/gui/slick/images/providers/filesharingtalk.png differ
diff --git a/gui/slick/images/providers/funfile.png b/gui/slick/images/providers/funfile.png
index 8449319..23a011e 100644
Binary files a/gui/slick/images/providers/funfile.png and b/gui/slick/images/providers/funfile.png differ
diff --git a/gui/slick/images/providers/grabtheinfo.png b/gui/slick/images/providers/grabtheinfo.png
index a0de6cb..a9d279a 100644
Binary files a/gui/slick/images/providers/grabtheinfo.png and b/gui/slick/images/providers/grabtheinfo.png differ
diff --git a/gui/slick/images/providers/hdbits.png b/gui/slick/images/providers/hdbits.png
index caf5b99..c976c71 100644
Binary files a/gui/slick/images/providers/hdbits.png and b/gui/slick/images/providers/hdbits.png differ
diff --git a/gui/slick/images/providers/hdme.png b/gui/slick/images/providers/hdme.png
index b5e23ee..7a501b2 100644
Binary files a/gui/slick/images/providers/hdme.png and b/gui/slick/images/providers/hdme.png differ
diff --git a/gui/slick/images/providers/hdspace.png b/gui/slick/images/providers/hdspace.png
index 6049460..29f69ce 100644
Binary files a/gui/slick/images/providers/hdspace.png and b/gui/slick/images/providers/hdspace.png differ
diff --git a/gui/slick/images/providers/hdtorrents.png b/gui/slick/images/providers/hdtorrents.png
index 46d43c2..5107734 100644
Binary files a/gui/slick/images/providers/hdtorrents.png and b/gui/slick/images/providers/hdtorrents.png differ
diff --git a/gui/slick/images/providers/horriblesubs.png b/gui/slick/images/providers/horriblesubs.png
index 92377a9..bbd2d6e 100644
Binary files a/gui/slick/images/providers/horriblesubs.png and b/gui/slick/images/providers/horriblesubs.png differ
diff --git a/gui/slick/images/providers/immortalseed.png b/gui/slick/images/providers/immortalseed.png
index 5c7ec08..100c78f 100644
Binary files a/gui/slick/images/providers/immortalseed.png and b/gui/slick/images/providers/immortalseed.png differ
diff --git a/gui/slick/images/providers/limetorrents.png b/gui/slick/images/providers/limetorrents.png
index 39f2060..7c3e468 100644
Binary files a/gui/slick/images/providers/limetorrents.png and b/gui/slick/images/providers/limetorrents.png differ
diff --git a/gui/slick/images/providers/magnetdl.png b/gui/slick/images/providers/magnetdl.png
index 3040b1a..d3a54a2 100644
Binary files a/gui/slick/images/providers/magnetdl.png and b/gui/slick/images/providers/magnetdl.png differ
diff --git a/gui/slick/images/providers/milkie.png b/gui/slick/images/providers/milkie.png
index ccc8c27..44346c0 100644
Binary files a/gui/slick/images/providers/milkie.png and b/gui/slick/images/providers/milkie.png differ
diff --git a/gui/slick/images/providers/missing.png b/gui/slick/images/providers/missing.png
index b559061..782dccd 100644
Binary files a/gui/slick/images/providers/missing.png and b/gui/slick/images/providers/missing.png differ
diff --git a/gui/slick/images/providers/morethan.png b/gui/slick/images/providers/morethan.png
index a5d0c65..3dfbca6 100644
Binary files a/gui/slick/images/providers/morethan.png and b/gui/slick/images/providers/morethan.png differ
diff --git a/gui/slick/images/providers/ncore.png b/gui/slick/images/providers/ncore.png
index 40af14e..e84b2d6 100644
Binary files a/gui/slick/images/providers/ncore.png and b/gui/slick/images/providers/ncore.png differ
diff --git a/gui/slick/images/providers/nebulance.png b/gui/slick/images/providers/nebulance.png
index a0a3141..20aaa35 100644
Binary files a/gui/slick/images/providers/nebulance.png and b/gui/slick/images/providers/nebulance.png differ
diff --git a/gui/slick/images/providers/newznab.png b/gui/slick/images/providers/newznab.png
index ab63394..453e3c5 100644
Binary files a/gui/slick/images/providers/newznab.png and b/gui/slick/images/providers/newznab.png differ
diff --git a/gui/slick/images/providers/newztown.png b/gui/slick/images/providers/newztown.png
index 56d2be3..3bd9ea5 100644
Binary files a/gui/slick/images/providers/newztown.png and b/gui/slick/images/providers/newztown.png differ
diff --git a/gui/slick/images/providers/newztown_co_za.png b/gui/slick/images/providers/newztown_co_za.png
index 0b1298e..760b57c 100644
Binary files a/gui/slick/images/providers/newztown_co_za.png and b/gui/slick/images/providers/newztown_co_za.png differ
diff --git a/gui/slick/images/providers/ninjacentral.png b/gui/slick/images/providers/ninjacentral.png
index c4861ff..92420b7 100644
Binary files a/gui/slick/images/providers/ninjacentral.png and b/gui/slick/images/providers/ninjacentral.png differ
diff --git a/gui/slick/images/providers/nyaa.png b/gui/slick/images/providers/nyaa.png
index 5f3b2c3..8d7d651 100644
Binary files a/gui/slick/images/providers/nyaa.png and b/gui/slick/images/providers/nyaa.png differ
diff --git a/gui/slick/images/providers/nzb_su.png b/gui/slick/images/providers/nzb_su.png
index 21a035a..3d02a48 100644
Binary files a/gui/slick/images/providers/nzb_su.png and b/gui/slick/images/providers/nzb_su.png differ
diff --git a/gui/slick/images/providers/nzbfinder.png b/gui/slick/images/providers/nzbfinder.png
index ac45d83..f9e6bf2 100644
Binary files a/gui/slick/images/providers/nzbfinder.png and b/gui/slick/images/providers/nzbfinder.png differ
diff --git a/gui/slick/images/providers/nzbgeek.png b/gui/slick/images/providers/nzbgeek.png
index ee14be6..2c337f6 100644
Binary files a/gui/slick/images/providers/nzbgeek.png and b/gui/slick/images/providers/nzbgeek.png differ
diff --git a/gui/slick/images/providers/nzbplanet.png b/gui/slick/images/providers/nzbplanet.png
index 92c9e0d..9fb0914 100644
Binary files a/gui/slick/images/providers/nzbplanet.png and b/gui/slick/images/providers/nzbplanet.png differ
diff --git a/gui/slick/images/providers/nzbs_in.png b/gui/slick/images/providers/nzbs_in.png
index 58c7b7b..ef6fe33 100644
Binary files a/gui/slick/images/providers/nzbs_in.png and b/gui/slick/images/providers/nzbs_in.png differ
diff --git a/gui/slick/images/providers/nzbs_org.png b/gui/slick/images/providers/nzbs_org.png
index f068900..8d3b8c7 100644
Binary files a/gui/slick/images/providers/nzbs_org.png and b/gui/slick/images/providers/nzbs_org.png differ
diff --git a/gui/slick/images/providers/nzbs_org_old.png b/gui/slick/images/providers/nzbs_org_old.png
index d096f66..e5cf203 100644
Binary files a/gui/slick/images/providers/nzbs_org_old.png and b/gui/slick/images/providers/nzbs_org_old.png differ
diff --git a/gui/slick/images/providers/nzbzombie.png b/gui/slick/images/providers/nzbzombie.png
index 814cf54..83eee0f 100644
Binary files a/gui/slick/images/providers/nzbzombie.png and b/gui/slick/images/providers/nzbzombie.png differ
diff --git a/gui/slick/images/providers/omgwtfnzbs.png b/gui/slick/images/providers/omgwtfnzbs.png
index ed75279..1ef0a25 100644
Binary files a/gui/slick/images/providers/omgwtfnzbs.png and b/gui/slick/images/providers/omgwtfnzbs.png differ
diff --git a/gui/slick/images/providers/oznzb.png b/gui/slick/images/providers/oznzb.png
index 683c52e..da1c201 100644
Binary files a/gui/slick/images/providers/oznzb.png and b/gui/slick/images/providers/oznzb.png differ
diff --git a/gui/slick/images/providers/pfmonkey.png b/gui/slick/images/providers/pfmonkey.png
index a426816..01c3501 100644
Binary files a/gui/slick/images/providers/pfmonkey.png and b/gui/slick/images/providers/pfmonkey.png differ
diff --git a/gui/slick/images/providers/pretome.png b/gui/slick/images/providers/pretome.png
index efcefc5..9cfc05b 100644
Binary files a/gui/slick/images/providers/pretome.png and b/gui/slick/images/providers/pretome.png differ
diff --git a/gui/slick/images/providers/privatehd.png b/gui/slick/images/providers/privatehd.png
index b15f74f..4f2ceea 100644
Binary files a/gui/slick/images/providers/privatehd.png and b/gui/slick/images/providers/privatehd.png differ
diff --git a/gui/slick/images/providers/ptfiles.png b/gui/slick/images/providers/ptfiles.png
index e700d4e..a71c0e6 100644
Binary files a/gui/slick/images/providers/ptfiles.png and b/gui/slick/images/providers/ptfiles.png differ
diff --git a/gui/slick/images/providers/publichd.png b/gui/slick/images/providers/publichd.png
index 4efb663..2fe90de 100644
Binary files a/gui/slick/images/providers/publichd.png and b/gui/slick/images/providers/publichd.png differ
diff --git a/gui/slick/images/providers/rarbg.png b/gui/slick/images/providers/rarbg.png
index 11048b1..fa662af 100644
Binary files a/gui/slick/images/providers/rarbg.png and b/gui/slick/images/providers/rarbg.png differ
diff --git a/gui/slick/images/providers/revtt.png b/gui/slick/images/providers/revtt.png
index 497cdf8..b63f56e 100644
Binary files a/gui/slick/images/providers/revtt.png and b/gui/slick/images/providers/revtt.png differ
diff --git a/gui/slick/images/providers/scenehd.png b/gui/slick/images/providers/scenehd.png
index d1f4da4..0ccc73a 100644
Binary files a/gui/slick/images/providers/scenehd.png and b/gui/slick/images/providers/scenehd.png differ
diff --git a/gui/slick/images/providers/scenetime.png b/gui/slick/images/providers/scenetime.png
index 0982d8d..1ad2673 100644
Binary files a/gui/slick/images/providers/scenetime.png and b/gui/slick/images/providers/scenetime.png differ
diff --git a/gui/slick/images/providers/shazbat.png b/gui/slick/images/providers/shazbat.png
index 41b032f..db6eb70 100644
Binary files a/gui/slick/images/providers/shazbat.png and b/gui/slick/images/providers/shazbat.png differ
diff --git a/gui/slick/images/providers/showrss.png b/gui/slick/images/providers/showrss.png
index 0835754..08ac64d 100644
Binary files a/gui/slick/images/providers/showrss.png and b/gui/slick/images/providers/showrss.png differ
diff --git a/gui/slick/images/providers/sick_beard_index.png b/gui/slick/images/providers/sick_beard_index.png
index 2ba4d23..c6f5f0b 100644
Binary files a/gui/slick/images/providers/sick_beard_index.png and b/gui/slick/images/providers/sick_beard_index.png differ
diff --git a/gui/slick/images/providers/simplynzbs.png b/gui/slick/images/providers/simplynzbs.png
index 92d1486..48ade9e 100644
Binary files a/gui/slick/images/providers/simplynzbs.png and b/gui/slick/images/providers/simplynzbs.png differ
diff --git a/gui/slick/images/providers/skytorrents.png b/gui/slick/images/providers/skytorrents.png
index 3677d18..2e03273 100644
Binary files a/gui/slick/images/providers/skytorrents.png and b/gui/slick/images/providers/skytorrents.png differ
diff --git a/gui/slick/images/providers/snowfl.png b/gui/slick/images/providers/snowfl.png
index 27706bf..f77c030 100644
Binary files a/gui/slick/images/providers/snowfl.png and b/gui/slick/images/providers/snowfl.png differ
diff --git a/gui/slick/images/providers/speedcd.png b/gui/slick/images/providers/speedcd.png
index c03a4ac..25ba99b 100644
Binary files a/gui/slick/images/providers/speedcd.png and b/gui/slick/images/providers/speedcd.png differ
diff --git a/gui/slick/images/providers/spotweb.png b/gui/slick/images/providers/spotweb.png
index 60bf038..a355715 100644
Binary files a/gui/slick/images/providers/spotweb.png and b/gui/slick/images/providers/spotweb.png differ
diff --git a/gui/slick/images/providers/the_pirate_bay.png b/gui/slick/images/providers/the_pirate_bay.png
index cfeea6a..b1c5793 100644
Binary files a/gui/slick/images/providers/the_pirate_bay.png and b/gui/slick/images/providers/the_pirate_bay.png differ
diff --git a/gui/slick/images/providers/tokyotoshokan.png b/gui/slick/images/providers/tokyotoshokan.png
index 51628a6..e4347ab 100644
Binary files a/gui/slick/images/providers/tokyotoshokan.png and b/gui/slick/images/providers/tokyotoshokan.png differ
diff --git a/gui/slick/images/providers/torlock.png b/gui/slick/images/providers/torlock.png
index 9bbd208..1639dfa 100644
Binary files a/gui/slick/images/providers/torlock.png and b/gui/slick/images/providers/torlock.png differ
diff --git a/gui/slick/images/providers/torrent.png b/gui/slick/images/providers/torrent.png
index 0e3fdfa..3c5bdc5 100644
Binary files a/gui/slick/images/providers/torrent.png and b/gui/slick/images/providers/torrent.png differ
diff --git a/gui/slick/images/providers/torrentday.png b/gui/slick/images/providers/torrentday.png
index 835fa74..ae1427f 100644
Binary files a/gui/slick/images/providers/torrentday.png and b/gui/slick/images/providers/torrentday.png differ
diff --git a/gui/slick/images/providers/torrenting.png b/gui/slick/images/providers/torrenting.png
index 15f847f..888c928 100644
Binary files a/gui/slick/images/providers/torrenting.png and b/gui/slick/images/providers/torrenting.png differ
diff --git a/gui/slick/images/providers/torrentleech.png b/gui/slick/images/providers/torrentleech.png
index 28afcce..d01c50a 100644
Binary files a/gui/slick/images/providers/torrentleech.png and b/gui/slick/images/providers/torrentleech.png differ
diff --git a/gui/slick/images/providers/torrentrss.png b/gui/slick/images/providers/torrentrss.png
index 2153e7a..eadde91 100644
Binary files a/gui/slick/images/providers/torrentrss.png and b/gui/slick/images/providers/torrentrss.png differ
diff --git a/gui/slick/images/providers/tvchaosuk.png b/gui/slick/images/providers/tvchaosuk.png
index ca8ebcd..7e88181 100644
Binary files a/gui/slick/images/providers/tvchaosuk.png and b/gui/slick/images/providers/tvchaosuk.png differ
diff --git a/gui/slick/images/providers/usenet_crawler.png b/gui/slick/images/providers/usenet_crawler.png
index a9db128..c118732 100644
Binary files a/gui/slick/images/providers/usenet_crawler.png and b/gui/slick/images/providers/usenet_crawler.png differ
diff --git a/gui/slick/images/providers/warning16.png b/gui/slick/images/providers/warning16.png
index 2735496..9764169 100644
Binary files a/gui/slick/images/providers/warning16.png and b/gui/slick/images/providers/warning16.png differ
diff --git a/gui/slick/images/providers/xspeeds.png b/gui/slick/images/providers/xspeeds.png
index 96e0cde..70de3be 100644
Binary files a/gui/slick/images/providers/xspeeds.png and b/gui/slick/images/providers/xspeeds.png differ
diff --git a/gui/slick/images/providers/zooqle.png b/gui/slick/images/providers/zooqle.png
index 3fc2df7..456d445 100644
Binary files a/gui/slick/images/providers/zooqle.png and b/gui/slick/images/providers/zooqle.png differ
diff --git a/gui/slick/images/queued.png b/gui/slick/images/queued.png
index 4e04811..510d6e3 100644
Binary files a/gui/slick/images/queued.png and b/gui/slick/images/queued.png differ
diff --git a/gui/slick/images/rating.png b/gui/slick/images/rating.png
index 723834f..0245257 100644
Binary files a/gui/slick/images/rating.png and b/gui/slick/images/rating.png differ
diff --git a/gui/slick/images/save.png b/gui/slick/images/save.png
index 7aab3d1..fc8896d 100644
Binary files a/gui/slick/images/save.png and b/gui/slick/images/save.png differ
diff --git a/gui/slick/images/search16.png b/gui/slick/images/search16.png
index 8eaa4f6..bb44bf5 100644
Binary files a/gui/slick/images/search16.png and b/gui/slick/images/search16.png differ
diff --git a/gui/slick/images/shadow.png b/gui/slick/images/shadow.png
index c04d21b..7088d90 100644
Binary files a/gui/slick/images/shadow.png and b/gui/slick/images/shadow.png differ
diff --git a/gui/slick/images/sickgear-large.png b/gui/slick/images/sickgear-large.png
index 857e2dc..521da8a 100644
Binary files a/gui/slick/images/sickgear-large.png and b/gui/slick/images/sickgear-large.png differ
diff --git a/gui/slick/images/sickgear-xmas.png b/gui/slick/images/sickgear-xmas.png
index 6712197..d9ed372 100644
Binary files a/gui/slick/images/sickgear-xmas.png and b/gui/slick/images/sickgear-xmas.png differ
diff --git a/gui/slick/images/sickgear.png b/gui/slick/images/sickgear.png
index f6bd86e..ff00d94 100644
Binary files a/gui/slick/images/sickgear.png and b/gui/slick/images/sickgear.png differ
diff --git a/gui/slick/images/srrdb16.png b/gui/slick/images/srrdb16.png
index c9368a8..df86ac4 100644
Binary files a/gui/slick/images/srrdb16.png and b/gui/slick/images/srrdb16.png differ
diff --git a/gui/slick/images/subtitles/addic7ed.png b/gui/slick/images/subtitles/addic7ed.png
index 0bfceda..81b7f82 100644
Binary files a/gui/slick/images/subtitles/addic7ed.png and b/gui/slick/images/subtitles/addic7ed.png differ
diff --git a/gui/slick/images/subtitles/bierdopje.png b/gui/slick/images/subtitles/bierdopje.png
index 349eb3b..2aa624c 100644
Binary files a/gui/slick/images/subtitles/bierdopje.png and b/gui/slick/images/subtitles/bierdopje.png differ
diff --git a/gui/slick/images/subtitles/itasa.png b/gui/slick/images/subtitles/itasa.png
index bede894..0e1013b 100644
Binary files a/gui/slick/images/subtitles/itasa.png and b/gui/slick/images/subtitles/itasa.png differ
diff --git a/gui/slick/images/subtitles/opensubtitles.png b/gui/slick/images/subtitles/opensubtitles.png
index 9c9ac4d..a9f3cfb 100644
Binary files a/gui/slick/images/subtitles/opensubtitles.png and b/gui/slick/images/subtitles/opensubtitles.png differ
diff --git a/gui/slick/images/subtitles/podnapisiweb.png b/gui/slick/images/subtitles/podnapisiweb.png
index 3fc1254..1c59e78 100644
Binary files a/gui/slick/images/subtitles/podnapisiweb.png and b/gui/slick/images/subtitles/podnapisiweb.png differ
diff --git a/gui/slick/images/subtitles/subscene.png b/gui/slick/images/subtitles/subscene.png
index bd42ee3..702d629 100644
Binary files a/gui/slick/images/subtitles/subscene.png and b/gui/slick/images/subtitles/subscene.png differ
diff --git a/gui/slick/images/subtitles/subscenter.png b/gui/slick/images/subtitles/subscenter.png
index 84389c5..5957b57 100644
Binary files a/gui/slick/images/subtitles/subscenter.png and b/gui/slick/images/subtitles/subscenter.png differ
diff --git a/gui/slick/images/subtitles/subswiki.png b/gui/slick/images/subtitles/subswiki.png
index 08802e4..946ac9a 100644
Binary files a/gui/slick/images/subtitles/subswiki.png and b/gui/slick/images/subtitles/subswiki.png differ
diff --git a/gui/slick/images/subtitles/subtitlesource.png b/gui/slick/images/subtitles/subtitlesource.png
index 5bced64..332a09b 100644
Binary files a/gui/slick/images/subtitles/subtitlesource.png and b/gui/slick/images/subtitles/subtitlesource.png differ
diff --git a/gui/slick/images/subtitles/subtitulos.png b/gui/slick/images/subtitles/subtitulos.png
index 6bbd40d..62abc68 100644
Binary files a/gui/slick/images/subtitles/subtitulos.png and b/gui/slick/images/subtitles/subtitulos.png differ
diff --git a/gui/slick/images/subtitles/thesubdb.png b/gui/slick/images/subtitles/thesubdb.png
index 6940954..d3f3263 100644
Binary files a/gui/slick/images/subtitles/thesubdb.png and b/gui/slick/images/subtitles/thesubdb.png differ
diff --git a/gui/slick/images/subtitles/tvsubtitles.png b/gui/slick/images/subtitles/tvsubtitles.png
index 248fa11..2938b28 100644
Binary files a/gui/slick/images/subtitles/tvsubtitles.png and b/gui/slick/images/subtitles/tvsubtitles.png differ
diff --git a/gui/slick/images/subtitles/usub.png b/gui/slick/images/subtitles/usub.png
index 80dd713..2778e5b 100644
Binary files a/gui/slick/images/subtitles/usub.png and b/gui/slick/images/subtitles/usub.png differ
diff --git a/gui/slick/images/tag.png b/gui/slick/images/tag.png
index 92868d3..a612e27 100644
Binary files a/gui/slick/images/tag.png and b/gui/slick/images/tag.png differ
diff --git a/gui/slick/images/thetvdb16.png b/gui/slick/images/thetvdb16.png
index d010fe3..a5ec7b3 100644
Binary files a/gui/slick/images/thetvdb16.png and b/gui/slick/images/thetvdb16.png differ
diff --git a/gui/slick/images/tmdb16.png b/gui/slick/images/tmdb16.png
index db26699..f9e380d 100644
Binary files a/gui/slick/images/tmdb16.png and b/gui/slick/images/tmdb16.png differ
diff --git a/gui/slick/images/trakt16.png b/gui/slick/images/trakt16.png
index c81167b..1647587 100644
Binary files a/gui/slick/images/trakt16.png and b/gui/slick/images/trakt16.png differ
diff --git a/gui/slick/images/tvmaze16.png b/gui/slick/images/tvmaze16.png
index 65de27e..85020d8 100644
Binary files a/gui/slick/images/tvmaze16.png and b/gui/slick/images/tvmaze16.png differ
diff --git a/gui/slick/images/tvrage16.png b/gui/slick/images/tvrage16.png
index 23747e1..ce8b92e 100644
Binary files a/gui/slick/images/tvrage16.png and b/gui/slick/images/tvrage16.png differ
diff --git a/gui/slick/images/warning16.png b/gui/slick/images/warning16.png
index 2735496..9764169 100644
Binary files a/gui/slick/images/warning16.png and b/gui/slick/images/warning16.png differ
diff --git a/gui/slick/images/xem.png b/gui/slick/images/xem.png
index 66fa4c3..0ac913c 100644
Binary files a/gui/slick/images/xem.png and b/gui/slick/images/xem.png differ
diff --git a/gui/slick/images/yes16.png b/gui/slick/images/yes16.png
index 14efce7..1f44274 100644
Binary files a/gui/slick/images/yes16.png and b/gui/slick/images/yes16.png differ
diff --git a/gui/slick/interfaces/default/config.tmpl b/gui/slick/interfaces/default/config.tmpl
index 30f1130..00bfe8b 100644
--- a/gui/slick/interfaces/default/config.tmpl
+++ b/gui/slick/interfaces/default/config.tmpl
@@ -24,8 +24,8 @@
 			<td class="infoTableCell">
 				BRANCH: #echo $sg_str('BRANCH') or 'UNKNOWN'# @ py#echo '.'.join(['%s' % x for x in sys.version_info[0:3]])# / COMMIT: #echo ($sg_str('CUR_COMMIT_HASH')[0:7] or 'UNKNOWN') + ('', ' @ ')[bool($version)]#$version<br />
 				<em class="red-text">This is BETA software</em><br />
-#if not $sg_var('VERSION_NOTIFY') and not $sg_var('EXT_UPDATES'):
-				You don't have version checking turned on, see "Check software updates" in Config > General.
+#if not $sg_var('UPDATE_NOTIFY') and not $sg_var('EXT_UPDATES'):
+				No checks are run for outdated software, see "Software updates" in Config > General.
 #end if
 			</td>
 		</tr>
@@ -34,10 +34,13 @@
 #if $db.db_supports_backup
 		<tr><td class="infoTableHeader">Database backups:</td><td class="infoTableCell">$backup_db_path</td></tr>
 #end if
-		<tr><td class="infoTableHeader">Cache Dir:</td><td class="infoTableCell">$sg_str('CACHE_DIR')</td></tr>
+		<tr><td class="infoTableHeader">Cache dir:</td><td class="infoTableCell">$sg_str('CACHE_DIR')</td></tr>
 		<tr><td class="infoTableHeader">Arguments:</td><td class="infoTableCell">#echo $sg_var('MY_ARGS') or 'None used'#</td></tr>
-		<tr><td class="infoTableHeader">Web Root:</td><td class="infoTableCell">$sg_str('WEB_ROOT')</td></tr>
-		<tr><td class="infoTableHeader">Python Version:</td><td class="infoTableCell">$sys.version[:120]</td></tr>
+		<tr><td class="infoTableHeader">Web root:</td><td class="infoTableCell">#echo $sg_str('WEB_ROOT') or '/'#</td></tr>
+		<tr><td class="infoTableHeader">Python version:</td><td class="infoTableCell">$sys.version[:120]</td></tr>
+#if $tz_version
+		<tr><td class="infoTableHeader">Timezone version:</td><td class="infoTableCell">$tz_version#if $tz_fallback# (fallback)#end if#</td></tr>
+#end if
 		<tr class="infoTableSeperator"><td class="infoTableHeader"><i class="icon16-sg"></i> Homepage</td><td class="infoTableCell"><a href="<%= anon_url('https://github.com/SickGear/SickGear/wiki') %>" rel="noreferrer" onclick="window.open(this.href, '_blank'); return false;">https://github.com/SickGear/SickGear/wiki</a></td></tr>
 		<tr><td class="infoTableHeader"><i class="icon16-github"></i> Source</td><td class="infoTableCell"><a href="<%= anon_url('https://github.com/SickGear/SickGear/') %>" rel="noreferrer" onclick="window.open(this.href, '_blank'); return false;">https://github.com/SickGear/SickGear/</a></td></tr>
 		<tr><td class="infoTableHeader"><i class="icon16-mirc"></i> Internet Relay Chat</td><td class="infoTableCell">web: <a href="<%= anon_url('https://libera.chat/') %>" rel="noreferrer" onclick="window.open(this.href, '_blank'); return false;">Libera.chat</a> irc: <a href="irc://irc.libera.chat/#sickgear" rel="noreferrer"><i>#SickGear</i> on <i>irc.libera.chat</i></a></td></tr>
diff --git a/gui/slick/interfaces/default/config_general.tmpl b/gui/slick/interfaces/default/config_general.tmpl
index 4930773..7ccfcfb 100644
--- a/gui/slick/interfaces/default/config_general.tmpl
+++ b/gui/slick/interfaces/default/config_general.tmpl
@@ -1,13 +1,15 @@
-#import sickbeard
+#from sys import version_info
 #import datetime
 #import locale
 #import operator
+#import sickbeard
 #from sickbeard import config,  metadata
 #from sickbeard.metadata.generic import GenericMetadata
 #from sickbeard.common import *
 #from sickbeard.db import db_supports_backup
 #from sickbeard.helpers import anon_url, maybe_plural
 #from sickbeard.logger import reverseNames as file_logging_presets
+#from sickbeard.piper import check_pip_env
 #from sickbeard.sgdatetime import *
 <% def sg_var(varname, default=False): return getattr(sickbeard, varname, default) %>#slurp#
 <% def sg_str(varname, default=''): return getattr(sickbeard, varname, default) %>#slurp#
@@ -168,50 +170,100 @@
 
 					<div class="component-group-desc">
 						<h3>Updates</h3>
-						<p>Options for software updates.</p>
+						<p>Options for software, package and alternative shownames/numbers.</p>
 					</div>
 					<fieldset class="component-group-list">
 #if not $sg_var('EXT_UPDATES')
 						<div class="field-pair">
-							<label for="version_notify">
-								<span class="component-title">Check software updates</span>
-								<span class="component-desc">
-									<input type="checkbox" name="version_notify" id="version_notify"#echo ('', $checked)[$sg_var('VERSION_NOTIFY', True)]#>
-									<p>and display notifications when updates are available.
-									Checks are run on startup and at the interval set below*</p>
-								</span>
-							</label>
-						</div>
+							<span class="component-title">Software updates</span>
+							<span class="component-desc">
+								<label class="nextline-block">
+									<input type="checkbox" class="views-if-interval1" name="update_notify"#echo ('', $checked)[$sg_var('UPDATE_NOTIFY', True)]#>
+									<p>display message for outdated software, run checks at startup and at interval<sup>1</sup></p>
+								</label>
 
-						<div class="field-pair">
-							<label for="auto_update">
-								<span class="component-title">Automatically update</span>
-								<span class="component-desc">
-									<input type="checkbox" name="auto_update" id="auto_update"#echo ('', $checked)[$sg_var('AUTO_UPDATE')]#>
-									<p>fetch and install software updates.
-									Updates are run on startup and in the background at the interval set below<sup>1</sup></p>
-								</span>
-							</label>
-						</div>
+								<label class="nextline-block">
+									<input type="checkbox" class="views-if-interval1" name="update_auto"#echo ('', $checked)[$sg_var('UPDATE_AUTO')]#>
+									<p>update software automatically at startup and at interval<sup>1</sup></p>
+								</label>
 
-						<div class="field-pair">
-							<label>
-								<span class="component-title">Check the server every<sup>1</sup></span>
-								<span class="component-desc">
-									<input type="text" name="update_interval" id="update_interval" value="$sg_var('UPDATE_INTERVAL', 12)" class="form-control input-sm input75">
-									<p>hours for software updates (default:12)</p>
-								</span>
-							</label>
+    #set $hide_interval1 = not ($sg_var('UPDATE_NOTIFY') or $sg_var('UPDATE_AUTO'))
+								<label class="nextline-block show-if-interval1" style="#if $hide_interval1#display:none;#end if#padding:6px 0">
+									<input type="text" name="update_interval" value="$sg_var('UPDATE_INTERVAL', 12)" class="form-control input-sm input75">
+									<p>hours interval<sup>1</sup> (default:$sg_var('DEFAULT_UPDATE_INTERVAL', 'n/a'))</p>
+								</label>
+
+								<label class="nextline-block show-if-interval1"#if $hide_interval1# style="display:none"#end if#>
+									<input type="checkbox" name="notify_on_update"#echo ('', $checked)[$sg_var('NOTIFY_ON_UPDATE')]#>
+									<p>send a message to all enabled notifiers when SickGear is updated</p>
+								</label>
+							</span>
 						</div>
 
 						<div class="field-pair">
-							<label for="notify_on_update">
-								<span class="component-title">Notify on software update</span>
-								<span class="component-desc">
-									<input type="checkbox" name="notify_on_update" id="notify_on_update"#echo ('', $checked)[$sg_var('NOTIFY_ON_UPDATE')]#>
-									<p>send a message to all enabled notifiers when SickGear has been updated</p>
-								</span>
-							</label>
+							<span class="component-title">Package updates</span>
+							<span class="component-desc">
+								<label class="nextline-block">
+									<input type="checkbox" class="views-if-package-table views-if-interval2" name="update_packages_notify" #echo ('', $checked)[$sg_var('UPDATE_PACKAGES_NOTIFY')]#>
+									<p>display message for outdated packages, run checks at startup and at interval<sup>2</sup></p>
+								</label>
+
+								<label class="nextline-block">
+									<input type="checkbox" class="views-if-package-table views-if-interval2" name="update_packages_auto"#echo ('', $checked)[$sg_var('UPDATE_PACKAGES_AUTO')]#>
+									<p>update packages automatically at startup and at interval<sup>2</sup></p>
+								</label>
+
+    #set $hide_interval2 = not ($sg_var('UPDATE_PACKAGES_NOTIFY') or $sg_var('UPDATE_PACKAGES_AUTO'))
+								<label class="nextline-block show-if-interval2" style="#if $hide_interval2#display:none;#end if#padding:6px 0">
+									<input type="text" name="update_packages_interval" value="$sg_var('UPDATE_PACKAGES_INTERVAL', 24)" class="form-control input-sm input75">
+									<p>hours interval<sup>2</sup> (default:$sg_var('DEFAULT_UPDATE_PACKAGES_INTERVAL', 'n/a'))</p>
+								</label>
+
+								<label class="nextline-block">
+									<input type="checkbox" class="views-if-package-table" name="update_packages_menu"#echo ('', $checked)[$sg_var('UPDATE_PACKAGES_MENU')]#>
+									<p>include in 'Check for Updates' menu action</p>
+								</label>
+    #set $hide_package_tbl = not ($sg_var('UPDATE_PACKAGES_NOTIFY') or $sg_var('UPDATE_PACKAGES_AUTO') or $sg_var('UPDATE_PACKAGES_MENU'))
+								<div class="show-if-package-table">
+    #try
+        #set $installed, $extra_info, $known_failed = $check_pip_env()
+    #except
+        #set $installed, $extra_info, $known_failed = ([], None, [])
+    #end try
+
+<style>
+.extras{padding-top:10px}
+.extras p{margin-bottom:3px}
+.extras th{padding:0 2px}
+.extras td{white-space:nowrap}
+.extras .center{text-align:center}
+.extras .package-col{width:135px;padding-left:0}
+.extras .info-col{min-width:135px;padding-left:30px}
+</style>
+									<div class="extras">
+										<table cellspacing="0" border="0" cellpadding="0">
+											<thead>
+												<tr class="grey-text">
+													<th class="package-col">package (py #echo '.'.join('%s' % n for n in sys.version_info[0:3])#)</th>
+													<th class="center">version in use</th>
+													<th class="info-col">extra info</th>
+												</tr>
+											</thead>
+											<tbody>
+    #for $item in $installed
+												<tr><td class="package-col">$item[0].lower()</td><td class="center">#echo $item[1] or '-'#</td><td class="info-col">#echo $sg_var('UPDATES_TODO', {}).get($item[0]) and 'update ready' or $extra_info.get($item[0], 'filled optional')#</td></tr>
+    #end for
+    #set $update_link = '<a href="%s/home/check-update">check update (clear failed)</a>' % $sbRoot
+    #for $item in $known_failed
+												<tr class="grey-text"><td>$item.lower()</td><td class="center">failed</td><td class="info-col">$update_link</td></tr>
+        #set $update_link = ''
+    #end for
+											</tbody>
+										</table>
+										<p class="extras">the above info may help with packages that don't update internally<br>manual installation tip: <code>python -m pip install -U --user package</code></p>
+									</div>
+								</div>
+							</span>
 						</div>
 #else
 						<div class="field-pair">
diff --git a/gui/slick/interfaces/default/config_providers.tmpl b/gui/slick/interfaces/default/config_providers.tmpl
index de7ce35..09eaf0f 100644
--- a/gui/slick/interfaces/default/config_providers.tmpl
+++ b/gui/slick/interfaces/default/config_providers.tmpl
@@ -392,6 +392,20 @@
 							</label>
 						</div>
     #end if
+    #if $hasattr($cur_nzb_provider, 'digest'):
+        #set $field_name = cur_nzb_provider.get_id() + '_digest'
+						<div class="field-pair">
+							<label for="$field_name">
+								<span class="component-title">Cookies:</span>
+								<span class="component-desc">
+									<input type="text" name="$field_name" id="$field_name" value="<%= starify(cur_nzb_provider.digest) %>" class="form-control input-sm input350">
+        #if callable(getattr(cur_nzb_provider, 'ui_string', None))
+									<div class="clear-left"><p>${cur_nzb_provider.ui_string($field_name)}</p></div>
+        #end if
+								</span>
+							</label>
+						</div>
+    #end if
 						<div class="field-pair">
 							<span class="component-title">$filter_title</span>
 							<span class="component-desc">
diff --git a/gui/slick/interfaces/default/displayShow.tmpl b/gui/slick/interfaces/default/displayShow.tmpl
index acc7a30..824b07c 100644
--- a/gui/slick/interfaces/default/displayShow.tmpl
+++ b/gui/slick/interfaces/default/displayShow.tmpl
@@ -333,7 +333,7 @@
 					<div id="details-bottom">
 						<span class="label addQTip" title="Info language, $show_obj.lang"><img src="$sbRoot/images/flags/${show_obj.lang}.png" width="16" height="11" alt="" style="margin-top:-1px" /></span>
 						<span class="label addQTip" title="Location#echo (' no longer exists" style="background-color:#8f1515"', '"')[$showLoc[1]]#>$showLoc[0]</span>
-						<span class="label addQTip" title="Size">$human($get_size($showLoc[0]))</span>
+						<span id="data-size" class="label" style="cursor:help">$human($get_size($showLoc[0]))</span>
 #set $filecount = sum([$c for $k, $c in $ep_counts['videos'].items()])
 #set $to_prune = $show_obj.prune - $filecount
 #set $keep_or_prune = ('', ' (%s)' % ('%s to prune' % abs($to_prune), 'keep %s' % $show_obj.prune)[0 <= $to_prune])[bool($show_obj.prune)]
diff --git a/gui/slick/interfaces/default/home_browseShows.tmpl b/gui/slick/interfaces/default/home_browseShows.tmpl
index 3992c42..bec0627 100644
--- a/gui/slick/interfaces/default/home_browseShows.tmpl
+++ b/gui/slick/interfaces/default/home_browseShows.tmpl
@@ -221,7 +221,9 @@ $(document).ready(function(){
 
 	$('#showfilter').on('change', function(){
 		var filterValue = this.value;
-		if (-1 == filterValue.indexOf('trakt') && -1 == filterValue.indexOf('imdb') && -1 == filterValue.indexOf('mc_') && -1 == filterValue.indexOf('tvc_') && -1 == filterValue.indexOf('default')) {
+		if (-1 == filterValue.indexOf('trakt') && -1 == filterValue.indexOf('imdb') && -1 == filterValue.indexOf('mc_')
+		 && -1 == filterValue.indexOf('tvc_') && -1 == filterValue.indexOf('ne_') && -1 == filterValue.indexOf('_ne')
+		 && -1 == filterValue.indexOf('default')) {
 			var el$ = $('#container')
 			el$.on('layoutComplete', llUpdate);
 			el$.isotope({ filter: filterValue });
@@ -229,6 +231,9 @@ $(document).ready(function(){
 			if (-1 !== filterValue.indexOf('more_imdb')){
 				filterValue = $('#showfilter').find('option:not([value="more_imdb"]).selected').val() + '&more=1';
 			}
+			else if (-1 !== filterValue.indexOf('more_ne')){
+				filterValue = $('#showfilter').find('option:not([value^="more_"]).selected').val() + '?more=1';
+			}
 #end raw
 			location = '$sg_root/add-shows/' + filterValue;
 #raw
@@ -376,6 +381,14 @@ $(document).ready(function(){
             #end for
 			<option value="tvc_latest"#echo ('', selected)['latest' == $mode]#>Latest additions</option>
 		</optgroup>
+        #elif 'Nextepisode' == $browse_type
+		<optgroup label="Nextepisode">
+			<option value="ne_newpop"#echo ('', selected)['newpop' == $mode]#>Popular premiered</option>
+			<option value="ne_newtop"#echo ('', selected)['newtop' == $mode]#>Top rated premiered</option>
+			<option value="ne_upcoming"#echo ('', selected)['upcoming' == $mode]#>Upcoming</option>
+			<option value="ne_trending"#echo ('', selected)['trending' == $mode]#>Trending</option>
+			<option value="more_ne"#echo ('', selected + ' disabled')[mode.endswith('more')]#>... list more</option>
+		</optgroup>
         #end if
 	</select>
     #end if
diff --git a/gui/slick/interfaces/default/home_postprocess.tmpl b/gui/slick/interfaces/default/home_postprocess.tmpl
index 95aef08..29bd02f 100644
--- a/gui/slick/interfaces/default/home_postprocess.tmpl
+++ b/gui/slick/interfaces/default/home_postprocess.tmpl
@@ -1,4 +1,6 @@
 #import sickbeard
+<% def sg_var(varname, default=False): return getattr(sickbeard, varname, default) %>#slurp#
+<% def sg_str(varname, default=''): return getattr(sickbeard, varname, default) %>#slurp#
 ##
 #set global $header = 'Process Media'
 #set global $title = $header
@@ -6,7 +8,7 @@
 #set global $sbPath = '../..'
 ##
 #import os.path
-#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_top.tmpl')
+#include $os.path.join($sg_var('PROG_DIR'), 'gui/slick/interfaces/default/inc_top.tmpl')
 
 #if $varExists('header')
 	<h1 class="header">$header</h1>
@@ -26,7 +28,7 @@
 				<label for="episodeDir">
 					<span class="component-title input">Folder to process</span>
 					<span class="component-desc">
-						<input id="episodeDir" name="dir_name" type="text" class="form-control form-control-inline input-sm input350">
+						<input id="episodeDir" name="dir_name" type="text" value="$sg_str('PROCESS_LAST_DIR')" class="form-control form-control-inline input-sm input350">
 						<p class="clear-left">select a folder containing episode files</p>
 					</span>
 				</label>
@@ -39,12 +41,12 @@
 						<select id="process_method" name="process_method" class="form-control form-control-inline input-sm">
 #set $process_methods = {'copy': 'Copy', 'move': 'Move', 'hardlink': 'Hard Link', 'symlink': 'Symbolic Link'}
 #for $method in ('copy', 'move', 'hardlink', 'symlink'):
-							<option value="$method"#echo ('', $selected)[$method == $sickbeard.PROCESS_METHOD]#>$process_methods[$method]</option>
+							<option value="$method"#echo ('', $selected)[$method == $sg_str('PROCESS_LAST_METHOD')]#>$process_methods[$method]</option>
 #end for
 						</select>
 						<label for="cleanup">
-							<span id="move-and-trash" style="display:#echo ('none', 'block')['move' == $sickbeard.PROCESS_METHOD]#">
-								then trash left over subdirs/files<input id="cleanup" name="cleanup" type="checkbox" style="float:none;margin-left:10px">
+							<span id="move-and-trash" style="display:#echo ('none', 'block')['move' == $sg_str('PROCESS_LAST_METHOD')]#">
+								then trash left over subdirs/files<input id="cleanup" name="cleanup" type="checkbox" value="$sg_str('PROCESS_LAST_CLEANUP')" style="float:none;margin-left:10px">
 							</span>
 						</label>
 					</span>
@@ -71,7 +73,7 @@
 				</label>
 			</div>
 
-#if $sickbeard.USE_FAILED_DOWNLOADS:
+#if $sg_var('USE_FAILED_DOWNLOADS'):
 			<div class="field-pair">
 				<label for="failed">
 					<span class="component-title">Mark as failed</span>
@@ -103,4 +105,4 @@ $('#process_method').change(function(){
 //-->
 </script>
 
-#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_bottom.tmpl')
+#include $os.path.join($sg_var('PROG_DIR'), 'gui/slick/interfaces/default/inc_bottom.tmpl')
diff --git a/gui/slick/interfaces/default/inc_addShowOptions.tmpl b/gui/slick/interfaces/default/inc_addShowOptions.tmpl
index 74c7836..d77150d 100644
--- a/gui/slick/interfaces/default/inc_addShowOptions.tmpl
+++ b/gui/slick/interfaces/default/inc_addShowOptions.tmpl
@@ -65,6 +65,16 @@
 			<div id="options-addshow" style="display:none">
 
 				<div class="field-pair alt" style="margin-top:10px">
+					<label for="pause">
+						<span class="component-title">Add paused</span>
+						<span class="component-desc">
+							<input class="cb" type="checkbox" name="pause" id="pause"#if $sg_var('PAUSE_DEFAULT') then $checked else ''#>
+							<p>pause search tasks to allow edits</p>
+						</span>
+					</label>
+				</div>
+
+				<div class="field-pair alt">
 					<label for="prune">
 						<span class="component-title">Keep up to</span>
 						<span class="component-desc">
@@ -99,10 +109,10 @@
 
 #if $sg_var('USE_SUBTITLES'):
 				<div class="field-pair alt">
-					<label for="subtitles">
+					<label for="subs">
 						<span class="component-title">Subtitles</span>
 						<span class="component-desc">
-							<input type="checkbox" name="subtitles" id="subtitles"#if $sg_var('SUBTITLES_DEFAULT') then $checked else ''# />
+							<input type="checkbox" name="subs" id="subs"#if $sg_var('SUBTITLES_DEFAULT') then $checked else ''# />
 							<p>download subtitles for this show</p>
 						</span>
 					</label>
diff --git a/gui/slick/interfaces/default/inc_top.tmpl b/gui/slick/interfaces/default/inc_top.tmpl
index 2fc46d8..e9bde47 100644
--- a/gui/slick/interfaces/default/inc_top.tmpl
+++ b/gui/slick/interfaces/default/inc_top.tmpl
@@ -3,6 +3,7 @@
 #import urllib
 #from sickbeard.common import Quality, SNATCHED_ANY, DOWNLOADED, ARCHIVED, FAILED
 #from sickbeard.helpers import anon_url
+#from sickbeard.show_name_helpers import abbr_showname
 <% def sg_var(varname, default=False): return getattr(sickbeard, varname, default) %>#slurp#
 <% def sg_str(varname, default=''): return getattr(sickbeard, varname, default) %>#slurp#
 #slurp
@@ -167,20 +168,18 @@
 									<div class="menu-item-desc opacity60">trends, tailored suggestions...</div></a></li>
 								<li><a href="$sbRoot/add-shows/imdb-default/" tabindex="$tab#set $tab += 1#"><i class="sgicon-imdb"></i>IMDb Cards
 									<div class="menu-item-desc opacity60">popular decades, watchlists...</div></a></li>
-#set $mc_mode = 'new seasons'
 #set $mc_modes = dict(mc_90days='last 90 days', mc_year='by year', mc_discussed='most discussed', mc_shared='most shared')
-#if $sg_var('MC_MRU') in $mc_modes
-    #set $mc_mode = $mc_modes[$sg_var('MC_MRU')]
-#end if
+#set $mc_mode = $mc_modes.get($sg_var('MC_MRU'), 'new seasons')
 								<li><a href="$sbRoot/add-shows/mc-default/" tabindex="$tab#set $tab += 1#"><i class="sgicon-metac"></i>Metacritic Cards
 									<div class="menu-item-desc opacity60">$mc_mode...</div></a></li>
-#set $tvc_mode = 'new shows'
 #set $tvc_modes = dict(tvc_newshows='new shows', tvc_returning='returning', tvc_latest='latest')
-#if $sg_var('TVC_MRU') in $tvc_modes
-    #set $tvc_mode = $tvc_modes[$sg_var('TVC_MRU')]
-#end if
+#set $tvc_mode = $tvc_modes.get($sg_var('TVC_MRU'), 'new shows')
 								<li><a href="$sbRoot/add-shows/tvc-default/" tabindex="$tab#set $tab += 1#"><i class="sgicon-tvc"></i>TV Calendar Cards
 									<div class="menu-item-desc opacity60">$tvc_mode...</div></a></li>
+#set $ne_modes = dict(ne_newpop='new popular', ne_newtop='new top rated', ne_upcoming='upcoming', ne_trending='trending')
+#set $ne_mode = $ne_modes.get($sg_var('NE_MRU'), 'new popular')
+								<li><a href="$sbRoot/add-shows/ne-default/" tabindex="$tab#set $tab += 1#"><i class="sgicon-ne"></i>Next Episode Cards
+									<div class="menu-item-desc opacity60">$ne_mode...</div></a></li>
 #if $sg_var('USE_ANIDB')
 								<li><a href="$sbRoot/add-shows/anime-default/" tabindex="$tab#set $tab += 1#"><div class="img-anime-16 square-16"></div>Anime Cards
 									<div class="menu-item-desc opacity60">browse anime to add</div></a></li>
@@ -196,7 +195,7 @@
 #else
     #for item in $added_last
         #if $hasattr($item, 'tvid_prodid')
-									<li><a href="$sbRoot/home/view-show?tvid_prodid=$item.tvid_prodid" tabindex="$tab#set $tab += 1#"><i class="sgicon-addshow"></i><span class="truncate">$item.name</span></a></li>
+									<li><a href="$sbRoot/home/view-show?tvid_prodid=$item.tvid_prodid" tabindex="$tab#set $tab += 1#"><i class="sgicon-addshow"></i><span class="truncate">$abbr_showname($item.name)</span></a></li>
         #end if
     #end for
 #end if
diff --git a/gui/slick/interfaces/default/manage.tmpl b/gui/slick/interfaces/default/manage.tmpl
index a43f863..fff5708 100644
--- a/gui/slick/interfaces/default/manage.tmpl
+++ b/gui/slick/interfaces/default/manage.tmpl
@@ -1,25 +1,23 @@
 #import sickbeard
 #from sickbeard.common import *
+#from sickbeard.helpers import get_size, human
 ##
 #set global $title = 'Bulk Change'
 #set global $header = 'Bulk Change'
 #set global $sbPath = '../..'
 #set global $topmenu = 'manage'
+<% def sg_var(varname, default=False): return getattr(sickbeard, varname, default) %>#slurp#
+<% def sg_str(varname, default=''): return getattr(sickbeard, varname, default) %>#slurp#
 ##
 #import os.path
 #include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_top.tmpl')
 ##
-#set $has_any_sports = False
-#set $has_any_anime = False
-#set $has_any_flat_folders = False
-#set $show_list = sorted($sickbeard.showList, key=lambda _x: _x.name)
-#for $cur_show_obj in $show_list
-    #set $has_any_sports |= bool($cur_show_obj.sports)
-    #set $has_any_anime |= bool($cur_show_obj.anime)
-    #set $has_any_flat_folders |= $bool(cur_show_obj.flatten_folders)
-#end for
 <script type="text/javascript" charset="utf-8">
 <!--
+## an arbitrary high number greater than a media file size
+#set $high = 1000000000000
+\$.SickGear.high = $high;
+
 \$.tablesorter.addParser({
 	id: 'showNames',
 	is: function(s) { return !1; },
@@ -38,40 +36,56 @@
 	type: 'numeric'
 });
 ##
-#set $columns_total = 15 - ((1, 0)[$has_any_sports] + (1, 0)[$has_any_anime] + (1, 0)[$has_any_flat_folders] + (1, 0)[$sickbeard.USE_SUBTITLES])
-#set $column_headers = [('false', False), ("'showNames'", False), ("'quality'", False),
-                        ((None, "'sports'")[$has_any_sports], True),
-                        ("'scene'", True), ((None, "'anime'")[$has_any_anime], True),
-                        ((None, "'flatfold'")[$has_any_flat_folders], True), ("'paused'", True),
-                        ("'status'", False), ('false', False), ('false', False), ('false', False),
-                        ((None, 'false')[$sickbeard.USE_SUBTITLES], False), ('false', False), ('false', False)]
+#set $enable_tvinfo = False
+#set $column_headers = [
+    ('!1', '!1', False),
+    ("'showNames'", '!0', False),
+    ("'size'", '!1', False), ('!1', '!1', False),
+    ((None, "'tvinfo'")[$enable_tvinfo], '!1', False),
+    ("'quality'", '!0', False),
+    ((None, "'sports'")[$has_any_sports], '!1', True),
+    ("'scene'", '!1', True),
+    ((None, "'anime'")[$has_any_anime], '!1', True),
+    ((None, "'flatfold'")[$has_any_flat_folders], '!1', True),
+    ("'paused'", '!1', True), ("'status'", '!0', False),
+    ('!1', '!1', False), ('!1', '!1', False), ('!1', '!1', False), ((None, '!1')[$sickbeard.USE_SUBTITLES], '!1', False), ('!1', '!1', False), ('!1', '!1', False)
+]
+#set $columns_total = $len($column_headers) - ((1, 0)[$has_any_sports] + (1, 0)[$has_any_anime] + (1, 0)[$has_any_flat_folders] + (1, 0)[$sickbeard.USE_SUBTITLES])
 #set $headers = []
 #set $text_extract = []
 #set $column = -1
-#for $k, ($c, $img_extract) in enumerate($column_headers)
-    #if None is $c
+#for $sort, $filter, $img_extract in $column_headers
+    #if None is $sort
         #continue
     #end if
     #set $column += 1
-    #set void = $headers.append('\t\t\t%s: { sorter: %s }' % ($column, $c))
+    #set void = $headers.append('\t\t\t%s: {sorter:%s, filter:%s}' % ($column, $sort, $filter))
     #if $img_extract
         #set void = $text_extract.append('\t\t\t%s%s' % ($column, ": function(node) {return $(node).find('img').attr('alt')}"))
     #end if
 #end for
 
-\$(document).ready(function()
+\$(function()
 {
-	\$('#bulkChangeTable:has(tbody tr)').tablesorter({
-		widgets: ['zebra'],
+	\$('#bulk-change-table:has(tbody tr)').tablesorter({
+		widgets: ['zebra','stickyHeaders', 'filter'],
 		sortList: [[1,0]],
 		headers: {
 #echo ',\n'.join($headers)#
 		},
 		textExtraction: {
-			2: function(node) {return \$(node).find('span').text().toLowerCase()},
+#raw
+			1: function(node) {return ((!!$(node).find('i.img-warning-16').length ? '1_' : '0_') + $(node).text().toLowerCase())},
+			2: function(node) {return parseInt($(node).closest('[data-tvid_prodid]').attr('data-size') || -100, 10)},
+#end raw
+#if $enable_tvinfo
+			4: function(node) {return \$(node).find('i').attr('data-tvid')},
+#end if
+			#echo ('5','4')[not $enable_tvinfo]#: function(node) {return \$(node).find('span').text().toLowerCase()},
 #echo ',\n'.join($text_extract)#
 		}
 	});
+
 });
 //-->
 </script>
@@ -81,129 +95,174 @@
 #else
 	<h1 class="title">$title</h1>
 #end if
+
+<style>
+.tvShow{text-align:left}
+.tvShow i{margin-right:6px; margin-bottom:1px}
+.rotate-body span{float:left}
+@supports (transform:translateX(16px) rotate(-45deg)) and (transform-origin:bottom left){
+.tablesorter.rotate th.tablesorter-header.sort-icon-left{background-position:center left; padding: 4px 4px 4px 18px}
+.tablesorter.rotate th.tablesorter-header.sort-icon-bottom{background-position:10px 54px /*28px 45px*/}
+.tablesorter.rotate th.tablesorter-header.sort-icon-status{background-position:30px 54px}
+.tablesorter.rotate th.tablesorter-header.sort-size{background-position:26px 54px; padding:4px 14px 4px 14px}
+.tablesorter.rotate th.tablesorter-header.sort-icon-quality{background-position:20px 54px}
+.rotate-holder{width:20px; margin-bottom:-16px}
+.rotate-holder2{width:20px; margin:22px 0 -22px}
+.rotate-body{width:25px; transform-origin:bottom left; transform:translateX(16px) rotate(-45deg)}
+.rotate-body2{width:25px; transform-origin:bottom left; transform:translateX(20px) rotate(-45deg)}
+.rotate-body span{float:none}
+.rotate th.col-legend, .rotate td.col-legend{width:40px}
+.rotate input[type="checkbox"].right-2px{margin:0 2px 0 0}
+.rotate .img-warning-16{cursor:help}
+}
+#bulk-change-table thead,
+#bulk-change-table-sticky thead,
+#tfoot{position:sticky}
+#bulk-change-table thead,
+#bulk-change-table-sticky thead{top:50px}
+#bulk-change-table-sticky,.tablesorter thead,.tablesorter thead tr,.tablesorter thead tr th, .tablesorter thead tr td{border-spacing:0}
+#tfoot{bottom:0; min-height:34px; line-height:26px}
+#tfoot input[disabled]{cursor:not-allowed}
+.tablesorter-sticky-wrapper{margin-top:50px}
+.tablesorter-filter-row input[disabled]{display:none}
+.tablesorter-filter-row input[type="search"]{background:rgba(255,255,255,0.2); padding:0 3px; border:0; border-radius:4px; color:inherit}
+.tablesorter .tablesorter-header.sort-size-type{padding:0; width:16px; cursor:pointer}
+th.sort-size-type{font-weight:normal}
+.average{border-top:1px solid white; width:9px; margin:0 auto}
+.average i{display:block; line-height:10px; margin-right:1px}
+
+#set $theme_suffix = ('', '-dark')['dark' == $sg_str('THEME_NAME', 'dark')]
+.tip,.tip-average{margin:0 2px}
+.tip-average{border-top:1px solid #echo ('#999', '#666')[not $theme_suffix]#}
+.tip-average,.tip-average i{display:inline-block; line-height:8px}
+.bfr{position:absolute;left:-999px;top:-999px}.bfr img,.spinner{display:inline-block;width:16px;height:16px}.spinner{background:url(${sbRoot}/images/loading16${theme_suffix}.gif) no-repeat 0 0}
+</style>
+<div class="bfr"><img src="$sbRoot/images/loading16${theme_suffix}.gif"></div>
+
 <form name="bulkChangeForm" method="post" action="bulk_change">
 $xsrf_form_html
 
-<table id="bulkChangeTable" class="sickbeardTable tablesorter" cellspacing="1" border="0" cellpadding="0">
+<table id="bulk-change-table" class="sickbeardTable tablesorter rotate" cellspacing="1" border="0" cellpadding="0">
 	<thead>
-		<tr>
-			<th class="col-checkbox">Edit<br /><input type="checkbox" class="bulkCheck" id="editCheck"></th>
-			<th class="nowrap narrow" style="text-align:left">Show Name</th>
-			<th class="col-legend narrow">Quality</th>
+		<tr style="height:70px">  <!-- must inline this css -->
+			<th class="col-checkbox"><div>Edit</div><input type="checkbox" class="bulk-check" id="edit-check"></th>
+			<th class="text-nowrap narrow sort-icon-left" style="text-align:left">Show Name</th>
+			<th class="sort-size col-legend narrow dir-none"><div class="rotate-holder"><div class="rotate-body">Size</div></div></th>
+			<th class="narrow sort-size-type" data-type="E" title="total"><div class="sort-size-type-body">&Sigma;</div><span class="sort-size-type-image" style="display:none; margin-top:8px"><i class="spinner"></i></span></th>
+#if $enable_tvinfo
+			<th class="col-legend narrow sort-icon-bottom"><div class="rotate-holder"><div class="rotate-body">TV Info</div></div></th>
+#end if
+			<th class="col-legend narrow sort-icon-quality"><div class="rotate-holder"><div class="rotate-body">Quality</div></div></th>
 #if $has_any_sports
-			<th class="col-legend narrow">Sports</th>
+			<th class="col-legend narrow sort-icon-bottom"><div class="rotate-holder"><div class="rotate-body">Sports</div></div></th>
 #end if
-			<th class="col-legend narrow">Scene</th>
+			<th class="col-legend narrow sort-icon-bottom"><div class="rotate-holder"><div class="rotate-body2">Scene</div></div></th>
 #if $has_any_anime
-			<th class="col-legend narrow">Anime</th>
+			<th class="col-legend narrow sort-icon-bottom"><div class="rotate-holder"><div class="rotate-body2">Anime</div></div></th>
 #end if
 #if $has_any_flat_folders
-			<th class="col-legend narrow">Flat<br /> Folders</th>
+			<th class="col-legend narrow sort-icon-bottom"><div class="rotate-holder"><div class="rotate-body2">Flat Folders</div></div></th>
 #end if
-			<th class="col-legend narrow">Paused</th>
-			<th class="col-legend narrow">Status</th>
-			<th width="1%">Update<br /><input type="checkbox" class="bulkCheck" id="updateCheck"></th>
-			<th width="1%">Rescan<br /><input type="checkbox" class="bulkCheck" id="refreshCheck"></th>
-			<th width="1%">Rename<br /><input type="checkbox" class="bulkCheck" id="renameCheck"></th>
+			<th class="col-legend narrow sort-icon-bottom"><div class="rotate-holder"><div class="rotate-body2">Paused</div></div></th>
+			<th class="col-legend narrow sort-icon-status"><div class="rotate-holder"><div class="rotate-body2">Status</div></div></th>
+			<th width="1%"><div class="rotate-holder2"><div class="rotate-body"><label><input type="checkbox" class="bulk-check right-2px" id="update-check"><span>Update</span></label></div></div></th>
+			<th width="1%"><div class="rotate-holder2"><div class="rotate-body"><label><input type="checkbox" class="bulk-check right-2px" id="refresh-check"><span>Rescan</span></label></div></div></th>
+			<th width="1%"><div class="rotate-holder2"><div class="rotate-body"><label><input type="checkbox" class="bulk-check right-2px" id="rename-check"><span>Rename</span></label></div></div></th>
 #if $sickbeard.USE_SUBTITLES
-			<th width="1%">Search<br />Subtitle<br /><input type="checkbox" class="bulkCheck" id="subtitleCheck"></th>
+			<th width="1%"><div class="rotate-holder2"><div class="rotate-body"><label><input type="checkbox" class="bulk-check right-2px" id="subtitleCheck"><span>Subtitle</span></label></div></div></th>
 #end if
-##			<!-- <th>Force Metadata Regen <input type="checkbox" class="bulkCheck" id="metadataCheck"></th>//-->
-			<th width="1%">Delete<br /><input type="checkbox" class="bulkCheck" id="deleteCheck"></th>
-			<th width="1%">Remove<br /><input type="checkbox" class="bulkCheck" id="removeCheck"></th>
+			<th width="1%"><div class="rotate-holder2"><div class="rotate-body"><label><input type="checkbox" class="bulk-check right-2px" id="delete-check"><span>Delete</span></label></div></div></th>
+			<th width="1%"><div class="rotate-holder2" style="margin-right:40px;"><div class="rotate-body"><label><input type="checkbox" class="bulk-check right-2px" id="remove-check"><span>Remove</span></label></div></div></th>
 		</tr>
 	</thead>
 
-	<tfoot>
-		<tr>
-			<td rowspan="1" colspan="2" class="align-center alt"><input class="btn pull-left" type="button" value="Edit Selected" id="submitMassEdit"></td>
-			<td rowspan="1" colspan="#echo $columns_total-2#" class="align-right alt"><input class="btn pull-right" type="button" value="Submit" id="submitBulkChange"></td>
-		</tr>
-	</tfoot>
-
 	<tbody>
-
 #set $disabled = ' disabled="disabled"'
-#set $disabled_inprogress_tip = ' title="%s action is currently in progress for this show"'
+#set $disabled_inprogress_tip = ' action is currently in progress for this show'
 #set $disabled_subtitles_tip = ' title="Use edit to enable subtitle search for this show"'
 #set $no = 'no16.png" title="No" alt="No'
 #set $yes = 'yes16.png" title="Yes" alt="Yes'
-#for $cur_show_obj in $show_list
-    #set $option_state = '<input type="checkbox" class="%sCheck" id="%s-{0:s}"%s>'.format($cur_show_obj.tvid_prodid)
+#set $max = $high + 100
+#for $cur_show_obj in $shows + $shows_no_loc
+    #set $show_loc = $cur_show_obj.path
+    #set $show_size = $max if not $show_loc else $get_size($show_loc)
+    #set $option_state = '<input type="checkbox"%s class="%s-check"%s>'
     ##
     #set $curUpdate_disabled = $sickbeard.show_queue_scheduler.action.isBeingUpdated($cur_show_obj)\
                                or $sickbeard.show_queue_scheduler.action.isInUpdateQueue($cur_show_obj)
-    #set $reason = $disabled_inprogress_tip % 'Update'
-    #set $curUpdate = '%s>%s' % (('', $reason)[$curUpdate_disabled],
-                                 $option_state % ('update', 'update', ('', $disabled + $reason)[$curUpdate_disabled]))
+    #set $tip = ' title="Update%s"' % ('', $disabled_inprogress_tip)[$curUpdate_disabled]
+    #set $curUpdate = ($tip, $option_state % (('', $disabled)[$curUpdate_disabled], 'update', $tip))
     ##
     #set $curRefresh_disabled = $sickbeard.show_queue_scheduler.action.isBeingRefreshed($cur_show_obj)\
                                 or $sickbeard.show_queue_scheduler.action.isInRefreshQueue($cur_show_obj)
-    #set $reason = $disabled_inprogress_tip % 'Rescan'
-    #set $curRefresh = '%s>%s' % (('', $reason)[$curRefresh_disabled],
-                                  $option_state % ('refresh', 'refresh', ('', $disabled + $reason)[$curRefresh_disabled]))
+    #set $tip = ' title="Rescan%s"' % ('', $disabled_inprogress_tip)[$curRefresh_disabled]
+    #set $curRefresh = ($tip, $option_state % (('', $disabled)[$curRefresh_disabled], 'refresh', $tip))
     ##
     #set $curRename_disabled = $sickbeard.show_queue_scheduler.action.isBeingRenamed($cur_show_obj)\
                                or $sickbeard.show_queue_scheduler.action.isInRenameQueue($cur_show_obj)
-    #set $reason = $disabled_inprogress_tip % 'Rename'
-    #set $curRename = '%s>%s' % (('', $reason)[$curRename_disabled],
-                                 $option_state % ('rename', 'rename', ('', $disabled + $reason)[$curRename_disabled]))
+    #set $tip = ' title="Rename%s"' % ('', $disabled_inprogress_tip)[$curRename_disabled]
+    #set $curRename = ($tip, $option_state % (('', $disabled)[$curRename_disabled], 'rename', $tip))
     ##
     #set $subtitles_disabled = not $cur_show_obj.subtitles\
                                or $sickbeard.show_queue_scheduler.action.isBeingSubtitled($cur_show_obj)\
                                or $sickbeard.show_queue_scheduler.action.isInSubtitleQueue($cur_show_obj)
-    #set $reason = ($disabled_inprogress_tip % 'Search subtitle', $disabled_subtitles_tip)[not $cur_show_obj.subtitles]
-    #set $curSubtitle = '%s>%s' % (('', $reason)[$subtitles_disabled],
-                                   $option_state % ('subtitle', 'subtitle', ('', $disabled + $reason)[$subtitles_disabled]))
+    #set $tip = (' title="Search subtitle"', (' title="Search subtitle%s"' % $disabled_inprogress_tip,
+                                              $disabled_subtitles_tip)[not $cur_show_obj.subtitles])[$subtitles_disabled]
+    #set $curSubtitle = ($tip, $option_state % (('', $disabled)[$subtitles_disabled], 'subtitle', $tip))
     ##
     #set $curDelete_disabled = $sickbeard.show_queue_scheduler.action.isBeingRenamed($cur_show_obj)\
                                or $sickbeard.show_queue_scheduler.action.isInRenameQueue($cur_show_obj)\
                                or $sickbeard.show_queue_scheduler.action.isInRefreshQueue($cur_show_obj)
-    #set $reason = $disabled_inprogress_tip % 'Rename or rescan'
-    #set $curDelete = '%s>%s' % (('', $reason)[$curDelete_disabled],
-                                 $option_state % ('delete', 'delete', ('', $disabled + $reason)[$curDelete_disabled]))
+    #set $tip = ' title="Delete%s"' % ('', $disabled_inprogress_tip)[$curDelete_disabled]
+    #set $curDelete = ($tip, $option_state % (('', $disabled)[$curDelete_disabled], 'delete', $tip))
     ##
     #set $curRemove_disabled = $sickbeard.show_queue_scheduler.action.isBeingRenamed($cur_show_obj)\
                                or $sickbeard.show_queue_scheduler.action.isInRenameQueue($cur_show_obj)\
                                or $sickbeard.show_queue_scheduler.action.isInRefreshQueue($cur_show_obj)
-    ##set $reason = $disabled_inprogress_tip % 'Rename or rescan'
-    #set $curRemove = '%s>%s' % (('', $reason)[$curRemove_disabled],
-                                 $option_state % ('remove', 'remove', ('', $disabled + $reason)[$curRemove_disabled]))
-		<tr>
-			<td align="center"><input type="checkbox" class="editCheck" id="edit-$cur_show_obj.tvid_prodid"></td>
+    #set $tip = ' title="Remove%s"' % ('', $disabled_inprogress_tip)[$curRemove_disabled]
+    #set $curRemove = ($tip, $option_state % (('', $disabled)[$curRemove_disabled], 'remove', $tip))
+		<tr data-tvid_prodid="$cur_show_obj.tvid_prodid" data-size="$show_size">
+			<td><input type="checkbox" class="edit-check"></td>
     #set $display_name = (re.sub(r'^((?:A(?!\s+to)n?)|The)\s(\w)', r'<span class="article">\1</span> \2', $cur_show_obj.name), $cur_show_obj.name)[$sickbeard.SORT_ARTICLE]
-			<td class="tvShow"><a href="$sbRoot/home/view-show?tvid_prodid=${cur_show_obj.tvid_prodid}">$display_name</a></td>
+			<td class="tvShow">#if not $show_loc#<i class="img-warning-16" title="Location no longer exists"></i>#end if#<a href="$sbRoot/home/view-show?tvid_prodid=${cur_show_obj.tvid_prodid}">$display_name</a></td>
+			<td colspan=2>#if 0 <= $show_size < $max#<span class="text-nowrap ui-size">$human($show_size)</span>#end if#</td>
+    #if $enable_tvinfo
+			<td><i class="icon16 $sickbeard.TVInfoAPI($cur_show_obj.tvid).config['slug']" data-tvid="$cur_show_obj.tvid"></i></td>
+    #end if
     #if $cur_show_obj.quality in $qualityPresets
-			<td align="center"><span class="quality $qualityPresetStrings[$cur_show_obj.quality]">$qualityPresetStrings[$cur_show_obj.quality]</span></td>
+			<td><span class="quality $qualityPresetStrings[$cur_show_obj.quality]">$qualityPresetStrings[$cur_show_obj.quality]</span></td>
     #else
-			<td align="center"><span class="quality Custom">Custom</span></td>
+			<td><span class="quality Custom">Custom</span></td>
     #end if
     #if $has_any_sports
-			<td align="center"><img src="$sbRoot/images/#if 1 == int($cur_show_obj.is_sports) then $yes else $no#" width="16" height="16" /></td>
+			<td><img src="$sbRoot/images/#if 1 == int($cur_show_obj.is_sports) then $yes else $no#" width="16" height="16"></td>
     #end if
-			<td align="center"><img src="$sbRoot/images/#if 1 == int($cur_show_obj.is_scene) then $yes else $no#" width="16" height="16" /></td>
+			<td><img src="$sbRoot/images/#if 1 == int($cur_show_obj.is_scene) then $yes else $no#" width="16" height="16"></td>
     #if $has_any_anime
-			<td align="center"><img src="$sbRoot/images/#if 1 == int($cur_show_obj.is_anime) then $yes else $no#" width="16" height="16" /></td>
+			<td><img src="$sbRoot/images/#if 1 == int($cur_show_obj.is_anime) then $yes else $no#" width="16" height="16"></td>
     #end if
     #if $has_any_flat_folders
-			<td align="center"><img src="$sbRoot/images/#if 1 == int($cur_show_obj.flatten_folders) then $yes else $no#" width="16" height="16" /></td>
+			<td><img src="$sbRoot/images/#if 1 == int($cur_show_obj.flatten_folders) then $yes else $no#" width="16" height="16"></td>
     #end if
-			<td align="center"><img src="$sbRoot/images/#if 1 == int($cur_show_obj.paused) then $yes else $no#" width="16" height="16" /></td>
-			<td align="center">$cur_show_obj.status</td>
-			<td align="center"$curUpdate</td>
-			<td align="center"$curRefresh</td>
-			<td align="center"$curRename</td>
+			<td><img src="$sbRoot/images/#if 1 == int($cur_show_obj.paused) then $yes else $no#" width="16" height="16"></td>
+			<td>$cur_show_obj.status</td>
+			<td$curUpdate[0]>$curUpdate[1]</td>
+			<td$curRefresh[0]>$curRefresh[1]</td>
+			<td$curRename[0]>$curRename[1]</td>
     #if $sickbeard.USE_SUBTITLES
-			<td align="center"$curSubtitle</td>
+			<td$curSubtitle[0]>$curSubtitle[1]</td>
     #end if
-			<td align="center"$curDelete</td>
-			<td align="center"$curRemove</td>
+			<td$curDelete[0]>$curDelete[1]</td>
+			<td$curRemove[0]><span style="margin-right: 40px">$curRemove[1]</span></td>
 		</tr>
 #end for
 	</tbody>
-
 </table>
-
+<div id="tfoot">
+	<span style="width:20%" class="pull-left"><input class="btn pull-left" type="button" value="Edit Selected" id="bulk-change-edit"></span>
+	<span class="stats grey-text"></span>
+	<span style="width:20%" class="pull-right"><input class="btn pull-right" type="button" value="Submit" id="bulk-change-submit"></span>
+</div>
 </form>
 
 #include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_bottom.tmpl')
diff --git a/gui/slick/js/addShowOptions.js b/gui/slick/js/addShowOptions.js
index f53bad7..aa9ea9d 100644
--- a/gui/slick/js/addShowOptions.js
+++ b/gui/slick/js/addShowOptions.js
@@ -16,11 +16,12 @@ $(function(){
 			best_qualities: bestQualArray.join(','),
 			default_wanted_begin: $('#wanted_begin').val(),
 			default_wanted_latest: $('#wanted_latest').val(),
-			default_flatten_folders: $('#flatten_folders').prop('checked'),
+			default_tag: $('#tag').val(),
+			default_pause: $('#pause').prop('checked'),
 			default_scene: $('#scene').prop('checked'),
-			default_subtitles: $('#subtitles').prop('checked'),
-			default_anime: $('#anime').prop('checked'),
-			default_tag: $('#tag').val()
+			default_subtitles: $('#subs').prop('checked'),
+			default_flatten_folders: $('#flatten_folders').prop('checked'),
+			default_anime: $('#anime').prop('checked')
 		});
 
 		new PNotify({
@@ -32,8 +33,8 @@ $(function(){
 		$(this).attr('disabled', true);
 	});
 
-	$('#statusSelect, #quality-preset, #wanted-qualities, #upgrade-qualities, #wanted_begin, #wanted_latest,'
-		+ ' #flatten_folders, #scene, #subtitles, #anime, #tag').change(function() {
+	$('#statusSelect, #quality-preset, #wanted-qualities, #upgrade-qualities, #wanted_begin, #wanted_latest, #tag,'
+		+ ' #pause, #scene, #subs, #flatten_folders, #anime').change(function() {
 		$('#saveDefaultsButton').attr('disabled', false);
 	});
 
@@ -50,10 +51,12 @@ $(function(){
 		if ('none' === el$.css('display')){
 			el$.fadeIn('fast', 'linear', function(){
 				updateOptions(that$, 'More', 'Less');
+				el$.css('opacity', 1);
 			});
 		} else {
 			el$.fadeOut('fast', 'linear', function(){
 				updateOptions(that$, 'Less', 'More');
+				el$.css('opacity', 0);
 			});
 		}
 		return !1;
diff --git a/gui/slick/js/bulkChange.js b/gui/slick/js/bulkChange.js
index e568754..3fb427d 100644
--- a/gui/slick/js/bulkChange.js
+++ b/gui/slick/js/bulkChange.js
@@ -1,112 +1,223 @@
 /** @namespace $.SickGear.Root */
 
-$(document).ready(function() {
+$(function(){
 
-	$('#submitMassEdit').click(function() {
-		var editArr = [];
+	$('#bulk-change-edit').click(function(){
+		var toDo = [];
 
-		$('.editCheck').each(function() {
-			if (true == this.checked) {
-				editArr.push($(this).attr('id').split('-')[1])
-			}
+		$('.edit-check:checked').each(function(){
+			toDo.push($(this).closest('tr').attr('data-tvid_prodid'));
 		});
 
-		if (0 == editArr.length)
+		if (0 === toDo.length)
 			return !1;
 
-		window.location.href = $.SickGear.Root + '/manage/mass-edit?to_edit=' + editArr.join('|');
+		window.location.href = $.SickGear.Root + '/manage/mass-edit?to_edit=' + toDo.join('|');
 	});
 
+	$('#bulk-change-submit').click(function(){
 
-	$('#submitBulkChange').click(function() {
-
-		var updateArr = [], refreshArr = [], renameArr = [], subtitleArr = [],
-			deleteArr = [], removeArr = [], metadataArr = [];
-
-		$('.updateCheck').each(function() {
-			if (true == this.checked) {
-				updateArr.push($(this).attr('id').split('-')[1])
-			}
-		});
-
-		$('.refreshCheck').each(function() {
-			if (true == this.checked) {
-				refreshArr.push($(this).attr('id').split('-')[1])
-			}
-		});
-
-		$('.renameCheck').each(function() {
-			if (true == this.checked) {
-				renameArr.push($(this).attr('id').split('-')[1])
-			}
-		});
-
-		$('.subtitleCheck').each(function() {
-			if (true == this.checked) {
-				subtitleArr.push($(this).attr('id').split('-')[1])
-			}
-		});
-
-		$('.deleteCheck').each(function() {
-			if (true == this.checked) {
-				deleteArr.push($(this).attr('id').split('-')[1])
-			}
-		});
+		var toChange = !1, toDo = {update: [], refresh: [], rename: [], subtitle: [], delete: [], remove: []};
 
-		$('.removeCheck').each(function() {
-			if (true == this.checked) {
-				removeArr.push($(this).attr('id').split('-')[1])
-			}
+		$.each(Object.keys(toDo), function(i, k){
+			$('.' + k + '-check:checked').each(function(){
+				toDo[k].push($(this).closest('tr').attr('data-tvid_prodid'));
+				toChange = !0;
+			});
 		});
 
-/*
-		$('.metadataCheck').each(function() {
-			if (true == this.checked) {
-				metadataArr.push($(this).attr('id').split('-')[1])
-			}
-		});
-*/
-		if (0 == updateArr.length + refreshArr.length + renameArr.length + subtitleArr.length + deleteArr.length + removeArr.length + metadataArr.length)
+		if (!toChange)
 			return !1;
 
-		window.location.href = $.SickGear.Root + '/manage/bulk-change?to_update=' + updateArr.join('|') + '&to_refresh=' + refreshArr.join('|') + '&to_rename=' + renameArr.join('|') + '&to_delete=' + deleteArr.join('|') + '&to_remove=' + removeArr.join('|') + '&to_metadata=' + metadataArr.join('|') + '&to_subtitle=' + subtitleArr.join('|');
+		var confirmArr = [],
+			command = function(){
+				window.location.href = $.SickGear.Root + '/manage/bulk-change?'
+					+ 'to_update=' + toDo.update.join('|')
+					+ '&to_refresh=' + toDo.refresh.join('|')
+					+ '&to_rename=' + toDo.rename.join('|')
+					+ '&to_subtitle=' + toDo.subtitle.join('|')
+					+ '&to_delete=' + toDo.delete.join('|')
+					+ '&to_remove=' + toDo.remove.join('|');
+				return !0;
+			};
+		if(toDo.delete.length){
+			confirmArr.push('delete ' + toDo.delete.length);
+		}
+		if(toDo.remove.length){
+			confirmArr.push('remove ' + toDo.remove.length);
+		}
+		if(!confirmArr.length){
+			command();
+		} else {
+			$.confirm({
+				'title': 'Are you sure ?',
+				'message': confirmArr.join(' and ') + ' show(s)',
+				'buttons': {
+					'Yes': {
+						'class': 'green',
+						'action': command
+					},
+					'No': {
+						'class': 'red',
+						'action': function(){
+						}	// No op. This action property can be omitted.
+					}
+				}
+			});
+		}
 
 	});
 
-	$('.bulkCheck').click(function() {
-
-		var bulkCheck = this, whichBulkCheck = $(bulkCheck).attr('id');
-
-		$('.' + whichBulkCheck).each(function() {
+	var updateButtons = function(){
+		var editBtn$ = $('#bulk-change-edit'), submitBtn$ = $('#bulk-change-submit'), numEdits = $('.edit-check:checked').length,
+			numToDo = $('.update-check:checked, .refresh-check:checked, .rename-check:checked, .delete-check:checked, .remove-check:checked').length;
+		if(!!numEdits){
+			editBtn$.attr('disabled', !1);
+			editBtn$.val('Edit ' + numEdits + ' selected');
+		} else {
+			editBtn$.attr('disabled', !0);
+			editBtn$.val('Select items');
+		}
+		if(!!numToDo){
+			submitBtn$.attr('disabled', !1);
+			submitBtn$.val('Submit ' + numToDo + ' action(s)');
+		} else {
+			submitBtn$.attr('disabled', !0);
+			submitBtn$.val('Select actions');
+		}
+	}
+	updateButtons();
+
+	$('.bulk-check').click(function(){
+
+		$('.' + $(this).attr('id')).each(function(){
 			if (!this.disabled)
 				this.checked = !this.checked
 		});
+		updateButtons();
 	});
 
-	['.editCheck', '.updateCheck', '.refreshCheck', '.renameCheck', '.deleteCheck', '.removeCheck'].forEach(function(name) {
+	['.edit-check', '.update-check', '.refresh-check', '.rename-check', '.delete-check', '.remove-check'].forEach(function(name){
 		var lastCheck = null;
 
-		$(name).click(function(event) {
+		$(name).click(function(event){
+
+			if(!lastCheck || !event.shiftKey){
 
-			if(!lastCheck || !event.shiftKey) {
 				lastCheck = this;
-				return;
+
+			} else {
+				var check = this, found = 0;
+
+				$(name).each(function(){
+					switch (found){
+						case 2:
+							return !1;
+						case 1:
+							if (!this.disabled)
+								this.checked = lastCheck.checked;
+					}
+
+					if (this === check || this === lastCheck)
+						found++;
+				});
 			}
+			updateButtons();
+		});
+	});
 
-			var check = this, found = 0;
+	$('#edit-check, .edit-check').each(function(i, el$){
+		$(el$).parent().attr('title', 'multiselect = ctrl/shift + left click');
+	})
+
+	$.SickGear.onRefreshSize = !1;
+	function presortTable(table$){
+		var asc = $('.sort-size.tablesorter-headerAsc').length,
+			desc = $('.sort-size.tablesorter-headerDesc').length,
+			value;
+
+		if (!!(asc + desc) || !!$.SickGear.onRefreshSize){
+			$('[data-size]').each(function(i, el){
+				value = parseInt($(el).attr('data-size'), 10);
+				$(el).attr('data-size', (!!desc !== !!$.SickGear.onRefreshSize) /* xor */
+					? ((value < 0) ? (-1 * value) + $.SickGear.high : value)
+					: ((value > $.SickGear.high) ? -1 * (value - $.SickGear.high) : value))
+			});
+			table$.trigger('updateCache');
+		}
+	}
+
+	$('#bulk-change-table')
+		.bind('refreshComplete', function(){
+			$.SickGear.onRefreshSize = !0;
+		})
+		.bind('sortEnd', function(){
+			$.SickGear.onRefreshSize = !1;
+
+			var el$ = $('.sort-size-type');
+			if (!!($('.sort-size.tablesorter-headerAsc').length + $('.sort-size.tablesorter-headerDesc').length)){
+				el$.removeClass('tablesorter-headerUnSorted').addClass('tablesorter-headerSorted');
+			} else {
+				el$.removeClass('tablesorter-headerSorted');
+			}
+		})
+		.bind('sortStart', function(e, t){
+			presortTable($(t));
+		})
+		.bind('filterInit filterEnd', function(e, data){
+			$('#tfoot').find('.stats').html(
+				(data.filteredRows === data.totalRows
+					? '<span class="total-rows">' +  data.totalRows + '</span> shows'
+					: '<span class="filter-rows">' + data.filteredRows + '</span> of <span class="total-rows">' + data.totalRows + '</span>  shows (' + (data.totalRows - data.filteredRows) + ' filtered)'));
+		});
 
-			$(name).each(function() {
-				switch (found) {
-					case 2:
-						return !1;
-					case 1:
-						if (!this.disabled)
-							this.checked = lastCheck.checked;
+	$('.sort-size-type').on('click', function(){
+		$('.sort-size-type-body').hide();
+		$('.sort-size-type-image').show();
+		var that = $(this), title = 'total', htmlType = '&Sigma;', dataType = 'E', key = 'Size';
+		if(dataType === $(this).attr('data-type')){
+			title = 'average';
+			htmlType = '<div class="average"><i>x</i></div>';
+			dataType = 'x';
+			key = 'AverageSize';
+		} else if('x' === $(this).attr('data-type')){
+			title = 'largest';
+			htmlType = '&gt';
+			dataType = '>';
+			key = 'Largest';
+		} else if('>' === $(this).attr('data-type')){
+			title = 'smallest';
+			htmlType = '&lt';
+			dataType = '<';
+			key = 'Smallest';
+		}
+
+		var url = $.SickGear.Root + '/home/media_stats';
+		$.getJSON(url).then(function(content){
+			// on success...
+			var html, val, el$;
+			$.each(content, function(tvidProdid, data){
+				html = '---';
+				val = '-10';
+				el$ = $('tr[data-tvid_prodid="' + tvidProdid + '"][data-size]');
+				if (/undefined/.test(data.message) || 'E' === dataType){
+					html = data['h' + key];
+					val = data['b' + key];
 				}
-
-				if (this == check || this == lastCheck)
-					found++;
+				el$.find('.ui-size').html(html);
+				el$.attr('data-size', val);
 			});
+			that.attr('title', title);
+			that.attr('data-type', dataType);
+			that.find('.sort-size-type-body').html(htmlType);
+			$('#bulk-change-table').trigger('updateAll', [!0]);
+			$('.sort-size-type-image').hide();
+			$('.sort-size-type-body').show();
+		}, function(xhr, status, error){
+			// on failure...
+			console.log('data fetch error', url, status + ': ' + error);
+			$('.sort-size-type-image').hide();
+			$('.sort-size-type-body').show();
 		});
 	});
 
diff --git a/gui/slick/js/config.js b/gui/slick/js/config.js
index 2113f77..bae9122 100644
--- a/gui/slick/js/config.js
+++ b/gui/slick/js/config.js
@@ -9,6 +9,27 @@ function toggle$(el, cond){
 	}
 }
 
+function viewsIf(){
+	var that, className, done = [], target;
+	$('[class*="views-if"]').each(function(){
+		that = this;
+		$.each(that.classList, function(){
+			if(/views-if-/i.test(this)){
+				className = this.replace('views-if-', '');
+				if (-1 === $.inArray(className, done)){
+					done.push(className);
+					target = '[class*="show-if-' + className + '"]';
+					if ($('[class*="views-if-' + className + '"]:checked').length){
+						$(target).fadeIn('fast', 'linear');
+					} else {
+						$(target).fadeOut('fast', 'linear');
+					}
+				}
+			}
+		});
+	});
+}
+
 $(document).ready(function () {
 	var enabler = $('.enabler'),
 		viewIf = $('input.view-if'),
@@ -27,6 +48,9 @@ $(document).ready(function () {
 			content_id.fadeOut('fast', 'linear');
 	});
 
+	$('[class*="views-if"]').on({click: viewsIf});
+	viewsIf();
+
 	viewIf.each(function () {
 		$(($(this).prop('checked') ? '.hide-if-' : '.show-if-') + $(this).attr('id')).hide();
 	});
diff --git a/gui/slick/js/inc_top.js b/gui/slick/js/inc_top.js
index 8ac5d13..f39480d 100644
--- a/gui/slick/js/inc_top.js
+++ b/gui/slick/js/inc_top.js
@@ -1,3 +1,11 @@
+/** @namespace $.SickGear.Root */
+/** @namespace content.path */
+/** @namespace content.hSize */
+/** @namespace content.nFiles */
+/** @namespace content.hLargest */
+/** @namespace content.hSmallest */
+/** @namespace content.hAverageSize */
+
 function initActions() {
 	var menu$ = $('#SubMenu');
 	menu$.find('a[href*="/home/restart/"]').addClass('btn restart').html('<i class="sgicon-restart"></i>Restart');
@@ -99,4 +107,46 @@ $(function(){
 					});
 				});
 		})
+
+	$('[data-size] .ui-size, #data-size').each(function(){
+		$(this).qtip({
+			content:{
+				text: function(event, api){
+					// deferred object ensuring the request is only made once
+					var tvidProdid = $('#tvid-prodid').val(), tipText = '';
+					if (/undefined/i.test(tvidProdid)){
+						tvidProdid = $(event.currentTarget).closest('[data-tvid_prodid]').attr('data-tvid_prodid');
+					}
+					$.getJSON($.SickGear.Root + '/home/media_stats', {tvid_prodid: tvidProdid})
+						.then(function(content){
+							// on success...
+							if (/undefined/.test(content[tvidProdid].message)){
+								tipText = (1 === content[tvidProdid].nFiles
+									? '<span class="grey-text">One media file,</span> ' + content[tvidProdid].hAverageSize
+									: '' + content[tvidProdid].nFiles + ' <span class="grey-text">media files,</span>'
+										+ ((content[tvidProdid].hLargest === content[tvidProdid].hSmallest)
+											? (content[tvidProdid].hAverageSize + ' <span class="grey-text">each</span>')
+											: ('<br><span class="grey-text">largest</span> ' + content[tvidProdid].hLargest + ' <span class="grey-text">(<span class="tip">></span>)</span>'
+												+ '<br><span class="grey-text">smallest</span> ' + content[tvidProdid].hSmallest + ' <span class="grey-text">(<span class="tip"><</span>)</span>'
+												+ '<br><span class="grey-text">average size</span> ' + content[tvidProdid].hAverageSize + ' <span class="grey-text">(<span class="tip-average"><i>x</i></span>)</span>')));
+							} else {
+								tipText = '<span class="grey-text">' + content[tvidProdid].message + '</span>';
+							}
+							api.set('content.text',
+								tipText + '<div style="width:100%; border-top:1px dotted; margin-top:3px"></div>'
+										+ '<div style="margin-top:3px">' + '<span class="grey-text">location size</span> ' + content[tvidProdid].hSize + ' <span class="grey-text">(<span class="tip">&Sigma;</span>)</span>' + '</div>'
+										+ content[tvidProdid].path);
+						}, function(xhr, status, error){
+								// on fail...
+								api.set('content.text', status + ': ' + error);
+						});
+					return 'Loading...'; // set initial text
+				}
+			},
+			show: {solo: true},
+			position: {viewport: $(window), my: 'left center', adjust: {y: -10, x: 0}},
+			style: {classes: 'qtip-dark qtip-rounded qtip-shadow'}
+		});
+	});
+
 });
diff --git a/gui/slick/js/loadingStartup.js b/gui/slick/js/loadingStartup.js
index 9233053..1538973 100644
--- a/gui/slick/js/loadingStartup.js
+++ b/gui/slick/js/loadingStartup.js
@@ -4,6 +4,8 @@ var dev = !1,
 	logInfo = dev && console.info.bind(window.console) || function (){},
 	logErr = dev && console.error.bind(window.console) || function (){};
 
+var p_id = 0;
+
 $(function () {
 	ajaxConsumer.checkLoadNotifications();
 });
@@ -53,7 +55,7 @@ var ajaxConsumer = function () {
 
 function putMsg(msg) {
 	var loading = '.loading-step', lastStep$ = $(loading).filter(':last');
-	if (msg !== lastStep$.attr('data-message')) {
+	if (msg !== unescape(lastStep$.attr('data-message'))) {
 		lastStep$.clone().insertAfter(lastStep$);
 
 		var result$ = lastStep$.find('.result');
@@ -64,7 +66,7 @@ function putMsg(msg) {
 			result$.addClass('hide');
 		}
 		lastStep$ =  $(loading).filter(':last');
-		lastStep$.attr('data-message', msg);
+		lastStep$.attr('data-message', escape(msg));
 		lastStep$.find('.desc').text(msg + ': ');
 		lastStep$.find('.count').text('');
 		lastStep$.find('.spinner').removeClass('hide');
@@ -75,11 +77,18 @@ function putMsg(msg) {
 function uiUpdateComplete(data) {
 	$.each(data, function (i, msg) {
 		var loading = '.loading-step';
+		if (msg.msg === 'Process-id') {
+			if (p_id !== msg.progress) {
+				p_id = msg.progress;
+				$('.loading-step:not(:first)').remove();
+			}
+			return
+		}
 		if (i >= $(loading).length) {
 			putMsg(msg.msg);
 		}
 		if (-1 !== msg.progress) {
-			var loading$ = $(loading + '[data-message="' + msg.msg + '"]');
+			var loading$ = $(loading + '[data-message="' + escape(msg.msg) + '"]');
 			loading$.find('.spinner, .result').addClass('hide');
 			loading$.find('.count').text(msg.progress);
 		}
diff --git a/lib/attr/__init__.py b/lib/attr/__init__.py
index 7a79e57..bf329ca 100644
--- a/lib/attr/__init__.py
+++ b/lib/attr/__init__.py
@@ -21,7 +21,7 @@ from ._make import (
 from ._version_info import VersionInfo
 
 
-__version__ = "20.2.0"
+__version__ = "20.3.0"
 __version_info__ = VersionInfo._from_version_string(__version__)
 
 __title__ = "attrs"
diff --git a/lib/attr/__init__.pyi b/lib/attr/__init__.pyi
index 0869914..442d6e7 100644
--- a/lib/attr/__init__.pyi
+++ b/lib/attr/__init__.pyi
@@ -46,6 +46,7 @@ _OnSetAttrType = Callable[[Any, Attribute[Any], Any], Any]
 _OnSetAttrArgType = Union[
     _OnSetAttrType, List[_OnSetAttrType], setters._NoOpType
 ]
+_FieldTransformer = Callable[[type, List[Attribute]], List[Attribute]]
 # FIXME: in reality, if multiple validators are passed they must be in a list
 # or tuple, but those are invariant and so would prevent subtypes of
 # _ValidatorType from working when passed in a list or tuple.
@@ -272,8 +273,10 @@ def attrs(
     eq: Optional[bool] = ...,
     order: Optional[bool] = ...,
     auto_detect: bool = ...,
+    collect_by_mro: bool = ...,
     getstate_setstate: Optional[bool] = ...,
     on_setattr: Optional[_OnSetAttrArgType] = ...,
+    field_transformer: Optional[_FieldTransformer] = ...,
 ) -> _C: ...
 @overload
 def attrs(
@@ -295,8 +298,10 @@ def attrs(
     eq: Optional[bool] = ...,
     order: Optional[bool] = ...,
     auto_detect: bool = ...,
+    collect_by_mro: bool = ...,
     getstate_setstate: Optional[bool] = ...,
     on_setattr: Optional[_OnSetAttrArgType] = ...,
+    field_transformer: Optional[_FieldTransformer] = ...,
 ) -> Callable[[_C], _C]: ...
 @overload
 def define(
@@ -319,6 +324,7 @@ def define(
     auto_detect: bool = ...,
     getstate_setstate: Optional[bool] = ...,
     on_setattr: Optional[_OnSetAttrArgType] = ...,
+    field_transformer: Optional[_FieldTransformer] = ...,
 ) -> _C: ...
 @overload
 def define(
@@ -341,6 +347,7 @@ def define(
     auto_detect: bool = ...,
     getstate_setstate: Optional[bool] = ...,
     on_setattr: Optional[_OnSetAttrArgType] = ...,
+    field_transformer: Optional[_FieldTransformer] = ...,
 ) -> Callable[[_C], _C]: ...
 
 mutable = define
@@ -381,7 +388,9 @@ def make_class(
     auto_exc: bool = ...,
     eq: Optional[bool] = ...,
     order: Optional[bool] = ...,
+    collect_by_mro: bool = ...,
     on_setattr: Optional[_OnSetAttrArgType] = ...,
+    field_transformer: Optional[_FieldTransformer] = ...,
 ) -> type: ...
 
 # _funcs --
@@ -397,6 +406,7 @@ def asdict(
     filter: Optional[_FilterType[Any]] = ...,
     dict_factory: Type[Mapping[Any, Any]] = ...,
     retain_collection_types: bool = ...,
+    value_serializer: Optional[Callable[[type, Attribute, Any], Any]] = ...,
 ) -> Dict[str, Any]: ...
 
 # TODO: add support for returning NamedTuple from the mypy plugin
diff --git a/lib/attr/_compat.py b/lib/attr/_compat.py
index bed5b13..b0ead6e 100644
--- a/lib/attr/_compat.py
+++ b/lib/attr/_compat.py
@@ -91,7 +91,7 @@ if PY2:
         res.data.update(d)  # We blocked update, so we have to do it like this.
         return res
 
-    def just_warn(*args, **kw):  # pragma: nocover
+    def just_warn(*args, **kw):  # pragma: no cover
         """
         We only warn on Python 3 because we are not aware of any concrete
         consequences of not setting the cell on Python 2.
@@ -132,7 +132,7 @@ def make_set_closure_cell():
     """
     # pypy makes this easy. (It also supports the logic below, but
     # why not do the easy/fast thing?)
-    if PYPY:  # pragma: no cover
+    if PYPY:
 
         def set_closure_cell(cell, value):
             cell.__setstate__((value,))
diff --git a/lib/attr/_funcs.py b/lib/attr/_funcs.py
index ca92f9f..e6c930c 100644
--- a/lib/attr/_funcs.py
+++ b/lib/attr/_funcs.py
@@ -13,6 +13,7 @@ def asdict(
     filter=None,
     dict_factory=dict,
     retain_collection_types=False,
+    value_serializer=None,
 ):
     """
     Return the ``attrs`` attribute values of *inst* as a dict.
@@ -32,6 +33,10 @@ def asdict(
     :param bool retain_collection_types: Do not convert to ``list`` when
         encountering an attribute whose type is ``tuple`` or ``set``.  Only
         meaningful if ``recurse`` is ``True``.
+    :param Optional[callable] value_serializer: A hook that is called for every
+        attribute or dict key/value.  It receives the current instance, field
+        and value and must return the (updated) value.  The hook is run *after*
+        the optional *filter* has been applied.
 
     :rtype: return type of *dict_factory*
 
@@ -40,6 +45,7 @@ def asdict(
 
     ..  versionadded:: 16.0.0 *dict_factory*
     ..  versionadded:: 16.1.0 *retain_collection_types*
+    ..  versionadded:: 20.3.0 *value_serializer*
     """
     attrs = fields(inst.__class__)
     rv = dict_factory()
@@ -47,17 +53,30 @@ def asdict(
         v = getattr(inst, a.name)
         if filter is not None and not filter(a, v):
             continue
+
+        if value_serializer is not None:
+            v = value_serializer(inst, a, v)
+
         if recurse is True:
             if has(v.__class__):
                 rv[a.name] = asdict(
-                    v, True, filter, dict_factory, retain_collection_types
+                    v,
+                    True,
+                    filter,
+                    dict_factory,
+                    retain_collection_types,
+                    value_serializer,
                 )
-            elif isinstance(v, (tuple, list, set)):
+            elif isinstance(v, (tuple, list, set, frozenset)):
                 cf = v.__class__ if retain_collection_types is True else list
                 rv[a.name] = cf(
                     [
                         _asdict_anything(
-                            i, filter, dict_factory, retain_collection_types
+                            i,
+                            filter,
+                            dict_factory,
+                            retain_collection_types,
+                            value_serializer,
                         )
                         for i in v
                     ]
@@ -67,10 +86,18 @@ def asdict(
                 rv[a.name] = df(
                     (
                         _asdict_anything(
-                            kk, filter, df, retain_collection_types
+                            kk,
+                            filter,
+                            df,
+                            retain_collection_types,
+                            value_serializer,
                         ),
                         _asdict_anything(
-                            vv, filter, df, retain_collection_types
+                            vv,
+                            filter,
+                            df,
+                            retain_collection_types,
+                            value_serializer,
                         ),
                     )
                     for kk, vv in iteritems(v)
@@ -82,19 +109,36 @@ def asdict(
     return rv
 
 
-def _asdict_anything(val, filter, dict_factory, retain_collection_types):
+def _asdict_anything(
+    val,
+    filter,
+    dict_factory,
+    retain_collection_types,
+    value_serializer,
+):
     """
     ``asdict`` only works on attrs instances, this works on anything.
     """
     if getattr(val.__class__, "__attrs_attrs__", None) is not None:
         # Attrs class.
-        rv = asdict(val, True, filter, dict_factory, retain_collection_types)
-    elif isinstance(val, (tuple, list, set)):
+        rv = asdict(
+            val,
+            True,
+            filter,
+            dict_factory,
+            retain_collection_types,
+            value_serializer,
+        )
+    elif isinstance(val, (tuple, list, set, frozenset)):
         cf = val.__class__ if retain_collection_types is True else list
         rv = cf(
             [
                 _asdict_anything(
-                    i, filter, dict_factory, retain_collection_types
+                    i,
+                    filter,
+                    dict_factory,
+                    retain_collection_types,
+                    value_serializer,
                 )
                 for i in val
             ]
@@ -103,13 +147,20 @@ def _asdict_anything(val, filter, dict_factory, retain_collection_types):
         df = dict_factory
         rv = df(
             (
-                _asdict_anything(kk, filter, df, retain_collection_types),
-                _asdict_anything(vv, filter, df, retain_collection_types),
+                _asdict_anything(
+                    kk, filter, df, retain_collection_types, value_serializer
+                ),
+                _asdict_anything(
+                    vv, filter, df, retain_collection_types, value_serializer
+                ),
             )
             for kk, vv in iteritems(val)
         )
     else:
         rv = val
+        if value_serializer is not None:
+            rv = value_serializer(None, None, rv)
+
     return rv
 
 
@@ -164,7 +215,7 @@ def astuple(
                         retain_collection_types=retain,
                     )
                 )
-            elif isinstance(v, (tuple, list, set)):
+            elif isinstance(v, (tuple, list, set, frozenset)):
                 cf = v.__class__ if retain is True else list
                 rv.append(
                     cf(
@@ -209,6 +260,7 @@ def astuple(
                 rv.append(v)
         else:
             rv.append(v)
+
     return rv if tuple_factory is list else tuple_factory(rv)
 
 
diff --git a/lib/attr/_make.py b/lib/attr/_make.py
index 0fbbd7c..49484f9 100644
--- a/lib/attr/_make.py
+++ b/lib/attr/_make.py
@@ -12,6 +12,7 @@ from operator import itemgetter
 from . import _config, setters
 from ._compat import (
     PY2,
+    PYPY,
     isclass,
     iteritems,
     metadata_proxy,
@@ -223,6 +224,7 @@ def attrib(
     .. deprecated:: 19.2.0 *cmp* Removal on or after 2021-06-01.
     .. versionadded:: 19.2.0 *eq* and *order*
     .. versionadded:: 20.1.0 *on_setattr*
+    .. versionchanged:: 20.3.0 *kw_only* backported to Python 2
     """
     eq, order = _determine_eq_order(cmp, eq, order, True)
 
@@ -373,7 +375,7 @@ def _collect_base_attrs(cls, taken_attr_names):
             if a.inherited or a.name in taken_attr_names:
                 continue
 
-            a = a._assoc(inherited=True)
+            a = a.evolve(inherited=True)
             base_attrs.append(a)
             base_attr_map[a.name] = base_cls
 
@@ -411,7 +413,7 @@ def _collect_base_attrs_broken(cls, taken_attr_names):
             if a.name in taken_attr_names:
                 continue
 
-            a = a._assoc(inherited=True)
+            a = a.evolve(inherited=True)
             taken_attr_names.add(a.name)
             base_attrs.append(a)
             base_attr_map[a.name] = base_cls
@@ -419,7 +421,9 @@ def _collect_base_attrs_broken(cls, taken_attr_names):
     return base_attrs, base_attr_map
 
 
-def _transform_attrs(cls, these, auto_attribs, kw_only, collect_by_mro):
+def _transform_attrs(
+    cls, these, auto_attribs, kw_only, collect_by_mro, field_transformer
+):
     """
     Transform all `_CountingAttr`s on a class into `Attribute`s.
 
@@ -451,6 +455,7 @@ def _transform_attrs(cls, these, auto_attribs, kw_only, collect_by_mro):
                 continue
             annot_names.add(attr_name)
             a = cd.get(attr_name, NOTHING)
+
             if not isinstance(a, _CountingAttr):
                 if a is NOTHING:
                     a = attrib()
@@ -498,8 +503,8 @@ def _transform_attrs(cls, these, auto_attribs, kw_only, collect_by_mro):
     AttrsClass = _make_attr_tuple_class(cls.__name__, attr_names)
 
     if kw_only:
-        own_attrs = [a._assoc(kw_only=True) for a in own_attrs]
-        base_attrs = [a._assoc(kw_only=True) for a in base_attrs]
+        own_attrs = [a.evolve(kw_only=True) for a in own_attrs]
+        base_attrs = [a.evolve(kw_only=True) for a in base_attrs]
 
     attrs = AttrsClass(base_attrs + own_attrs)
 
@@ -518,14 +523,34 @@ def _transform_attrs(cls, these, auto_attribs, kw_only, collect_by_mro):
         if had_default is False and a.default is not NOTHING:
             had_default = True
 
+    if field_transformer is not None:
+        attrs = field_transformer(cls, attrs)
     return _Attributes((attrs, base_attrs, base_attr_map))
 
 
-def _frozen_setattrs(self, name, value):
-    """
-    Attached to frozen classes as __setattr__.
-    """
-    raise FrozenInstanceError()
+if PYPY:
+
+    def _frozen_setattrs(self, name, value):
+        """
+        Attached to frozen classes as __setattr__.
+        """
+        if isinstance(self, BaseException) and name in (
+            "__cause__",
+            "__context__",
+        ):
+            BaseException.__setattr__(self, name, value)
+            return
+
+        raise FrozenInstanceError()
+
+
+else:
+
+    def _frozen_setattrs(self, name, value):
+        """
+        Attached to frozen classes as __setattr__.
+        """
+        raise FrozenInstanceError()
 
 
 def _frozen_delattrs(self, name):
@@ -574,9 +599,15 @@ class _ClassBuilder(object):
         collect_by_mro,
         on_setattr,
         has_custom_setattr,
+        field_transformer,
     ):
         attrs, base_attrs, base_map = _transform_attrs(
-            cls, these, auto_attribs, kw_only, collect_by_mro
+            cls,
+            these,
+            auto_attribs,
+            kw_only,
+            collect_by_mro,
+            field_transformer,
         )
 
         self._cls = cls
@@ -1001,6 +1032,7 @@ def attrs(
     collect_by_mro=False,
     getstate_setstate=None,
     on_setattr=None,
+    field_transformer=None,
 ):
     r"""
     A class decorator that adds `dunder
@@ -1093,12 +1125,14 @@ def attrs(
         argument name.  If a ``__attrs_post_init__`` method exists on the
         class, it will be called after the class is fully initialized.
     :param bool slots: Create a `slotted class <slotted classes>` that's more
-        memory-efficient.
+        memory-efficient. Slotted classes are generally superior to the default
+        dict classes, but have some gotchas you should know about, so we
+        encourage you to read the `glossary entry <slotted classes>`.
     :param bool frozen: Make instances immutable after initialization.  If
         someone attempts to modify a frozen instance,
         `attr.exceptions.FrozenInstanceError` is raised.
 
-        Please note:
+        .. note::
 
             1. This is achieved by installing a custom ``__setattr__`` method
                on your class, so you can't implement your own.
@@ -1184,7 +1218,7 @@ def attrs(
 
     :param on_setattr: A callable that is run whenever the user attempts to set
         an attribute (either by assignment like ``i.x = 42`` or by using
-        `setattr` like ``setattr(i, "x", 42)``). It receives the same argument
+        `setattr` like ``setattr(i, "x", 42)``). It receives the same arguments
         as validators: the instance, the attribute that is being modified, and
         the new value.
 
@@ -1194,6 +1228,11 @@ def attrs(
         If a list of callables is passed, they're automatically wrapped in an
         `attr.setters.pipe`.
 
+    :param Optional[callable] field_transformer:
+        A function that is called with the original class object and all
+        fields right before ``attrs`` finalizes the class.  You can use
+        this, e.g., to automatically add converters or validators to
+        fields based on their types.  See `transform-fields` for more details.
 
     .. versionadded:: 16.0.0 *slots*
     .. versionadded:: 16.1.0 *frozen*
@@ -1223,6 +1262,7 @@ def attrs(
     .. versionadded:: 20.1.0 *collect_by_mro*
     .. versionadded:: 20.1.0 *getstate_setstate*
     .. versionadded:: 20.1.0 *on_setattr*
+    .. versionadded:: 20.3.0 *field_transformer*
     """
     if auto_detect and PY2:
         raise PythonTooOldError(
@@ -1269,6 +1309,7 @@ def attrs(
             collect_by_mro,
             on_setattr,
             has_own_setattr,
+            field_transformer,
         )
         if _determine_whether_to_implement(
             cls, repr, auto_detect, ("__repr__",)
@@ -1903,6 +1944,63 @@ def _assign_with_converter(attr_name, value_var, has_on_setattr):
     )
 
 
+if PY2:
+
+    def _unpack_kw_only_py2(attr_name, default=None):
+        """
+        Unpack *attr_name* from _kw_only dict.
+        """
+        if default is not None:
+            arg_default = ", %s" % default
+        else:
+            arg_default = ""
+        return "%s = _kw_only.pop('%s'%s)" % (
+            attr_name,
+            attr_name,
+            arg_default,
+        )
+
+    def _unpack_kw_only_lines_py2(kw_only_args):
+        """
+        Unpack all *kw_only_args* from _kw_only dict and handle errors.
+
+        Given a list of strings "{attr_name}" and "{attr_name}={default}"
+        generates list of lines of code that pop attrs from _kw_only dict and
+        raise TypeError similar to builtin if required attr is missing or
+        extra key is passed.
+
+        >>> print("\n".join(_unpack_kw_only_lines_py2(["a", "b=42"])))
+        try:
+            a = _kw_only.pop('a')
+            b = _kw_only.pop('b', 42)
+        except KeyError as _key_error:
+            raise TypeError(
+                ...
+        if _kw_only:
+            raise TypeError(
+                ...
+        """
+        lines = ["try:"]
+        lines.extend(
+            "    " + _unpack_kw_only_py2(*arg.split("="))
+            for arg in kw_only_args
+        )
+        lines += """\
+except KeyError as _key_error:
+    raise TypeError(
+        '__init__() missing required keyword-only argument: %s' % _key_error
+    )
+if _kw_only:
+    raise TypeError(
+        '__init__() got an unexpected keyword argument %r'
+        % next(iter(_kw_only))
+    )
+""".split(
+            "\n"
+        )
+        return lines
+
+
 def _attrs_to_init_script(
     attrs,
     frozen,
@@ -2157,14 +2255,14 @@ def _attrs_to_init_script(
     args = ", ".join(args)
     if kw_only_args:
         if PY2:
-            raise PythonTooOldError(
-                "Keyword-only arguments only work on Python 3 and later."
-            )
+            lines = _unpack_kw_only_lines_py2(kw_only_args) + lines
 
-        args += "{leading_comma}*, {kw_only_args}".format(
-            leading_comma=", " if args else "",
-            kw_only_args=", ".join(kw_only_args),
-        )
+            args += "%s**_kw_only" % (", " if args else "",)  # leading comma
+        else:
+            args += "%s*, %s" % (
+                ", " if args else "",  # leading comma
+                ", ".join(kw_only_args),  # kw_only args
+            )
     return (
         """\
 def __init__(self, {args}):
@@ -2181,6 +2279,13 @@ class Attribute(object):
     """
     *Read-only* representation of an attribute.
 
+    Instances of this class are frequently used for introspection purposes
+    like:
+
+    - `fields` returns a tuple of them.
+    - Validators get them passed as the first argument.
+    - The *field transformer* hook receives a list of them.
+
     :attribute name: The name of the attribute.
     :attribute inherited: Whether or not that attribute has been inherited from
         a base class.
@@ -2303,10 +2408,17 @@ class Attribute(object):
 
         return self.eq and self.order
 
-    # Don't use attr.assoc since fields(Attribute) doesn't work
-    def _assoc(self, **changes):
+    # Don't use attr.evolve since fields(Attribute) doesn't work
+    def evolve(self, **changes):
         """
         Copy *self* and apply *changes*.
+
+        This works similarly to `attr.evolve` but that function does not work
+        with ``Attribute``.
+
+        It is mainly meant to be used for `transform-fields`.
+
+        .. versionadded:: 20.3.0
         """
         new = copy.copy(self)
 
diff --git a/lib/attr/_next_gen.py b/lib/attr/_next_gen.py
index b5ff60e..2b5565c 100644
--- a/lib/attr/_next_gen.py
+++ b/lib/attr/_next_gen.py
@@ -33,6 +33,7 @@ def define(
     auto_detect=True,
     getstate_setstate=None,
     on_setattr=None,
+    field_transformer=None,
 ):
     r"""
     The only behavioral differences are the handling of the *auto_attribs*
@@ -72,6 +73,7 @@ def define(
             collect_by_mro=True,
             getstate_setstate=getstate_setstate,
             on_setattr=on_setattr,
+            field_transformer=field_transformer,
         )
 
     def wrap(cls):
diff --git a/lib/certifi/cacert.pem b/lib/certifi/cacert.pem
index a107208..96e2fc6 100644
--- a/lib/certifi/cacert.pem
+++ b/lib/certifi/cacert.pem
@@ -155,112 +155,6 @@ eu6FSqdQgPCnXEqULl8FmTxSQeDNtGPPAUO6nIPcj2A781q0tHuu2guQOHXvgR1m
 0vdXcDazv/wor3ElhVsT/h5/WrQ8
 -----END CERTIFICATE-----
 
-# Issuer: CN=GeoTrust Global CA O=GeoTrust Inc.
-# Subject: CN=GeoTrust Global CA O=GeoTrust Inc.
-# Label: "GeoTrust Global CA"
-# Serial: 144470
-# MD5 Fingerprint: f7:75:ab:29:fb:51:4e:b7:77:5e:ff:05:3c:99:8e:f5
-# SHA1 Fingerprint: de:28:f4:a4:ff:e5:b9:2f:a3:c5:03:d1:a3:49:a7:f9:96:2a:82:12
-# SHA256 Fingerprint: ff:85:6a:2d:25:1d:cd:88:d3:66:56:f4:50:12:67:98:cf:ab:aa:de:40:79:9c:72:2d:e4:d2:b5:db:36:a7:3a
------BEGIN CERTIFICATE-----
-MIIDVDCCAjygAwIBAgIDAjRWMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNVBAYTAlVT
-MRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9i
-YWwgQ0EwHhcNMDIwNTIxMDQwMDAwWhcNMjIwNTIxMDQwMDAwWjBCMQswCQYDVQQG
-EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEbMBkGA1UEAxMSR2VvVHJ1c3Qg
-R2xvYmFsIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2swYYzD9
-9BcjGlZ+W988bDjkcbd4kdS8odhM+KhDtgPpTSEHCIjaWC9mOSm9BXiLnTjoBbdq
-fnGk5sRgprDvgOSJKA+eJdbtg/OtppHHmMlCGDUUna2YRpIuT8rxh0PBFpVXLVDv
-iS2Aelet8u5fa9IAjbkU+BQVNdnARqN7csiRv8lVK83Qlz6cJmTM386DGXHKTubU
-1XupGc1V3sjs0l44U+VcT4wt/lAjNvxm5suOpDkZALeVAjmRCw7+OC7RHQWa9k0+
-bw8HHa8sHo9gOeL6NlMTOdReJivbPagUvTLrGAMoUgRx5aszPeE4uwc2hGKceeoW
-MPRfwCvocWvk+QIDAQABo1MwUTAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTA
-ephojYn7qwVkDBF9qn1luMrMTjAfBgNVHSMEGDAWgBTAephojYn7qwVkDBF9qn1l
-uMrMTjANBgkqhkiG9w0BAQUFAAOCAQEANeMpauUvXVSOKVCUn5kaFOSPeCpilKIn
-Z57QzxpeR+nBsqTP3UEaBU6bS+5Kb1VSsyShNwrrZHYqLizz/Tt1kL/6cdjHPTfS
-tQWVYrmm3ok9Nns4d0iXrKYgjy6myQzCsplFAMfOEVEiIuCl6rYVSAlk6l5PdPcF
-PseKUgzbFbS9bZvlxrFUaKnjaZC2mqUPuLk/IH2uSrW4nOQdtqvmlKXBx4Ot2/Un
-hw4EbNX/3aBd7YdStysVAq45pmp06drE57xNNB6pXE0zX5IJL4hmXXeXxx12E6nV
-5fEWCRE11azbJHFwLJhWC9kXtNHjUStedejV0NxPNO3CBWaAocvmMw==
------END CERTIFICATE-----
-
-# Issuer: CN=GeoTrust Universal CA O=GeoTrust Inc.
-# Subject: CN=GeoTrust Universal CA O=GeoTrust Inc.
-# Label: "GeoTrust Universal CA"
-# Serial: 1
-# MD5 Fingerprint: 92:65:58:8b:a2:1a:31:72:73:68:5c:b4:a5:7a:07:48
-# SHA1 Fingerprint: e6:21:f3:35:43:79:05:9a:4b:68:30:9d:8a:2f:74:22:15:87:ec:79
-# SHA256 Fingerprint: a0:45:9b:9f:63:b2:25:59:f5:fa:5d:4c:6d:b3:f9:f7:2f:f1:93:42:03:35:78:f0:73:bf:1d:1b:46:cb:b9:12
------BEGIN CERTIFICATE-----
-MIIFaDCCA1CgAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQGEwJVUzEW
-MBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEeMBwGA1UEAxMVR2VvVHJ1c3QgVW5pdmVy
-c2FsIENBMB4XDTA0MDMwNDA1MDAwMFoXDTI5MDMwNDA1MDAwMFowRTELMAkGA1UE
-BhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xHjAcBgNVBAMTFUdlb1RydXN0
-IFVuaXZlcnNhbCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKYV
-VaCjxuAfjJ0hUNfBvitbtaSeodlyWL0AG0y/YckUHUWCq8YdgNY96xCcOq9tJPi8
-cQGeBvV8Xx7BDlXKg5pZMK4ZyzBIle0iN430SppyZj6tlcDgFgDgEB8rMQ7XlFTT
-QjOgNB0eRXbdT8oYN+yFFXoZCPzVx5zw8qkuEKmS5j1YPakWaDwvdSEYfyh3peFh
-F7em6fgemdtzbvQKoiFs7tqqhZJmr/Z6a4LauiIINQ/PQvE1+mrufislzDoR5G2v
-c7J2Ha3QsnhnGqQ5HFELZ1aD/ThdDc7d8Lsrlh/eezJS/R27tQahsiFepdaVaH/w
-mZ7cRQg+59IJDTWU3YBOU5fXtQlEIGQWFwMCTFMNaN7VqnJNk22CDtucvc+081xd
-VHppCZbW2xHBjXWotM85yM48vCR85mLK4b19p71XZQvk/iXttmkQ3CgaRr0BHdCX
-teGYO8A3ZNY9lO4L4fUorgtWv3GLIylBjobFS1J72HGrH4oVpjuDWtdYAVHGTEHZ
-f9hBZ3KiKN9gg6meyHv8U3NyWfWTehd2Ds735VzZC1U0oqpbtWpU5xPKV+yXbfRe
-Bi9Fi1jUIxaS5BZuKGNZMN9QAZxjiRqf2xeUgnA3wySemkfWWspOqGmJch+RbNt+
-nhutxx9z3SxPGWX9f5NAEC7S8O08ni4oPmkmM8V7AgMBAAGjYzBhMA8GA1UdEwEB
-/wQFMAMBAf8wHQYDVR0OBBYEFNq7LqqwDLiIJlF0XG0D08DYj3rWMB8GA1UdIwQY
-MBaAFNq7LqqwDLiIJlF0XG0D08DYj3rWMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG
-9w0BAQUFAAOCAgEAMXjmx7XfuJRAyXHEqDXsRh3ChfMoWIawC/yOsjmPRFWrZIRc
-aanQmjg8+uUfNeVE44B5lGiku8SfPeE0zTBGi1QrlaXv9z+ZhP015s8xxtxqv6fX
-IwjhmF7DWgh2qaavdy+3YL1ERmrvl/9zlcGO6JP7/TG37FcREUWbMPEaiDnBTzyn
-ANXH/KttgCJwpQzgXQQpAvvLoJHRfNbDflDVnVi+QTjruXU8FdmbyUqDWcDaU/0z
-uzYYm4UPFd3uLax2k7nZAY1IEKj79TiG8dsKxr2EoyNB3tZ3b4XUhRxQ4K5RirqN
-Pnbiucon8l+f725ZDQbYKxek0nxru18UGkiPGkzns0ccjkxFKyDuSN/n3QmOGKja
-QI2SJhFTYXNd673nxE0pN2HrrDktZy4W1vUAg4WhzH92xH3kt0tm7wNFYGm2DFKW
-koRepqO1pD4r2czYG0eq8kTaT/kD6PAUyz/zg97QwVTjt+gKN02LIFkDMBmhLMi9
-ER/frslKxfMnZmaGrGiR/9nmUxwPi1xpZQomyB40w11Re9epnAahNt3ViZS82eQt
-DF4JbAiXfKM9fJP/P6EUp8+1Xevb2xzEdt+Iub1FBZUbrvxGakyvSOPOrg/Sfuvm
-bJxPgWp6ZKy7PtXny3YuxadIwVyQD8vIP/rmMuGNG2+k5o7Y+SlIis5z/iw=
------END CERTIFICATE-----
-
-# Issuer: CN=GeoTrust Universal CA 2 O=GeoTrust Inc.
-# Subject: CN=GeoTrust Universal CA 2 O=GeoTrust Inc.
-# Label: "GeoTrust Universal CA 2"
-# Serial: 1
-# MD5 Fingerprint: 34:fc:b8:d0:36:db:9e:14:b3:c2:f2:db:8f:e4:94:c7
-# SHA1 Fingerprint: 37:9a:19:7b:41:85:45:35:0c:a6:03:69:f3:3c:2e:af:47:4f:20:79
-# SHA256 Fingerprint: a0:23:4f:3b:c8:52:7c:a5:62:8e:ec:81:ad:5d:69:89:5d:a5:68:0d:c9:1d:1c:b8:47:7f:33:f8:78:b9:5b:0b
------BEGIN CERTIFICATE-----
-MIIFbDCCA1SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBHMQswCQYDVQQGEwJVUzEW
-MBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVy
-c2FsIENBIDIwHhcNMDQwMzA0MDUwMDAwWhcNMjkwMzA0MDUwMDAwWjBHMQswCQYD
-VQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEgMB4GA1UEAxMXR2VvVHJ1
-c3QgVW5pdmVyc2FsIENBIDIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoIC
-AQCzVFLByT7y2dyxUxpZKeexw0Uo5dfR7cXFS6GqdHtXr0om/Nj1XqduGdt0DE81
-WzILAePb63p3NeqqWuDW6KFXlPCQo3RWlEQwAx5cTiuFJnSCegx2oG9NzkEtoBUG
-FF+3Qs17j1hhNNwqCPkuwwGmIkQcTAeC5lvO0Ep8BNMZcyfwqph/Lq9O64ceJHdq
-XbboW0W63MOhBW9Wjo8QJqVJwy7XQYci4E+GymC16qFjwAGXEHm9ADwSbSsVsaxL
-se4YuU6W3Nx2/zu+z18DwPw76L5GG//aQMJS9/7jOvdqdzXQ2o3rXhhqMcceujwb
-KNZrVMaqW9eiLBsZzKIC9ptZvTdrhrVtgrrY6slWvKk2WP0+GfPtDCapkzj4T8Fd
-IgbQl+rhrcZV4IErKIM6+vR7IVEAvlI4zs1meaj0gVbi0IMJR1FbUGrP20gaXT73
-y/Zl92zxlfgCOzJWgjl6W70viRu/obTo/3+NjN8D8WBOWBFM66M/ECuDmgFz2ZRt
-hAAnZqzwcEAJQpKtT5MNYQlRJNiS1QuUYbKHsu3/mjX/hVTK7URDrBs8FmtISgoc
-QIgfksILAAX/8sgCSqSqqcyZlpwvWOB94b67B9xfBHJcMTTD7F8t4D1kkCLm0ey4
-Lt1ZrtmhN79UNdxzMk+MBB4zsslG8dhcyFVQyWi9qLo2CQIDAQABo2MwYTAPBgNV
-HRMBAf8EBTADAQH/MB0GA1UdDgQWBBR281Xh+qQ2+/CfXGJx7Tz0RzgQKzAfBgNV
-HSMEGDAWgBR281Xh+qQ2+/CfXGJx7Tz0RzgQKzAOBgNVHQ8BAf8EBAMCAYYwDQYJ
-KoZIhvcNAQEFBQADggIBAGbBxiPz2eAubl/oz66wsCVNK/g7WJtAJDday6sWSf+z
-dXkzoS9tcBc0kf5nfo/sm+VegqlVHy/c1FEHEv6sFj4sNcZj/NwQ6w2jqtB8zNHQ
-L1EuxBRa3ugZ4T7GzKQp5y6EqgYweHZUcyiYWTjgAA1i00J9IZ+uPTqM1fp3DRgr
-Fg5fNuH8KrUwJM/gYwx7WBr+mbpCErGR9Hxo4sjoryzqyX6uuyo9DRXcNJW2GHSo
-ag/HtPQTxORb7QrSpJdMKu0vbBKJPfEncKpqA1Ihn0CoZ1Dy81of398j9tx4TuaY
-T1U6U+Pv8vSfx3zYWK8pIpe44L2RLrB27FcRz+8pRPPphXpgY+RdM4kX2TGq2tbz
-GDVyz4crL2MjhF2EjD9XoIj8mZEoJmmZ1I+XRL6O1UixpCgp8RW04eWe3fiPpm8m
-1wk8OhwRDqZsN/etRIcsKMfYdIKz0G9KV7s1KSegi+ghp4dkNl3M2Basx7InQJJV
-OCiNUW7dFGdTbHFcJoRNdVq2fmBWqU2t+5sel/MN2dKXVHfaPRK34B7vCAas+YWH
-6aLcr34YEoP9VhdBLtUpgn2Z9DH2canPLAEnpQW5qrJITirvn5NSUZU8UnOOVkwX
-QMAJKOSLakhT2+zNVVXxxvjpoixMptEmX36vWkzaH6byHCx+rgIW0lbQL1dTR+iS
------END CERTIFICATE-----
-
 # Issuer: CN=AAA Certificate Services O=Comodo CA Limited
 # Subject: CN=AAA Certificate Services O=Comodo CA Limited
 # Label: "Comodo AAA Services root"
@@ -294,48 +188,6 @@ l2D4kF501KKaU73yqWjgom7C12yxow+ev+to51byrvLjKzg6CYG1a4XXvi3tPxq3
 smPi9WIsgtRqAEFQ8TmDn5XpNpaYbg==
 -----END CERTIFICATE-----
 
-# Issuer: CN=QuoVadis Root Certification Authority O=QuoVadis Limited OU=Root Certification Authority
-# Subject: CN=QuoVadis Root Certification Authority O=QuoVadis Limited OU=Root Certification Authority
-# Label: "QuoVadis Root CA"
-# Serial: 985026699
-# MD5 Fingerprint: 27:de:36:fe:72:b7:00:03:00:9d:f4:f0:1e:6c:04:24
-# SHA1 Fingerprint: de:3f:40:bd:50:93:d3:9b:6c:60:f6:da:bc:07:62:01:00:89:76:c9
-# SHA256 Fingerprint: a4:5e:de:3b:bb:f0:9c:8a:e1:5c:72:ef:c0:72:68:d6:93:a2:1c:99:6f:d5:1e:67:ca:07:94:60:fd:6d:88:73
------BEGIN CERTIFICATE-----
-MIIF0DCCBLigAwIBAgIEOrZQizANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJC
-TTEZMBcGA1UEChMQUXVvVmFkaXMgTGltaXRlZDElMCMGA1UECxMcUm9vdCBDZXJ0
-aWZpY2F0aW9uIEF1dGhvcml0eTEuMCwGA1UEAxMlUXVvVmFkaXMgUm9vdCBDZXJ0
-aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wMTAzMTkxODMzMzNaFw0yMTAzMTcxODMz
-MzNaMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSUw
-IwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYDVQQDEyVR
-dW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv2G1lVO6V/z68mcLOhrfEYBklbTRvM16z/Yp
-li4kVEAkOPcahdxYTMukJ0KX0J+DisPkBgNbAKVRHnAEdOLB1Dqr1607BxgFjv2D
-rOpm2RgbaIr1VxqYuvXtdj182d6UajtLF8HVj71lODqV0D1VNk7feVcxKh7YWWVJ
-WCCYfqtffp/p1k3sg3Spx2zY7ilKhSoGFPlU5tPaZQeLYzcS19Dsw3sgQUSj7cug
-F+FxZc4dZjH3dgEZyH0DWLaVSR2mEiboxgx24ONmy+pdpibu5cxfvWenAScOospU
-xbF6lR1xHkopigPcakXBpBlebzbNw6Kwt/5cOOJSvPhEQ+aQuwIDAQABo4ICUjCC
-Ak4wPQYIKwYBBQUHAQEEMTAvMC0GCCsGAQUFBzABhiFodHRwczovL29jc3AucXVv
-dmFkaXNvZmZzaG9yZS5jb20wDwYDVR0TAQH/BAUwAwEB/zCCARoGA1UdIASCAREw
-ggENMIIBCQYJKwYBBAG+WAABMIH7MIHUBggrBgEFBQcCAjCBxxqBxFJlbGlhbmNl
-IG9uIHRoZSBRdW9WYWRpcyBSb290IENlcnRpZmljYXRlIGJ5IGFueSBwYXJ0eSBh
-c3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRoZW4gYXBwbGljYWJsZSBzdGFuZGFy
-ZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1c2UsIGNlcnRpZmljYXRpb24gcHJh
-Y3RpY2VzLCBhbmQgdGhlIFF1b1ZhZGlzIENlcnRpZmljYXRlIFBvbGljeS4wIgYI
-KwYBBQUHAgEWFmh0dHA6Ly93d3cucXVvdmFkaXMuYm0wHQYDVR0OBBYEFItLbe3T
-KbkGGew5Oanwl4Rqy+/fMIGuBgNVHSMEgaYwgaOAFItLbe3TKbkGGew5Oanwl4Rq
-y+/foYGEpIGBMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1p
-dGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYD
-VQQDEyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggQ6tlCL
-MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAitQUtf70mpKnGdSk
-fnIYj9lofFIk3WdvOXrEql494liwTXCYhGHoG+NpGA7O+0dQoE7/8CQfvbLO9Sf8
-7C9TqnN7Az10buYWnuulLsS/VidQK2K6vkscPFVcQR0kvoIgR13VRH56FmjffU1R
-cHhXHTMe/QKZnAzNCgVPx7uOpHX6Sm2xgI4JVrmcGmD+XcHXetwReNDWXcG31a0y
-mQM6isxUJTkxgXsTIlG6Rmyhu576BGxJJnSP0nPrzDCi5upZIof4l/UO/erMkqQW
-xFIY6iHOsfHmhIHluqmGKPJDWl0Snawe2ajlCmqnf6CHKc/yiU3U7MXi5nrQNiOK
-SnQ2+Q==
------END CERTIFICATE-----
-
 # Issuer: CN=QuoVadis Root CA 2 O=QuoVadis Limited
 # Subject: CN=QuoVadis Root CA 2 O=QuoVadis Limited
 # Label: "QuoVadis Root CA 2"
@@ -451,33 +303,6 @@ JRDL8Try2frbSVa7pv6nQTXD4IhhyYjH3zYQIphZ6rBK+1YWc26sTfcioU+tHXot
 RSflMMFe8toTyyVCUZVHA4xsIcx0Qu1T/zOLjw9XARYvz6buyXAiFL39vmwLAw==
 -----END CERTIFICATE-----
 
-# Issuer: CN=Sonera Class2 CA O=Sonera
-# Subject: CN=Sonera Class2 CA O=Sonera
-# Label: "Sonera Class 2 Root CA"
-# Serial: 29
-# MD5 Fingerprint: a3:ec:75:0f:2e:88:df:fa:48:01:4e:0b:5c:48:6f:fb
-# SHA1 Fingerprint: 37:f7:6d:e6:07:7c:90:c5:b1:3e:93:1a:b7:41:10:b4:f2:e4:9a:27
-# SHA256 Fingerprint: 79:08:b4:03:14:c1:38:10:0b:51:8d:07:35:80:7f:fb:fc:f8:51:8a:00:95:33:71:05:ba:38:6b:15:3d:d9:27
------BEGIN CERTIFICATE-----
-MIIDIDCCAgigAwIBAgIBHTANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGSTEP
-MA0GA1UEChMGU29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MyIENBMB4XDTAx
-MDQwNjA3Mjk0MFoXDTIxMDQwNjA3Mjk0MFowOTELMAkGA1UEBhMCRkkxDzANBgNV
-BAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJhIENsYXNzMiBDQTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAJAXSjWdyvANlsdE+hY3/Ei9vX+ALTU74W+o
-Z6m/AxxNjG8yR9VBaKQTBME1DJqEQ/xcHf+Js+gXGM2RX/uJ4+q/Tl18GybTdXnt
-5oTjV+WtKcT0OijnpXuENmmz/V52vaMtmdOQTiMofRhj8VQ7Jp12W5dCsv+u8E7s
-3TmVToMGf+dJQMjFAbJUWmYdPfz56TwKnoG4cPABi+QjVHzIrviQHgCWctRUz2Ej
-vOr7nQKV0ba5cTppCD8PtOFCx4j1P5iop7oc4HFx71hXgVB6XGt0Rg6DA5jDjqhu
-8nYybieDwnPz3BjotJPqdURrBGAgcVeHnfO+oJAjPYok4doh28MCAwEAAaMzMDEw
-DwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4ECgQISqCqWITTXjwwCwYDVR0PBAQDAgEG
-MA0GCSqGSIb3DQEBBQUAA4IBAQBazof5FnIVV0sd2ZvnoiYw7JNn39Yt0jSv9zil
-zqsWuasvfDXLrNAPtEwr/IDva4yRXzZ299uzGxnq9LIR/WFxRL8oszodv7ND6J+/
-3DEIcbCdjdY0RzKQxmUk96BKfARzjzlvF4xytb1LyHr4e4PDKE6cCepnP7JnBBvD
-FNr450kkkdAdavphOe9r5yF1BgfYErQhIHBCcYHaPJo2vqZbDWpsmh+Re/n570K6
-Tk6ezAyNlNzZRZxe7EJQY670XcSxEtzKO6gunRRaBXW37Ndj4ro1tgQIkejanZz2
-ZrUYrAqmVCY0M9IbwdR/GjqOC6oybtv8TyWf2TLHllpwrN9M
------END CERTIFICATE-----
-
 # Issuer: CN=XRamp Global Certification Authority O=XRamp Security Services Inc OU=www.xrampsecurity.com
 # Subject: CN=XRamp Global Certification Authority O=XRamp Security Services Inc OU=www.xrampsecurity.com
 # Label: "XRamp Global CA Root"
@@ -776,104 +601,6 @@ hAhm0sQ2fac+EPyI4NSA5QC9qvNOBqN6avlicuMJT+ubDgEj8Z+7fNzcbBGXJbLy
 tGMU0gYqZ4yD9c7qB9iaah7s5Aq7KkzrCWA5zspi2C5u
 -----END CERTIFICATE-----
 
-# Issuer: CN=GeoTrust Primary Certification Authority O=GeoTrust Inc.
-# Subject: CN=GeoTrust Primary Certification Authority O=GeoTrust Inc.
-# Label: "GeoTrust Primary Certification Authority"
-# Serial: 32798226551256963324313806436981982369
-# MD5 Fingerprint: 02:26:c3:01:5e:08:30:37:43:a9:d0:7d:cf:37:e6:bf
-# SHA1 Fingerprint: 32:3c:11:8e:1b:f7:b8:b6:52:54:e2:e2:10:0d:d6:02:90:37:f0:96
-# SHA256 Fingerprint: 37:d5:10:06:c5:12:ea:ab:62:64:21:f1:ec:8c:92:01:3f:c5:f8:2a:e9:8e:e5:33:eb:46:19:b8:de:b4:d0:6c
------BEGIN CERTIFICATE-----
-MIIDfDCCAmSgAwIBAgIQGKy1av1pthU6Y2yv2vrEoTANBgkqhkiG9w0BAQUFADBY
-MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjExMC8GA1UEAxMo
-R2VvVHJ1c3QgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjEx
-MjcwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMFgxCzAJBgNVBAYTAlVTMRYwFAYDVQQK
-Ew1HZW9UcnVzdCBJbmMuMTEwLwYDVQQDEyhHZW9UcnVzdCBQcmltYXJ5IENlcnRp
-ZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAvrgVe//UfH1nrYNke8hCUy3f9oQIIGHWAVlqnEQRr+92/ZV+zmEwu3qDXwK9
-AWbK7hWNb6EwnL2hhZ6UOvNWiAAxz9juapYC2e0DjPt1befquFUWBRaa9OBesYjA
-ZIVcFU2Ix7e64HXprQU9nceJSOC7KMgD4TCTZF5SwFlwIjVXiIrxlQqD17wxcwE0
-7e9GceBrAqg1cmuXm2bgyxx5X9gaBGgeRwLmnWDiNpcB3841kt++Z8dtd1k7j53W
-kBWUvEI0EME5+bEnPn7WinXFsq+W06Lem+SYvn3h6YGttm/81w7a4DSwDRp35+MI
-mO9Y+pyEtzavwt+s0vQQBnBxNQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4G
-A1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQULNVQQZcVi/CPNmFbSvtr2ZnJM5IwDQYJ
-KoZIhvcNAQEFBQADggEBAFpwfyzdtzRP9YZRqSa+S7iq8XEN3GHHoOo0Hnp3DwQ1
-6CePbJC/kRYkRj5KTs4rFtULUh38H2eiAkUxT87z+gOneZ1TatnaYzr4gNfTmeGl
-4b7UVXGYNTq+k+qurUKykG/g/CFNNWMziUnWm07Kx+dOCQD32sfvmWKZd7aVIl6K
-oKv0uHiYyjgZmclynnjNS6yvGaBzEi38wkG6gZHaFloxt/m0cYASSJlyc1pZU8Fj
-UjPtp8nSOQJw+uCxQmYpqptR7TBUIhRf2asdweSU8Pj1K/fqynhG1riR/aYNKxoU
-AT6A8EKglQdebc3MS6RFjasS6LPeWuWgfOgPIh1a6Vk=
------END CERTIFICATE-----
-
-# Issuer: CN=thawte Primary Root CA O=thawte, Inc. OU=Certification Services Division/(c) 2006 thawte, Inc. - For authorized use only
-# Subject: CN=thawte Primary Root CA O=thawte, Inc. OU=Certification Services Division/(c) 2006 thawte, Inc. - For authorized use only
-# Label: "thawte Primary Root CA"
-# Serial: 69529181992039203566298953787712940909
-# MD5 Fingerprint: 8c:ca:dc:0b:22:ce:f5:be:72:ac:41:1a:11:a8:d8:12
-# SHA1 Fingerprint: 91:c6:d6:ee:3e:8a:c8:63:84:e5:48:c2:99:29:5c:75:6c:81:7b:81
-# SHA256 Fingerprint: 8d:72:2f:81:a9:c1:13:c0:79:1d:f1:36:a2:96:6d:b2:6c:95:0a:97:1d:b4:6b:41:99:f4:ea:54:b7:8b:fb:9f
------BEGIN CERTIFICATE-----
-MIIEIDCCAwigAwIBAgIQNE7VVyDV7exJ9C/ON9srbTANBgkqhkiG9w0BAQUFADCB
-qTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMf
-Q2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIw
-MDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxHzAdBgNV
-BAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwHhcNMDYxMTE3MDAwMDAwWhcNMzYw
-NzE2MjM1OTU5WjCBqTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5j
-LjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYG
-A1UECxMvKGMpIDIwMDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
-IG9ubHkxHzAdBgNVBAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCsoPD7gFnUnMekz52hWXMJEEUMDSxuaPFs
-W0hoSVk3/AszGcJ3f8wQLZU0HObrTQmnHNK4yZc2AreJ1CRfBsDMRJSUjQJib+ta
-3RGNKJpchJAQeg29dGYvajig4tVUROsdB58Hum/u6f1OCyn1PoSgAfGcq/gcfomk
-6KHYcWUNo1F77rzSImANuVud37r8UVsLr5iy6S7pBOhih94ryNdOwUxkHt3Ph1i6
-Sk/KaAcdHJ1KxtUvkcx8cXIcxcBn6zL9yZJclNqFwJu/U30rCfSMnZEfl2pSy94J
-NqR32HuHUETVPm4pafs5SSYeCaWAe0At6+gnhcn+Yf1+5nyXHdWdAgMBAAGjQjBA
-MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBR7W0XP
-r87Lev0xkhpqtvNG61dIUDANBgkqhkiG9w0BAQUFAAOCAQEAeRHAS7ORtvzw6WfU
-DW5FvlXok9LOAz/t2iWwHVfLHjp2oEzsUHboZHIMpKnxuIvW1oeEuzLlQRHAd9mz
-YJ3rG9XRbkREqaYB7FViHXe4XI5ISXycO1cRrK1zN44veFyQaEfZYGDm/Ac9IiAX
-xPcW6cTYcvnIc3zfFi8VqT79aie2oetaupgf1eNNZAqdE8hhuvU5HIe6uL17In/2
-/qxAeeWsEG89jxt5dovEN7MhGITlNgDrYyCZuen+MwS7QcjBAvlEYyCegc5C09Y/
-LHbTY5xZ3Y+m4Q6gLkH3LpVHz7z9M/P2C2F+fpErgUfCJzDupxBdN49cOSvkBPB7
-jVaMaA==
------END CERTIFICATE-----
-
-# Issuer: CN=VeriSign Class 3 Public Primary Certification Authority - G5 O=VeriSign, Inc. OU=VeriSign Trust Network/(c) 2006 VeriSign, Inc. - For authorized use only
-# Subject: CN=VeriSign Class 3 Public Primary Certification Authority - G5 O=VeriSign, Inc. OU=VeriSign Trust Network/(c) 2006 VeriSign, Inc. - For authorized use only
-# Label: "VeriSign Class 3 Public Primary Certification Authority - G5"
-# Serial: 33037644167568058970164719475676101450
-# MD5 Fingerprint: cb:17:e4:31:67:3e:e2:09:fe:45:57:93:f3:0a:fa:1c
-# SHA1 Fingerprint: 4e:b6:d5:78:49:9b:1c:cf:5f:58:1e:ad:56:be:3d:9b:67:44:a5:e5
-# SHA256 Fingerprint: 9a:cf:ab:7e:43:c8:d8:80:d0:6b:26:2a:94:de:ee:e4:b4:65:99:89:c3:d0:ca:f1:9b:af:64:05:e4:1a:b7:df
------BEGIN CERTIFICATE-----
-MIIE0zCCA7ugAwIBAgIQGNrRniZ96LtKIVjNzGs7SjANBgkqhkiG9w0BAQUFADCB
-yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJp
-U2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxW
-ZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0
-aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCByjEL
-MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZW
-ZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2ln
-biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJp
-U2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9y
-aXR5IC0gRzUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvJAgIKXo1
-nmAMqudLO07cfLw8RRy7K+D+KQL5VwijZIUVJ/XxrcgxiV0i6CqqpkKzj/i5Vbex
-t0uz/o9+B1fs70PbZmIVYc9gDaTY3vjgw2IIPVQT60nKWVSFJuUrjxuf6/WhkcIz
-SdhDY2pSS9KP6HBRTdGJaXvHcPaz3BJ023tdS1bTlr8Vd6Gw9KIl8q8ckmcY5fQG
-BO+QueQA5N06tRn/Arr0PO7gi+s3i+z016zy9vA9r911kTMZHRxAy3QkGSGT2RT+
-rCpSx4/VBEnkjWNHiDxpg8v+R70rfk/Fla4OndTRQ8Bnc+MUCH7lP59zuDMKz10/
-NIeWiu5T6CUVAgMBAAGjgbIwga8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8E
-BAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2UvZ2lmMCEwHzAH
-BgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVy
-aXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFH/TZafC3ey78DAJ80M5+gKv
-MzEzMA0GCSqGSIb3DQEBBQUAA4IBAQCTJEowX2LP2BqYLz3q3JktvXf2pXkiOOzE
-p6B4Eq1iDkVwZMXnl2YtmAl+X6/WzChl8gGqCBpH3vn5fJJaCGkgDdk+bW48DW7Y
-5gaRQBi5+MHt39tBquCWIMnNZBU4gcmU7qKEKQsTb47bDN0lAtukixlE0kF6BWlK
-WE9gyn6CagsCqiUXObXbf+eEZSqVir2G3l6BFoMtEMze/aiCKm0oHw0LxOXnGiYZ
-4fQRbxC1lfznQgUy286dUV4otp6F01vvpX1FQHKOtw5rDgb7MzVIcbidJ4vEZV8N
-hnacRHr2lVz2XTIIM6RUthg/aFzyQkqFOFSDX9HoLPKsEdao7WNq
------END CERTIFICATE-----
-
 # Issuer: CN=SecureTrust CA O=SecureTrust Corporation
 # Subject: CN=SecureTrust CA O=SecureTrust Corporation
 # Label: "SecureTrust CA"
@@ -1151,185 +878,6 @@ i/nDhDwTqn6Sm1dTk/pwwpEOMfmbZ13pljheX7NzTogVZ96edhBiIL5VaZVDADlN
 9u6wWk5JRFRYX0KD
 -----END CERTIFICATE-----
 
-# Issuer: CN=GeoTrust Primary Certification Authority - G3 O=GeoTrust Inc. OU=(c) 2008 GeoTrust Inc. - For authorized use only
-# Subject: CN=GeoTrust Primary Certification Authority - G3 O=GeoTrust Inc. OU=(c) 2008 GeoTrust Inc. - For authorized use only
-# Label: "GeoTrust Primary Certification Authority - G3"
-# Serial: 28809105769928564313984085209975885599
-# MD5 Fingerprint: b5:e8:34:36:c9:10:44:58:48:70:6d:2e:83:d4:b8:05
-# SHA1 Fingerprint: 03:9e:ed:b8:0b:e7:a0:3c:69:53:89:3b:20:d2:d9:32:3a:4c:2a:fd
-# SHA256 Fingerprint: b4:78:b8:12:25:0d:f8:78:63:5c:2a:a7:ec:7d:15:5e:aa:62:5e:e8:29:16:e2:cd:29:43:61:88:6c:d1:fb:d4
------BEGIN CERTIFICATE-----
-MIID/jCCAuagAwIBAgIQFaxulBmyeUtB9iepwxgPHzANBgkqhkiG9w0BAQsFADCB
-mDELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsT
-MChjKSAyMDA4IEdlb1RydXN0IEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25s
-eTE2MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhv
-cml0eSAtIEczMB4XDTA4MDQwMjAwMDAwMFoXDTM3MTIwMTIzNTk1OVowgZgxCzAJ
-BgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAoYykg
-MjAwOCBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0
-BgNVBAMTLUdlb1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg
-LSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANziXmJYHTNXOTIz
-+uvLh4yn1ErdBojqZI4xmKU4kB6Yzy5jK/BGvESyiaHAKAxJcCGVn2TAppMSAmUm
-hsalifD614SgcK9PGpc/BkTVyetyEH3kMSj7HGHmKAdEc5IiaacDiGydY8hS2pgn
-5whMcD60yRLBxWeDXTPzAxHsatBT4tG6NmCUgLthY2xbF37fQJQeqw3CIShwiP/W
-JmxsYAQlTlV+fe+/lEjetx3dcI0FX4ilm/LC7urRQEFtYjgdVgbFA0dRIBn8exAL
-DmKudlW/X3e+PkkBUz2YJQN2JFodtNuJ6nnltrM7P7pMKEF/BqxqjsHQ9gUdfeZC
-huOl1UcCAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYw
-HQYDVR0OBBYEFMR5yo6hTgMdHNxr2zFblD4/MH8tMA0GCSqGSIb3DQEBCwUAA4IB
-AQAtxRPPVoB7eni9n64smefv2t+UXglpp+duaIy9cr5HqQ6XErhK8WTTOd8lNNTB
-zU6B8A8ExCSzNJbGpqow32hhc9f5joWJ7w5elShKKiePEI4ufIbEAp7aDHdlDkQN
-kv39sxY2+hENHYwOB4lqKVb3cvTdFZx3NWZXqxNT2I7BQMXXExZacse3aQHEerGD
-AWh9jUGhlBjBJVz88P6DAod8DQ3PLghcSkANPuyBYeYk28rgDi0Hsj5W3I31QYUH
-SJsMC8tJP33st/3LjWeJGqvtux6jAAgIFyqCXDFdRootD4abdNlF+9RAsXqqaC2G
-spki4cErx5z481+oghLrGREt
------END CERTIFICATE-----
-
-# Issuer: CN=thawte Primary Root CA - G2 O=thawte, Inc. OU=(c) 2007 thawte, Inc. - For authorized use only
-# Subject: CN=thawte Primary Root CA - G2 O=thawte, Inc. OU=(c) 2007 thawte, Inc. - For authorized use only
-# Label: "thawte Primary Root CA - G2"
-# Serial: 71758320672825410020661621085256472406
-# MD5 Fingerprint: 74:9d:ea:60:24:c4:fd:22:53:3e:cc:3a:72:d9:29:4f
-# SHA1 Fingerprint: aa:db:bc:22:23:8f:c4:01:a1:27:bb:38:dd:f4:1d:db:08:9e:f0:12
-# SHA256 Fingerprint: a4:31:0d:50:af:18:a6:44:71:90:37:2a:86:af:af:8b:95:1f:fb:43:1d:83:7f:1e:56:88:b4:59:71:ed:15:57
------BEGIN CERTIFICATE-----
-MIICiDCCAg2gAwIBAgIQNfwmXNmET8k9Jj1Xm67XVjAKBggqhkjOPQQDAzCBhDEL
-MAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjE4MDYGA1UECxMvKGMp
-IDIwMDcgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxJDAi
-BgNVBAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EgLSBHMjAeFw0wNzExMDUwMDAw
-MDBaFw0zODAxMTgyMzU5NTlaMIGEMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhh
-d3RlLCBJbmMuMTgwNgYDVQQLEy8oYykgMjAwNyB0aGF3dGUsIEluYy4gLSBGb3Ig
-YXV0aG9yaXplZCB1c2Ugb25seTEkMCIGA1UEAxMbdGhhd3RlIFByaW1hcnkgUm9v
-dCBDQSAtIEcyMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEotWcgnuVnfFSeIf+iha/
-BebfowJPDQfGAFG6DAJSLSKkQjnE/o/qycG+1E3/n3qe4rF8mq2nhglzh9HnmuN6
-papu+7qzcMBniKI11KOasf2twu8x+qi58/sIxpHR+ymVo0IwQDAPBgNVHRMBAf8E
-BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUmtgAMADna3+FGO6Lts6K
-DPgR4bswCgYIKoZIzj0EAwMDaQAwZgIxAN344FdHW6fmCsO99YCKlzUNG4k8VIZ3
-KMqh9HneteY4sPBlcIx/AlTCv//YoT7ZzwIxAMSNlPzcU9LcnXgWHxUzI1NS41ox
-XZ3Krr0TKUQNJ1uo52icEvdYPy5yAlejj6EULg==
------END CERTIFICATE-----
-
-# Issuer: CN=thawte Primary Root CA - G3 O=thawte, Inc. OU=Certification Services Division/(c) 2008 thawte, Inc. - For authorized use only
-# Subject: CN=thawte Primary Root CA - G3 O=thawte, Inc. OU=Certification Services Division/(c) 2008 thawte, Inc. - For authorized use only
-# Label: "thawte Primary Root CA - G3"
-# Serial: 127614157056681299805556476275995414779
-# MD5 Fingerprint: fb:1b:5d:43:8a:94:cd:44:c6:76:f2:43:4b:47:e7:31
-# SHA1 Fingerprint: f1:8b:53:8d:1b:e9:03:b6:a6:f0:56:43:5b:17:15:89:ca:f3:6b:f2
-# SHA256 Fingerprint: 4b:03:f4:58:07:ad:70:f2:1b:fc:2c:ae:71:c9:fd:e4:60:4c:06:4c:f5:ff:b6:86:ba:e5:db:aa:d7:fd:d3:4c
------BEGIN CERTIFICATE-----
-MIIEKjCCAxKgAwIBAgIQYAGXt0an6rS0mtZLL/eQ+zANBgkqhkiG9w0BAQsFADCB
-rjELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMf
-Q2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIw
-MDggdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxJDAiBgNV
-BAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EgLSBHMzAeFw0wODA0MDIwMDAwMDBa
-Fw0zNzEyMDEyMzU5NTlaMIGuMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhhd3Rl
-LCBJbmMuMSgwJgYDVQQLEx9DZXJ0aWZpY2F0aW9uIFNlcnZpY2VzIERpdmlzaW9u
-MTgwNgYDVQQLEy8oYykgMjAwOCB0aGF3dGUsIEluYy4gLSBGb3IgYXV0aG9yaXpl
-ZCB1c2Ugb25seTEkMCIGA1UEAxMbdGhhd3RlIFByaW1hcnkgUm9vdCBDQSAtIEcz
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsr8nLPvb2FvdeHsbnndm
-gcs+vHyu86YnmjSjaDFxODNi5PNxZnmxqWWjpYvVj2AtP0LMqmsywCPLLEHd5N/8
-YZzic7IilRFDGF/Eth9XbAoFWCLINkw6fKXRz4aviKdEAhN0cXMKQlkC+BsUa0Lf
-b1+6a4KinVvnSr0eAXLbS3ToO39/fR8EtCab4LRarEc9VbjXsCZSKAExQGbY2SS9
-9irY7CFJXJv2eul/VTV+lmuNk5Mny5K76qxAwJ/C+IDPXfRa3M50hqY+bAtTyr2S
-zhkGcuYMXDhpxwTWvGzOW/b3aJzcJRVIiKHpqfiYnODz1TEoYRFsZ5aNOZnLwkUk
-OQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNV
-HQ4EFgQUrWyqlGCc7eT/+j4KdCtjA/e2Wb8wDQYJKoZIhvcNAQELBQADggEBABpA
-2JVlrAmSicY59BDlqQ5mU1143vokkbvnRFHfxhY0Cu9qRFHqKweKA3rD6z8KLFIW
-oCtDuSWQP3CpMyVtRRooOyfPqsMpQhvfO0zAMzRbQYi/aytlryjvsvXDqmbOe1bu
-t8jLZ8HJnBoYuMTDSQPxYA5QzUbF83d597YV4Djbxy8ooAw/dyZ02SUS2jHaGh7c
-KUGRIjxpp7sC8rZcJwOJ9Abqm+RyguOhCcHpABnTPtRwa7pxpqpYrvS76Wy274fM
-m7v/OeZWYdMKp8RcTGB7BXcmer/YB1IsYvdwY9k5vG8cwnncdimvzsUsZAReiDZu
-MdRAGmI0Nj81Aa6sY6A=
------END CERTIFICATE-----
-
-# Issuer: CN=GeoTrust Primary Certification Authority - G2 O=GeoTrust Inc. OU=(c) 2007 GeoTrust Inc. - For authorized use only
-# Subject: CN=GeoTrust Primary Certification Authority - G2 O=GeoTrust Inc. OU=(c) 2007 GeoTrust Inc. - For authorized use only
-# Label: "GeoTrust Primary Certification Authority - G2"
-# Serial: 80682863203381065782177908751794619243
-# MD5 Fingerprint: 01:5e:d8:6b:bd:6f:3d:8e:a1:31:f8:12:e0:98:73:6a
-# SHA1 Fingerprint: 8d:17:84:d5:37:f3:03:7d:ec:70:fe:57:8b:51:9a:99:e6:10:d7:b0
-# SHA256 Fingerprint: 5e:db:7a:c4:3b:82:a0:6a:87:61:e8:d7:be:49:79:eb:f2:61:1f:7d:d7:9b:f9:1c:1c:6b:56:6a:21:9e:d7:66
------BEGIN CERTIFICATE-----
-MIICrjCCAjWgAwIBAgIQPLL0SAoA4v7rJDteYD7DazAKBggqhkjOPQQDAzCBmDEL
-MAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsTMChj
-KSAyMDA3IEdlb1RydXN0IEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTE2
-MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0
-eSAtIEcyMB4XDTA3MTEwNTAwMDAwMFoXDTM4MDExODIzNTk1OVowgZgxCzAJBgNV
-BAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAoYykgMjAw
-NyBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0BgNV
-BAMTLUdlb1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBH
-MjB2MBAGByqGSM49AgEGBSuBBAAiA2IABBWx6P0DFUPlrOuHNxFi79KDNlJ9RVcL
-So17VDs6bl8VAsBQps8lL33KSLjHUGMcKiEIfJo22Av+0SbFWDEwKCXzXV2juLal
-tJLtbCyf691DiaI8S0iRHVDsJt/WYC69IaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAO
-BgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBVfNVdRVfslsq0DafwBo/q+EVXVMAoG
-CCqGSM49BAMDA2cAMGQCMGSWWaboCd6LuvpaiIjwH5HTRqjySkwCY/tsXzjbLkGT
-qQ7mndwxHLKgpxgceeHHNgIwOlavmnRs9vuD4DPTCF+hnMJbn0bWtsuRBmOiBucz
-rD6ogRLQy7rQkgu2npaqBA+K
------END CERTIFICATE-----
-
-# Issuer: CN=VeriSign Universal Root Certification Authority O=VeriSign, Inc. OU=VeriSign Trust Network/(c) 2008 VeriSign, Inc. - For authorized use only
-# Subject: CN=VeriSign Universal Root Certification Authority O=VeriSign, Inc. OU=VeriSign Trust Network/(c) 2008 VeriSign, Inc. - For authorized use only
-# Label: "VeriSign Universal Root Certification Authority"
-# Serial: 85209574734084581917763752644031726877
-# MD5 Fingerprint: 8e:ad:b5:01:aa:4d:81:e4:8c:1d:d1:e1:14:00:95:19
-# SHA1 Fingerprint: 36:79:ca:35:66:87:72:30:4d:30:a5:fb:87:3b:0f:a7:7b:b7:0d:54
-# SHA256 Fingerprint: 23:99:56:11:27:a5:71:25:de:8c:ef:ea:61:0d:df:2f:a0:78:b5:c8:06:7f:4e:82:82:90:bf:b8:60:e8:4b:3c
------BEGIN CERTIFICATE-----
-MIIEuTCCA6GgAwIBAgIQQBrEZCGzEyEDDrvkEhrFHTANBgkqhkiG9w0BAQsFADCB
-vTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwOCBWZXJp
-U2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MTgwNgYDVQQDEy9W
-ZXJpU2lnbiBVbml2ZXJzYWwgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAe
-Fw0wODA0MDIwMDAwMDBaFw0zNzEyMDEyMzU5NTlaMIG9MQswCQYDVQQGEwJVUzEX
-MBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0
-IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAyMDA4IFZlcmlTaWduLCBJbmMuIC0gRm9y
-IGF1dGhvcml6ZWQgdXNlIG9ubHkxODA2BgNVBAMTL1ZlcmlTaWduIFVuaXZlcnNh
-bCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAx2E3XrEBNNti1xWb/1hajCMj1mCOkdeQmIN65lgZOIzF
-9uVkhbSicfvtvbnazU0AtMgtc6XHaXGVHzk8skQHnOgO+k1KxCHfKWGPMiJhgsWH
-H26MfF8WIFFE0XBPV+rjHOPMee5Y2A7Cs0WTwCznmhcrewA3ekEzeOEz4vMQGn+H
-LL729fdC4uW/h2KJXwBL38Xd5HVEMkE6HnFuacsLdUYI0crSK5XQz/u5QGtkjFdN
-/BMReYTtXlT2NJ8IAfMQJQYXStrxHXpma5hgZqTZ79IugvHw7wnqRMkVauIDbjPT
-rJ9VAMf2CGqUuV/c4DPxhGD5WycRtPwW8rtWaoAljQIDAQABo4GyMIGvMA8GA1Ud
-EwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMG0GCCsGAQUFBwEMBGEwX6FdoFsw
-WTBXMFUWCWltYWdlL2dpZjAhMB8wBwYFKw4DAhoEFI/l0xqGrI2Oa8PPgGrUSBgs
-exkuMCUWI2h0dHA6Ly9sb2dvLnZlcmlzaWduLmNvbS92c2xvZ28uZ2lmMB0GA1Ud
-DgQWBBS2d/ppSEefUxLVwuoHMnYH0ZcHGTANBgkqhkiG9w0BAQsFAAOCAQEASvj4
-sAPmLGd75JR3Y8xuTPl9Dg3cyLk1uXBPY/ok+myDjEedO2Pzmvl2MpWRsXe8rJq+
-seQxIcaBlVZaDrHC1LGmWazxY8u4TB1ZkErvkBYoH1quEPuBUDgMbMzxPcP1Y+Oz
-4yHJJDnp/RVmRvQbEdBNc6N9Rvk97ahfYtTxP/jgdFcrGJ2BtMQo2pSXpXDrrB2+
-BxHw1dvd5Yzw1TKwg+ZX4o+/vqGqvz0dtdQ46tewXDpPaj+PwGZsY6rp2aQW9IHR
-lRQOfc2VNNnSj3BzgXucfr2YYdhFh5iQxeuGMMY1v/D/w1WIg0vvBZIGcfK4mJO3
-7M2CYfE45k+XmCpajQ==
------END CERTIFICATE-----
-
-# Issuer: CN=VeriSign Class 3 Public Primary Certification Authority - G4 O=VeriSign, Inc. OU=VeriSign Trust Network/(c) 2007 VeriSign, Inc. - For authorized use only
-# Subject: CN=VeriSign Class 3 Public Primary Certification Authority - G4 O=VeriSign, Inc. OU=VeriSign Trust Network/(c) 2007 VeriSign, Inc. - For authorized use only
-# Label: "VeriSign Class 3 Public Primary Certification Authority - G4"
-# Serial: 63143484348153506665311985501458640051
-# MD5 Fingerprint: 3a:52:e1:e7:fd:6f:3a:e3:6f:f3:6f:99:1b:f9:22:41
-# SHA1 Fingerprint: 22:d5:d8:df:8f:02:31:d1:8d:f7:9d:b7:cf:8a:2d:64:c9:3f:6c:3a
-# SHA256 Fingerprint: 69:dd:d7:ea:90:bb:57:c9:3e:13:5d:c8:5e:a6:fc:d5:48:0b:60:32:39:bd:c4:54:fc:75:8b:2a:26:cf:7f:79
------BEGIN CERTIFICATE-----
-MIIDhDCCAwqgAwIBAgIQL4D+I4wOIg9IZxIokYesszAKBggqhkjOPQQDAzCByjEL
-MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZW
-ZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2ln
-biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJp
-U2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9y
-aXR5IC0gRzQwHhcNMDcxMTA1MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCByjELMAkG
-A1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJp
-U2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2lnbiwg
-SW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2ln
-biBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5
-IC0gRzQwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAASnVnp8Utpkmw4tXNherJI9/gHm
-GUo9FANL+mAnINmDiWn6VMaaGF5VKmTeBvaNSjutEDxlPZCIBIngMGGzrl0Bp3ve
-fLK+ymVhAIau2o970ImtTR1ZmkGxvEeA3J5iw/mjgbIwga8wDwYDVR0TAQH/BAUw
-AwEB/zAOBgNVHQ8BAf8EBAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJ
-aW1hZ2UvZ2lmMCEwHzAHBgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYj
-aHR0cDovL2xvZ28udmVyaXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFLMW
-kf3upm7ktS5Jj4d4gYDs5bG1MAoGCCqGSM49BAMDA2gAMGUCMGYhDBgmYFo4e1ZC
-4Kf8NoRRkSAsdk1DPcQdhCPQrNZ8NQbOzWm9kA3bbEhCHQ6qQgIxAJw9SDkjOVga
-FRJZap7v1VmyHVIsmXHNxynfGyphe3HR3vPA5Q06Sqotp9iGKt0uEA==
------END CERTIFICATE-----
-
 # Issuer: CN=NetLock Arany (Class Gold) F\u0151tan\xfas\xedtv\xe1ny O=NetLock Kft. OU=Tan\xfas\xedtv\xe1nykiad\xf3k (Certification Services)
 # Subject: CN=NetLock Arany (Class Gold) F\u0151tan\xfas\xedtv\xe1ny O=NetLock Kft. OU=Tan\xfas\xedtv\xe1nykiad\xf3k (Certification Services)
 # Label: "NetLock Arany (Class Gold) F\u0151tan\xfas\xedtv\xe1ny"
@@ -1565,105 +1113,6 @@ naM8THLCV8Sg1Mw4J87VBp6iSNnpn86CcDaTmjvfliHjWbcM2pE38P1ZWrOZyGls
 QyYBNWNgVYkDOnXYukrZVP/u3oDYLdE41V4tC5h9Pmzb/CaIxw==
 -----END CERTIFICATE-----
 
-# Issuer: CN=Chambers of Commerce Root - 2008 O=AC Camerfirma S.A.
-# Subject: CN=Chambers of Commerce Root - 2008 O=AC Camerfirma S.A.
-# Label: "Chambers of Commerce Root - 2008"
-# Serial: 11806822484801597146
-# MD5 Fingerprint: 5e:80:9e:84:5a:0e:65:0b:17:02:f3:55:18:2a:3e:d7
-# SHA1 Fingerprint: 78:6a:74:ac:76:ab:14:7f:9c:6a:30:50:ba:9e:a8:7e:fe:9a:ce:3c
-# SHA256 Fingerprint: 06:3e:4a:fa:c4:91:df:d3:32:f3:08:9b:85:42:e9:46:17:d8:93:d7:fe:94:4e:10:a7:93:7e:e2:9d:96:93:c0
------BEGIN CERTIFICATE-----
-MIIHTzCCBTegAwIBAgIJAKPaQn6ksa7aMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYD
-VQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0
-IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3
-MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xKTAnBgNVBAMTIENoYW1iZXJz
-IG9mIENvbW1lcmNlIFJvb3QgLSAyMDA4MB4XDTA4MDgwMTEyMjk1MFoXDTM4MDcz
-MTEyMjk1MFowga4xCzAJBgNVBAYTAkVVMUMwQQYDVQQHEzpNYWRyaWQgKHNlZSBj
-dXJyZW50IGFkZHJlc3MgYXQgd3d3LmNhbWVyZmlybWEuY29tL2FkZHJlc3MpMRIw
-EAYDVQQFEwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENhbWVyZmlybWEgUy5BLjEp
-MCcGA1UEAxMgQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdCAtIDIwMDgwggIiMA0G
-CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCvAMtwNyuAWko6bHiUfaN/Gh/2NdW9
-28sNRHI+JrKQUrpjOyhYb6WzbZSm891kDFX29ufyIiKAXuFixrYp4YFs8r/lfTJq
-VKAyGVn+H4vXPWCGhSRv4xGzdz4gljUha7MI2XAuZPeEklPWDrCQiorjh40G072Q
-DuKZoRuGDtqaCrsLYVAGUvGef3bsyw/QHg3PmTA9HMRFEFis1tPo1+XqxQEHd9ZR
-5gN/ikilTWh1uem8nk4ZcfUyS5xtYBkL+8ydddy/Js2Pk3g5eXNeJQ7KXOt3EgfL
-ZEFHcpOrUMPrCXZkNNI5t3YRCQ12RcSprj1qr7V9ZS+UWBDsXHyvfuK2GNnQm05a
-Sd+pZgvMPMZ4fKecHePOjlO+Bd5gD2vlGts/4+EhySnB8esHnFIbAURRPHsl18Tl
-UlRdJQfKFiC4reRB7noI/plvg6aRArBsNlVq5331lubKgdaX8ZSD6e2wsWsSaR6s
-+12pxZjptFtYer49okQ6Y1nUCyXeG0+95QGezdIp1Z8XGQpvvwyQ0wlf2eOKNcx5
-Wk0ZN5K3xMGtr/R5JJqyAQuxr1yW84Ay+1w9mPGgP0revq+ULtlVmhduYJ1jbLhj
-ya6BXBg14JC7vjxPNyK5fuvPnnchpj04gftI2jE9K+OJ9dC1vX7gUMQSibMjmhAx
-hduub+84Mxh2EQIDAQABo4IBbDCCAWgwEgYDVR0TAQH/BAgwBgEB/wIBDDAdBgNV
-HQ4EFgQU+SSsD7K1+HnA+mCIG8TZTQKeFxkwgeMGA1UdIwSB2zCB2IAU+SSsD7K1
-+HnA+mCIG8TZTQKeFxmhgbSkgbEwga4xCzAJBgNVBAYTAkVVMUMwQQYDVQQHEzpN
-YWRyaWQgKHNlZSBjdXJyZW50IGFkZHJlc3MgYXQgd3d3LmNhbWVyZmlybWEuY29t
-L2FkZHJlc3MpMRIwEAYDVQQFEwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENhbWVy
-ZmlybWEgUy5BLjEpMCcGA1UEAxMgQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdCAt
-IDIwMDiCCQCj2kJ+pLGu2jAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRV
-HSAAMCowKAYIKwYBBQUHAgEWHGh0dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20w
-DQYJKoZIhvcNAQEFBQADggIBAJASryI1wqM58C7e6bXpeHxIvj99RZJe6dqxGfwW
-PJ+0W2aeaufDuV2I6A+tzyMP3iU6XsxPpcG1Lawk0lgH3qLPaYRgM+gQDROpI9CF
-5Y57pp49chNyM/WqfcZjHwj0/gF/JM8rLFQJ3uIrbZLGOU8W6jx+ekbURWpGqOt1
-glanq6B8aBMz9p0w8G8nOSQjKpD9kCk18pPfNKXG9/jvjA9iSnyu0/VU+I22mlaH
-FoI6M6taIgj3grrqLuBHmrS1RaMFO9ncLkVAO+rcf+g769HsJtg1pDDFOqxXnrN2
-pSB7+R5KBWIBpih1YJeSDW4+TTdDDZIVnBgizVGZoCkaPF+KMjNbMMeJL0eYD6MD
-xvbxrN8y8NmBGuScvfaAFPDRLLmF9dijscilIeUcE5fuDr3fKanvNFNb0+RqE4QG
-tjICxFKuItLcsiFCGtpA8CnJ7AoMXOLQusxI0zcKzBIKinmwPQN/aUv0NCB9szTq
-jktk9T79syNnFQ0EuPAtwQlRPLJsFfClI9eDdOTlLsn+mCdCxqvGnrDQWzilm1De
-fhiYtUU79nm06PcaewaD+9CL2rvHvRirCG88gGtAPxkZumWK5r7VXNM21+9AUiRg
-OGcEMeyP84LG3rlV8zsxkVrctQgVrXYlCg17LofiDKYGvCYQbTed7N14jHyAxfDZ
-d0jQ
------END CERTIFICATE-----
-
-# Issuer: CN=Global Chambersign Root - 2008 O=AC Camerfirma S.A.
-# Subject: CN=Global Chambersign Root - 2008 O=AC Camerfirma S.A.
-# Label: "Global Chambersign Root - 2008"
-# Serial: 14541511773111788494
-# MD5 Fingerprint: 9e:80:ff:78:01:0c:2e:c1:36:bd:fe:96:90:6e:08:f3
-# SHA1 Fingerprint: 4a:bd:ee:ec:95:0d:35:9c:89:ae:c7:52:a1:2c:5b:29:f6:d6:aa:0c
-# SHA256 Fingerprint: 13:63:35:43:93:34:a7:69:80:16:a0:d3:24:de:72:28:4e:07:9d:7b:52:20:bb:8f:bd:74:78:16:ee:be:ba:ca
------BEGIN CERTIFICATE-----
-MIIHSTCCBTGgAwIBAgIJAMnN0+nVfSPOMA0GCSqGSIb3DQEBBQUAMIGsMQswCQYD
-VQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0
-IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3
-MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xJzAlBgNVBAMTHkdsb2JhbCBD
-aGFtYmVyc2lnbiBSb290IC0gMjAwODAeFw0wODA4MDExMjMxNDBaFw0zODA3MzEx
-MjMxNDBaMIGsMQswCQYDVQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUgY3Vy
-cmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAG
-A1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xJzAl
-BgNVBAMTHkdsb2JhbCBDaGFtYmVyc2lnbiBSb290IC0gMjAwODCCAiIwDQYJKoZI
-hvcNAQEBBQADggIPADCCAgoCggIBAMDfVtPkOpt2RbQT2//BthmLN0EYlVJH6xed
-KYiONWwGMi5HYvNJBL99RDaxccy9Wglz1dmFRP+RVyXfXjaOcNFccUMd2drvXNL7
-G706tcuto8xEpw2uIRU/uXpbknXYpBI4iRmKt4DS4jJvVpyR1ogQC7N0ZJJ0YPP2
-zxhPYLIj0Mc7zmFLmY/CDNBAspjcDahOo7kKrmCgrUVSY7pmvWjg+b4aqIG7HkF4
-ddPB/gBVsIdU6CeQNR1MM62X/JcumIS/LMmjv9GYERTtY/jKmIhYF5ntRQOXfjyG
-HoiMvvKRhI9lNNgATH23MRdaKXoKGCQwoze1eqkBfSbW+Q6OWfH9GzO1KTsXO0G2
-Id3UwD2ln58fQ1DJu7xsepeY7s2MH/ucUa6LcL0nn3HAa6x9kGbo1106DbDVwo3V
-yJ2dwW3Q0L9R5OP4wzg2rtandeavhENdk5IMagfeOx2YItaswTXbo6Al/3K1dh3e
-beksZixShNBFks4c5eUzHdwHU1SjqoI7mjcv3N2gZOnm3b2u/GSFHTynyQbehP9r
-6GsaPMWis0L7iwk+XwhSx2LE1AVxv8Rk5Pihg+g+EpuoHtQ2TS9x9o0o9oOpE9Jh
-wZG7SMA0j0GMS0zbaRL/UJScIINZc+18ofLx/d33SdNDWKBWY8o9PeU1VlnpDsog
-zCtLkykPAgMBAAGjggFqMIIBZjASBgNVHRMBAf8ECDAGAQH/AgEMMB0GA1UdDgQW
-BBS5CcqcHtvTbDprru1U8VuTBjUuXjCB4QYDVR0jBIHZMIHWgBS5CcqcHtvTbDpr
-ru1U8VuTBjUuXqGBsqSBrzCBrDELMAkGA1UEBhMCRVUxQzBBBgNVBAcTOk1hZHJp
-ZCAoc2VlIGN1cnJlbnQgYWRkcmVzcyBhdCB3d3cuY2FtZXJmaXJtYS5jb20vYWRk
-cmVzcykxEjAQBgNVBAUTCUE4Mjc0MzI4NzEbMBkGA1UEChMSQUMgQ2FtZXJmaXJt
-YSBTLkEuMScwJQYDVQQDEx5HbG9iYWwgQ2hhbWJlcnNpZ24gUm9vdCAtIDIwMDiC
-CQDJzdPp1X0jzjAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRVHSAAMCow
-KAYIKwYBBQUHAgEWHGh0dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20wDQYJKoZI
-hvcNAQEFBQADggIBAICIf3DekijZBZRG/5BXqfEv3xoNa/p8DhxJJHkn2EaqbylZ
-UohwEurdPfWbU1Rv4WCiqAm57OtZfMY18dwY6fFn5a+6ReAJ3spED8IXDneRRXoz
-X1+WLGiLwUePmJs9wOzL9dWCkoQ10b42OFZyMVtHLaoXpGNR6woBrX/sdZ7LoR/x
-fxKxueRkf2fWIyr0uDldmOghp+G9PUIadJpwr2hsUF1Jz//7Dl3mLEfXgTpZALVz
-a2Mg9jFFCDkO9HB+QHBaP9BrQql0PSgvAm11cpUJjUhjxsYjV5KTXjXBjfkK9yyd
-Yhz2rXzdpjEetrHHfoUm+qRqtdpjMNHvkzeyZi99Bffnt0uYlDXA2TopwZ2yUDMd
-SqlapskD7+3056huirRXhOukP9DuqqqHW2Pok+JrqNS4cnhrG+055F3Lm6qH1U9O
-AP7Zap88MQ8oAgF9mOinsKJknnn4SPIVqczmyETrP3iZ8ntxPjzxmKfFGBI/5rso
-M0LpRQp8bfKGeS/Fghl9CYl8slR2iK7ewfPM4W7bMdaTrpmg7yVqc5iJWzouE4ge
-v8CSlDQb4ye3ix5vQv/n6TebUB0tovkC7stYWDpxvGjjqsGvHCgfotwjZT+B6q6Z
-09gwzxMNTxXJhLynSC34MCN32EZLeW32jO06f2ARePTpm67VVMB0gNELQp/B
------END CERTIFICATE-----
-
 # Issuer: CN=Go Daddy Root Certificate Authority - G2 O=GoDaddy.com, Inc.
 # Subject: CN=Go Daddy Root Certificate Authority - G2 O=GoDaddy.com, Inc.
 # Label: "Go Daddy Root Certificate Authority - G2"
@@ -2075,35 +1524,6 @@ LysRJyU3eExRarDzzFhdFPFqSBX/wge2sY0PjlxQRrM9vwGYT7JZVEc+NHt4bVaT
 LnPqZih4zR0Uv6CPLy64Lo7yFIrM6bV8+2ydDKXhlg==
 -----END CERTIFICATE-----
 
-# Issuer: O=Trustis Limited OU=Trustis FPS Root CA
-# Subject: O=Trustis Limited OU=Trustis FPS Root CA
-# Label: "Trustis FPS Root CA"
-# Serial: 36053640375399034304724988975563710553
-# MD5 Fingerprint: 30:c9:e7:1e:6b:e6:14:eb:65:b2:16:69:20:31:67:4d
-# SHA1 Fingerprint: 3b:c0:38:0b:33:c3:f6:a6:0c:86:15:22:93:d9:df:f5:4b:81:c0:04
-# SHA256 Fingerprint: c1:b4:82:99:ab:a5:20:8f:e9:63:0a:ce:55:ca:68:a0:3e:da:5a:51:9c:88:02:a0:d3:a6:73:be:8f:8e:55:7d
------BEGIN CERTIFICATE-----
-MIIDZzCCAk+gAwIBAgIQGx+ttiD5JNM2a/fH8YygWTANBgkqhkiG9w0BAQUFADBF
-MQswCQYDVQQGEwJHQjEYMBYGA1UEChMPVHJ1c3RpcyBMaW1pdGVkMRwwGgYDVQQL
-ExNUcnVzdGlzIEZQUyBSb290IENBMB4XDTAzMTIyMzEyMTQwNloXDTI0MDEyMTEx
-MzY1NFowRTELMAkGA1UEBhMCR0IxGDAWBgNVBAoTD1RydXN0aXMgTGltaXRlZDEc
-MBoGA1UECxMTVHJ1c3RpcyBGUFMgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAMVQe547NdDfxIzNjpvto8A2mfRC6qc+gIMPpqdZh8mQRUN+
-AOqGeSoDvT03mYlmt+WKVoaTnGhLaASMk5MCPjDSNzoiYYkchU59j9WvezX2fihH
-iTHcDnlkH5nSW7r+f2C/revnPDgpai/lkQtV/+xvWNUtyd5MZnGPDNcE2gfmHhjj
-vSkCqPoc4Vu5g6hBSLwacY3nYuUtsuvffM/bq1rKMfFMIvMFE/eC+XN5DL7XSxzA
-0RU8k0Fk0ea+IxciAIleH2ulrG6nS4zto3Lmr2NNL4XSFDWaLk6M6jKYKIahkQlB
-OrTh4/L68MkKokHdqeMDx4gVOxzUGpTXn2RZEm0CAwEAAaNTMFEwDwYDVR0TAQH/
-BAUwAwEB/zAfBgNVHSMEGDAWgBS6+nEleYtXQSUhhgtx67JkDoshZzAdBgNVHQ4E
-FgQUuvpxJXmLV0ElIYYLceuyZA6LIWcwDQYJKoZIhvcNAQEFBQADggEBAH5Y//01
-GX2cGE+esCu8jowU/yyg2kdbw++BLa8F6nRIW/M+TgfHbcWzk88iNVy2P3UnXwmW
-zaD+vkAMXBJV+JOCyinpXj9WV4s4NvdFGkwozZ5BuO1WTISkQMi4sKUraXAEasP4
-1BIy+Q7DsdwyhEQsb8tGD+pmQQ9P8Vilpg0ND2HepZ5dfWWhPBfnqFVO76DH7cZE
-f1T1o+CP8HxVIo8ptoGj4W1OLBuAZ+ytIJ8MYmHVl/9D7S3B2l0pKoU/rGXuhg8F
-jZBf3+6f9L/uHfuY5H+QK4R4EA5sSVPvFVtlRkpdr7r7OnIdzfYliB6XzCGcKQEN
-ZetX2fNXlrtIzYE=
------END CERTIFICATE-----
-
 # Issuer: CN=Buypass Class 2 Root CA O=Buypass AS-983163327
 # Subject: CN=Buypass Class 2 Root CA O=Buypass AS-983163327
 # Label: "Buypass Class 2 Root CA"
@@ -2965,46 +2385,6 @@ KoZIzj0EAwMDaAAwZQIxAOVpEslu28YxuglB4Zf4+/2a4n0Sye18ZNPLBSWLVtmg
 xwy8p2Fp8fc74SrL+SvzZpA3
 -----END CERTIFICATE-----
 
-# Issuer: CN=Staat der Nederlanden Root CA - G3 O=Staat der Nederlanden
-# Subject: CN=Staat der Nederlanden Root CA - G3 O=Staat der Nederlanden
-# Label: "Staat der Nederlanden Root CA - G3"
-# Serial: 10003001
-# MD5 Fingerprint: 0b:46:67:07:db:10:2f:19:8c:35:50:60:d1:0b:f4:37
-# SHA1 Fingerprint: d8:eb:6b:41:51:92:59:e0:f3:e7:85:00:c0:3d:b6:88:97:c9:ee:fc
-# SHA256 Fingerprint: 3c:4f:b0:b9:5a:b8:b3:00:32:f4:32:b8:6f:53:5f:e1:72:c1:85:d0:fd:39:86:58:37:cf:36:18:7f:a6:f4:28
------BEGIN CERTIFICATE-----
-MIIFdDCCA1ygAwIBAgIEAJiiOTANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJO
-TDEeMBwGA1UECgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSswKQYDVQQDDCJTdGFh
-dCBkZXIgTmVkZXJsYW5kZW4gUm9vdCBDQSAtIEczMB4XDTEzMTExNDExMjg0MloX
-DTI4MTExMzIzMDAwMFowWjELMAkGA1UEBhMCTkwxHjAcBgNVBAoMFVN0YWF0IGRl
-ciBOZWRlcmxhbmRlbjErMCkGA1UEAwwiU3RhYXQgZGVyIE5lZGVybGFuZGVuIFJv
-b3QgQ0EgLSBHMzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAL4yolQP
-cPssXFnrbMSkUeiFKrPMSjTysF/zDsccPVMeiAho2G89rcKezIJnByeHaHE6n3WW
-IkYFsO2tx1ueKt6c/DrGlaf1F2cY5y9JCAxcz+bMNO14+1Cx3Gsy8KL+tjzk7FqX
-xz8ecAgwoNzFs21v0IJyEavSgWhZghe3eJJg+szeP4TrjTgzkApyI/o1zCZxMdFy
-KJLZWyNtZrVtB0LrpjPOktvA9mxjeM3KTj215VKb8b475lRgsGYeCasH/lSJEULR
-9yS6YHgamPfJEf0WwTUaVHXvQ9Plrk7O53vDxk5hUUurmkVLoR9BvUhTFXFkC4az
-5S6+zqQbwSmEorXLCCN2QyIkHxcE1G6cxvx/K2Ya7Irl1s9N9WMJtxU51nus6+N8
-6U78dULI7ViVDAZCopz35HCz33JvWjdAidiFpNfxC95DGdRKWCyMijmev4SH8RY7
-Ngzp07TKbBlBUgmhHbBqv4LvcFEhMtwFdozL92TkA1CvjJFnq8Xy7ljY3r735zHP
-bMk7ccHViLVlvMDoFxcHErVc0qsgk7TmgoNwNsXNo42ti+yjwUOH5kPiNL6VizXt
-BznaqB16nzaeErAMZRKQFWDZJkBE41ZgpRDUajz9QdwOWke275dhdU/Z/seyHdTt
-XUmzqWrLZoQT1Vyg3N9udwbRcXXIV2+vD3dbAgMBAAGjQjBAMA8GA1UdEwEB/wQF
-MAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRUrfrHkleuyjWcLhL75Lpd
-INyUVzANBgkqhkiG9w0BAQsFAAOCAgEAMJmdBTLIXg47mAE6iqTnB/d6+Oea31BD
-U5cqPco8R5gu4RV78ZLzYdqQJRZlwJ9UXQ4DO1t3ApyEtg2YXzTdO2PCwyiBwpwp
-LiniyMMB8jPqKqrMCQj3ZWfGzd/TtiunvczRDnBfuCPRy5FOCvTIeuXZYzbB1N/8
-Ipf3YF3qKS9Ysr1YvY2WTxB1v0h7PVGHoTx0IsL8B3+A3MSs/mrBcDCw6Y5p4ixp
-gZQJut3+TcCDjJRYwEYgr5wfAvg1VUkvRtTA8KCWAg8zxXHzniN9lLf9OtMJgwYh
-/WA9rjLA0u6NpvDntIJ8CsxwyXmA+P5M9zWEGYox+wrZ13+b8KKaa8MFSu1BYBQw
-0aoRQm7TIwIEC8Zl3d1Sd9qBa7Ko+gE4uZbqKmxnl4mUnrzhVNXkanjvSr0rmj1A
-fsbAddJu+2gw7OyLnflJNZoaLNmzlTnVHpL3prllL+U9bTpITAjc5CgSKL59NVzq
-4BZ+Extq1z7XnvwtdbLBFNUjA9tbbws+eC8N3jONFrdI54OagQ97wUNNVQQXOEpR
-1VmiiXTTn74eS9fGbbeIJG9gkaSChVtWQbzQRKtqE77RLFi3EjNYsjdj3BP1lB0/
-QFH1T/U67cjF68IeHRaVesd+QnGTbksVtzDfqu1XhUisHWrdOWnk4Xl4vs4Fv6EM
-94B7IWcnMFk=
------END CERTIFICATE-----
-
 # Issuer: CN=Staat der Nederlanden EV Root CA O=Staat der Nederlanden
 # Subject: CN=Staat der Nederlanden EV Root CA O=Staat der Nederlanden
 # Label: "Staat der Nederlanden EV Root CA"
@@ -4604,3 +3984,274 @@ AZKXRRJ+oPM+rRk6ct30UJMDEr5E0k9BpIycnR+j9sKS50gU/k6bpZFXrsY3crsC
 MGclCrEMXu6pY5Jv5ZAL/mYiykf9ijH3g/56vxC+GCsej/YpHpRZ744hN8tRmKVu
 Sw==
 -----END CERTIFICATE-----
+
+# Issuer: CN=NAVER Global Root Certification Authority O=NAVER BUSINESS PLATFORM Corp.
+# Subject: CN=NAVER Global Root Certification Authority O=NAVER BUSINESS PLATFORM Corp.
+# Label: "NAVER Global Root Certification Authority"
+# Serial: 9013692873798656336226253319739695165984492813
+# MD5 Fingerprint: c8:7e:41:f6:25:3b:f5:09:b3:17:e8:46:3d:bf:d0:9b
+# SHA1 Fingerprint: 8f:6b:f2:a9:27:4a:da:14:a0:c4:f4:8e:61:27:f9:c0:1e:78:5d:d1
+# SHA256 Fingerprint: 88:f4:38:dc:f8:ff:d1:fa:8f:42:91:15:ff:e5:f8:2a:e1:e0:6e:0c:70:c3:75:fa:ad:71:7b:34:a4:9e:72:65
+-----BEGIN CERTIFICATE-----
+MIIFojCCA4qgAwIBAgIUAZQwHqIL3fXFMyqxQ0Rx+NZQTQ0wDQYJKoZIhvcNAQEM
+BQAwaTELMAkGA1UEBhMCS1IxJjAkBgNVBAoMHU5BVkVSIEJVU0lORVNTIFBMQVRG
+T1JNIENvcnAuMTIwMAYDVQQDDClOQVZFUiBHbG9iYWwgUm9vdCBDZXJ0aWZpY2F0
+aW9uIEF1dGhvcml0eTAeFw0xNzA4MTgwODU4NDJaFw0zNzA4MTgyMzU5NTlaMGkx
+CzAJBgNVBAYTAktSMSYwJAYDVQQKDB1OQVZFUiBCVVNJTkVTUyBQTEFURk9STSBD
+b3JwLjEyMDAGA1UEAwwpTkFWRVIgR2xvYmFsIFJvb3QgQ2VydGlmaWNhdGlvbiBB
+dXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC21PGTXLVA
+iQqrDZBbUGOukJR0F0Vy1ntlWilLp1agS7gvQnXp2XskWjFlqxcX0TM62RHcQDaH
+38dq6SZeWYp34+hInDEW+j6RscrJo+KfziFTowI2MMtSAuXaMl3Dxeb57hHHi8lE
+HoSTGEq0n+USZGnQJoViAbbJAh2+g1G7XNr4rRVqmfeSVPc0W+m/6imBEtRTkZaz
+kVrd/pBzKPswRrXKCAfHcXLJZtM0l/aM9BhK4dA9WkW2aacp+yPOiNgSnABIqKYP
+szuSjXEOdMWLyEz59JuOuDxp7W87UC9Y7cSw0BwbagzivESq2M0UXZR4Yb8Obtoq
+vC8MC3GmsxY/nOb5zJ9TNeIDoKAYv7vxvvTWjIcNQvcGufFt7QSUqP620wbGQGHf
+nZ3zVHbOUzoBppJB7ASjjw2i1QnK1sua8e9DXcCrpUHPXFNwcMmIpi3Ua2FzUCaG
+YQ5fG8Ir4ozVu53BA0K6lNpfqbDKzE0K70dpAy8i+/Eozr9dUGWokG2zdLAIx6yo
+0es+nPxdGoMuK8u180SdOqcXYZaicdNwlhVNt0xz7hlcxVs+Qf6sdWA7G2POAN3a
+CJBitOUt7kinaxeZVL6HSuOpXgRM6xBtVNbv8ejyYhbLgGvtPe31HzClrkvJE+2K
+AQHJuFFYwGY6sWZLxNUxAmLpdIQM201GLQIDAQABo0IwQDAdBgNVHQ4EFgQU0p+I
+36HNLL3s9TsBAZMzJ7LrYEswDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMB
+Af8wDQYJKoZIhvcNAQEMBQADggIBADLKgLOdPVQG3dLSLvCkASELZ0jKbY7gyKoN
+qo0hV4/GPnrK21HUUrPUloSlWGB/5QuOH/XcChWB5Tu2tyIvCZwTFrFsDDUIbatj
+cu3cvuzHV+YwIHHW1xDBE1UBjCpD5EHxzzp6U5LOogMFDTjfArsQLtk70pt6wKGm
++LUx5vR1yblTmXVHIloUFcd4G7ad6Qz4G3bxhYTeodoS76TiEJd6eN4MUZeoIUCL
+hr0N8F5OSza7OyAfikJW4Qsav3vQIkMsRIz75Sq0bBwcupTgE34h5prCy8VCZLQe
+lHsIJchxzIdFV4XTnyliIoNRlwAYl3dqmJLJfGBs32x9SuRwTMKeuB330DTHD8z7
+p/8Dvq1wkNoL3chtl1+afwkyQf3NosxabUzyqkn+Zvjp2DXrDige7kgvOtB5CTh8
+piKCk5XQA76+AqAF3SAi428diDRgxuYKuQl1C/AH6GmWNcf7I4GOODm4RStDeKLR
+LBT/DShycpWbXgnbiUSYqqFJu3FS8r/2/yehNq+4tneI3TqkbZs0kNwUXTC/t+sX
+5Ie3cdCh13cV1ELX8vMxmV2b3RZtP+oGI/hGoiLtk/bdmuYqh7GYVPEi92tF4+KO
+dh2ajcQGjTa3FPOdVGm3jjzVpG2Tgbet9r1ke8LJaDmgkpzNNIaRkPpkUZ3+/uul
+9XXeifdy
+-----END CERTIFICATE-----
+
+# Issuer: CN=AC RAIZ FNMT-RCM SERVIDORES SEGUROS O=FNMT-RCM OU=Ceres
+# Subject: CN=AC RAIZ FNMT-RCM SERVIDORES SEGUROS O=FNMT-RCM OU=Ceres
+# Label: "AC RAIZ FNMT-RCM SERVIDORES SEGUROS"
+# Serial: 131542671362353147877283741781055151509
+# MD5 Fingerprint: 19:36:9c:52:03:2f:d2:d1:bb:23:cc:dd:1e:12:55:bb
+# SHA1 Fingerprint: 62:ff:d9:9e:c0:65:0d:03:ce:75:93:d2:ed:3f:2d:32:c9:e3:e5:4a
+# SHA256 Fingerprint: 55:41:53:b1:3d:2c:f9:dd:b7:53:bf:be:1a:4e:0a:e0:8d:0a:a4:18:70:58:fe:60:a2:b8:62:b2:e4:b8:7b:cb
+-----BEGIN CERTIFICATE-----
+MIICbjCCAfOgAwIBAgIQYvYybOXE42hcG2LdnC6dlTAKBggqhkjOPQQDAzB4MQsw
+CQYDVQQGEwJFUzERMA8GA1UECgwIRk5NVC1SQ00xDjAMBgNVBAsMBUNlcmVzMRgw
+FgYDVQRhDA9WQVRFUy1RMjgyNjAwNEoxLDAqBgNVBAMMI0FDIFJBSVogRk5NVC1S
+Q00gU0VSVklET1JFUyBTRUdVUk9TMB4XDTE4MTIyMDA5MzczM1oXDTQzMTIyMDA5
+MzczM1oweDELMAkGA1UEBhMCRVMxETAPBgNVBAoMCEZOTVQtUkNNMQ4wDAYDVQQL
+DAVDZXJlczEYMBYGA1UEYQwPVkFURVMtUTI4MjYwMDRKMSwwKgYDVQQDDCNBQyBS
+QUlaIEZOTVQtUkNNIFNFUlZJRE9SRVMgU0VHVVJPUzB2MBAGByqGSM49AgEGBSuB
+BAAiA2IABPa6V1PIyqvfNkpSIeSX0oNnnvBlUdBeh8dHsVnyV0ebAAKTRBdp20LH
+sbI6GA60XYyzZl2hNPk2LEnb80b8s0RpRBNm/dfF/a82Tc4DTQdxz69qBdKiQ1oK
+Um8BA06Oi6NCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYD
+VR0OBBYEFAG5L++/EYZg8k/QQW6rcx/n0m5JMAoGCCqGSM49BAMDA2kAMGYCMQCu
+SuMrQMN0EfKVrRYj3k4MGuZdpSRea0R7/DjiT8ucRRcRTBQnJlU5dUoDzBOQn5IC
+MQD6SmxgiHPz7riYYqnOK8LZiqZwMR2vsJRM60/G49HzYqc8/5MuB1xJAWdpEgJy
+v+c=
+-----END CERTIFICATE-----
+
+# Issuer: CN=GlobalSign Root R46 O=GlobalSign nv-sa
+# Subject: CN=GlobalSign Root R46 O=GlobalSign nv-sa
+# Label: "GlobalSign Root R46"
+# Serial: 1552617688466950547958867513931858518042577
+# MD5 Fingerprint: c4:14:30:e4:fa:66:43:94:2a:6a:1b:24:5f:19:d0:ef
+# SHA1 Fingerprint: 53:a2:b0:4b:ca:6b:d6:45:e6:39:8a:8e:c4:0d:d2:bf:77:c3:a2:90
+# SHA256 Fingerprint: 4f:a3:12:6d:8d:3a:11:d1:c4:85:5a:4f:80:7c:ba:d6:cf:91:9d:3a:5a:88:b0:3b:ea:2c:63:72:d9:3c:40:c9
+-----BEGIN CERTIFICATE-----
+MIIFWjCCA0KgAwIBAgISEdK7udcjGJ5AXwqdLdDfJWfRMA0GCSqGSIb3DQEBDAUA
+MEYxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMRwwGgYD
+VQQDExNHbG9iYWxTaWduIFJvb3QgUjQ2MB4XDTE5MDMyMDAwMDAwMFoXDTQ2MDMy
+MDAwMDAwMFowRjELMAkGA1UEBhMCQkUxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYt
+c2ExHDAaBgNVBAMTE0dsb2JhbFNpZ24gUm9vdCBSNDYwggIiMA0GCSqGSIb3DQEB
+AQUAA4ICDwAwggIKAoICAQCsrHQy6LNl5brtQyYdpokNRbopiLKkHWPd08EsCVeJ
+OaFV6Wc0dwxu5FUdUiXSE2te4R2pt32JMl8Nnp8semNgQB+msLZ4j5lUlghYruQG
+vGIFAha/r6gjA7aUD7xubMLL1aa7DOn2wQL7Id5m3RerdELv8HQvJfTqa1VbkNud
+316HCkD7rRlr+/fKYIje2sGP1q7Vf9Q8g+7XFkyDRTNrJ9CG0Bwta/OrffGFqfUo
+0q3v84RLHIf8E6M6cqJaESvWJ3En7YEtbWaBkoe0G1h6zD8K+kZPTXhc+CtI4wSE
+y132tGqzZfxCnlEmIyDLPRT5ge1lFgBPGmSXZgjPjHvjK8Cd+RTyG/FWaha/LIWF
+zXg4mutCagI0GIMXTpRW+LaCtfOW3T3zvn8gdz57GSNrLNRyc0NXfeD412lPFzYE
++cCQYDdF3uYM2HSNrpyibXRdQr4G9dlkbgIQrImwTDsHTUB+JMWKmIJ5jqSngiCN
+I/onccnfxkF0oE32kRbcRoxfKWMxWXEM2G/CtjJ9++ZdU6Z+Ffy7dXxd7Pj2Fxzs
+x2sZy/N78CsHpdlseVR2bJ0cpm4O6XkMqCNqo98bMDGfsVR7/mrLZqrcZdCinkqa
+ByFrgY/bxFn63iLABJzjqls2k+g9vXqhnQt2sQvHnf3PmKgGwvgqo6GDoLclcqUC
+4wIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNV
+HQ4EFgQUA1yrc4GHqMywptWU4jaWSf8FmSwwDQYJKoZIhvcNAQEMBQADggIBAHx4
+7PYCLLtbfpIrXTncvtgdokIzTfnvpCo7RGkerNlFo048p9gkUbJUHJNOxO97k4Vg
+JuoJSOD1u8fpaNK7ajFxzHmuEajwmf3lH7wvqMxX63bEIaZHU1VNaL8FpO7XJqti
+2kM3S+LGteWygxk6x9PbTZ4IevPuzz5i+6zoYMzRx6Fcg0XERczzF2sUyQQCPtIk
+pnnpHs6i58FZFZ8d4kuaPp92CC1r2LpXFNqD6v6MVenQTqnMdzGxRBF6XLE+0xRF
+FRhiJBPSy03OXIPBNvIQtQ6IbbjhVp+J3pZmOUdkLG5NrmJ7v2B0GbhWrJKsFjLt
+rWhV/pi60zTe9Mlhww6G9kuEYO4Ne7UyWHmRVSyBQ7N0H3qqJZ4d16GLuc1CLgSk
+ZoNNiTW2bKg2SnkheCLQQrzRQDGQob4Ez8pn7fXwgNNgyYMqIgXQBztSvwyeqiv5
+u+YfjyW6hY0XHgL+XVAEV8/+LbzvXMAaq7afJMbfc2hIkCwU9D9SGuTSyxTDYWnP
+4vkYxboznxSjBF25cfe1lNj2M8FawTSLfJvdkzrnE6JwYZ+vj+vYxXX4M2bUdGc6
+N3ec592kD3ZDZopD8p/7DEJ4Y9HiD2971KE9dJeFt0g5QdYg/NA6s/rob8SKunE3
+vouXsXgxT7PntgMTzlSdriVZzH81Xwj3QEUxeCp6
+-----END CERTIFICATE-----
+
+# Issuer: CN=GlobalSign Root E46 O=GlobalSign nv-sa
+# Subject: CN=GlobalSign Root E46 O=GlobalSign nv-sa
+# Label: "GlobalSign Root E46"
+# Serial: 1552617690338932563915843282459653771421763
+# MD5 Fingerprint: b5:b8:66:ed:de:08:83:e3:c9:e2:01:34:06:ac:51:6f
+# SHA1 Fingerprint: 39:b4:6c:d5:fe:80:06:eb:e2:2f:4a:bb:08:33:a0:af:db:b9:dd:84
+# SHA256 Fingerprint: cb:b9:c4:4d:84:b8:04:3e:10:50:ea:31:a6:9f:51:49:55:d7:bf:d2:e2:c6:b4:93:01:01:9a:d6:1d:9f:50:58
+-----BEGIN CERTIFICATE-----
+MIICCzCCAZGgAwIBAgISEdK7ujNu1LzmJGjFDYQdmOhDMAoGCCqGSM49BAMDMEYx
+CzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMRwwGgYDVQQD
+ExNHbG9iYWxTaWduIFJvb3QgRTQ2MB4XDTE5MDMyMDAwMDAwMFoXDTQ2MDMyMDAw
+MDAwMFowRjELMAkGA1UEBhMCQkUxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2Ex
+HDAaBgNVBAMTE0dsb2JhbFNpZ24gUm9vdCBFNDYwdjAQBgcqhkjOPQIBBgUrgQQA
+IgNiAAScDrHPt+ieUnd1NPqlRqetMhkytAepJ8qUuwzSChDH2omwlwxwEwkBjtjq
+R+q+soArzfwoDdusvKSGN+1wCAB16pMLey5SnCNoIwZD7JIvU4Tb+0cUB+hflGdd
+yXqBPCCjQjBAMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1Ud
+DgQWBBQxCpCPtsad0kRLgLWi5h+xEk8blTAKBggqhkjOPQQDAwNoADBlAjEA31SQ
+7Zvvi5QCkxeCmb6zniz2C5GMn0oUsfZkvLtoURMMA/cVi4RguYv/Uo7njLwcAjA8
++RHUjE7AwWHCFUyqqx0LMV87HOIAl0Qx5v5zli/altP+CAezNIm8BZ/3Hobui3A=
+-----END CERTIFICATE-----
+
+# Issuer: CN=GLOBALTRUST 2020 O=e-commerce monitoring GmbH
+# Subject: CN=GLOBALTRUST 2020 O=e-commerce monitoring GmbH
+# Label: "GLOBALTRUST 2020"
+# Serial: 109160994242082918454945253
+# MD5 Fingerprint: 8a:c7:6f:cb:6d:e3:cc:a2:f1:7c:83:fa:0e:78:d7:e8
+# SHA1 Fingerprint: d0:67:c1:13:51:01:0c:aa:d0:c7:6a:65:37:31:16:26:4f:53:71:a2
+# SHA256 Fingerprint: 9a:29:6a:51:82:d1:d4:51:a2:e3:7f:43:9b:74:da:af:a2:67:52:33:29:f9:0f:9a:0d:20:07:c3:34:e2:3c:9a
+-----BEGIN CERTIFICATE-----
+MIIFgjCCA2qgAwIBAgILWku9WvtPilv6ZeUwDQYJKoZIhvcNAQELBQAwTTELMAkG
+A1UEBhMCQVQxIzAhBgNVBAoTGmUtY29tbWVyY2UgbW9uaXRvcmluZyBHbWJIMRkw
+FwYDVQQDExBHTE9CQUxUUlVTVCAyMDIwMB4XDTIwMDIxMDAwMDAwMFoXDTQwMDYx
+MDAwMDAwMFowTTELMAkGA1UEBhMCQVQxIzAhBgNVBAoTGmUtY29tbWVyY2UgbW9u
+aXRvcmluZyBHbWJIMRkwFwYDVQQDExBHTE9CQUxUUlVTVCAyMDIwMIICIjANBgkq
+hkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAri5WrRsc7/aVj6B3GyvTY4+ETUWiD59b
+RatZe1E0+eyLinjF3WuvvcTfk0Uev5E4C64OFudBc/jbu9G4UeDLgztzOG53ig9Z
+YybNpyrOVPu44sB8R85gfD+yc/LAGbaKkoc1DZAoouQVBGM+uq/ufF7MpotQsjj3
+QWPKzv9pj2gOlTblzLmMCcpL3TGQlsjMH/1WljTbjhzqLL6FLmPdqqmV0/0plRPw
+yJiT2S0WR5ARg6I6IqIoV6Lr/sCMKKCmfecqQjuCgGOlYx8ZzHyyZqjC0203b+J+
+BlHZRYQfEs4kUmSFC0iAToexIiIwquuuvuAC4EDosEKAA1GqtH6qRNdDYfOiaxaJ
+SaSjpCuKAsR49GiKweR6NrFvG5Ybd0mN1MkGco/PU+PcF4UgStyYJ9ORJitHHmkH
+r96i5OTUawuzXnzUJIBHKWk7buis/UDr2O1xcSvy6Fgd60GXIsUf1DnQJ4+H4xj0
+4KlGDfV0OoIu0G4skaMxXDtG6nsEEFZegB31pWXogvziB4xiRfUg3kZwhqG8k9Me
+dKZssCz3AwyIDMvUclOGvGBG85hqwvG/Q/lwIHfKN0F5VVJjjVsSn8VoxIidrPIw
+q7ejMZdnrY8XD2zHc+0klGvIg5rQmjdJBKuxFshsSUktq6HQjJLyQUp5ISXbY9e2
+nKd+Qmn7OmMCAwEAAaNjMGEwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
+AQYwHQYDVR0OBBYEFNwuH9FhN3nkq9XVsxJxaD1qaJwiMB8GA1UdIwQYMBaAFNwu
+H9FhN3nkq9XVsxJxaD1qaJwiMA0GCSqGSIb3DQEBCwUAA4ICAQCR8EICaEDuw2jA
+VC/f7GLDw56KoDEoqoOOpFaWEhCGVrqXctJUMHytGdUdaG/7FELYjQ7ztdGl4wJC
+XtzoRlgHNQIw4Lx0SsFDKv/bGtCwr2zD/cuz9X9tAy5ZVp0tLTWMstZDFyySCstd
+6IwPS3BD0IL/qMy/pJTAvoe9iuOTe8aPmxadJ2W8esVCgmxcB9CpwYhgROmYhRZf
++I/KARDOJcP5YBugxZfD0yyIMaK9MOzQ0MAS8cE54+X1+NZK3TTN+2/BT+MAi1bi
+kvcoskJ3ciNnxz8RFbLEAwW+uxF7Cr+obuf/WEPPm2eggAe2HcqtbepBEX4tdJP7
+wry+UUTF72glJ4DjyKDUEuzZpTcdN3y0kcra1LGWge9oXHYQSa9+pTeAsRxSvTOB
+TI/53WXZFM2KJVj04sWDpQmQ1GwUY7VA3+vA/MRYfg0UFodUJ25W5HCEuGwyEn6C
+MUO+1918oa2u1qsgEu8KwxCMSZY13At1XrFP1U80DhEgB3VDRemjEdqso5nCtnkn
+4rnvyOL2NSl6dPrFf4IFYqYK6miyeUcGbvJXqBUzxvd4Sj1Ce2t+/vdG6tHrju+I
+aFvowdlxfv1k7/9nR4hYJS8+hge9+6jlgqispdNpQ80xiEmEU5LAsTkbOYMBMMTy
+qfrQA71yN2BWHzZ8vTmR9W0Nv3vXkg==
+-----END CERTIFICATE-----
+
+# Issuer: CN=ANF Secure Server Root CA O=ANF Autoridad de Certificacion OU=ANF CA Raiz
+# Subject: CN=ANF Secure Server Root CA O=ANF Autoridad de Certificacion OU=ANF CA Raiz
+# Label: "ANF Secure Server Root CA"
+# Serial: 996390341000653745
+# MD5 Fingerprint: 26:a6:44:5a:d9:af:4e:2f:b2:1d:b6:65:b0:4e:e8:96
+# SHA1 Fingerprint: 5b:6e:68:d0:cc:15:b6:a0:5f:1e:c1:5f:ae:02:fc:6b:2f:5d:6f:74
+# SHA256 Fingerprint: fb:8f:ec:75:91:69:b9:10:6b:1e:51:16:44:c6:18:c5:13:04:37:3f:6c:06:43:08:8d:8b:ef:fd:1b:99:75:99
+-----BEGIN CERTIFICATE-----
+MIIF7zCCA9egAwIBAgIIDdPjvGz5a7EwDQYJKoZIhvcNAQELBQAwgYQxEjAQBgNV
+BAUTCUc2MzI4NzUxMDELMAkGA1UEBhMCRVMxJzAlBgNVBAoTHkFORiBBdXRvcmlk
+YWQgZGUgQ2VydGlmaWNhY2lvbjEUMBIGA1UECxMLQU5GIENBIFJhaXoxIjAgBgNV
+BAMTGUFORiBTZWN1cmUgU2VydmVyIFJvb3QgQ0EwHhcNMTkwOTA0MTAwMDM4WhcN
+MzkwODMwMTAwMDM4WjCBhDESMBAGA1UEBRMJRzYzMjg3NTEwMQswCQYDVQQGEwJF
+UzEnMCUGA1UEChMeQU5GIEF1dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uMRQwEgYD
+VQQLEwtBTkYgQ0EgUmFpejEiMCAGA1UEAxMZQU5GIFNlY3VyZSBTZXJ2ZXIgUm9v
+dCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANvrayvmZFSVgpCj
+cqQZAZ2cC4Ffc0m6p6zzBE57lgvsEeBbphzOG9INgxwruJ4dfkUyYA8H6XdYfp9q
+yGFOtibBTI3/TO80sh9l2Ll49a2pcbnvT1gdpd50IJeh7WhM3pIXS7yr/2WanvtH
+2Vdy8wmhrnZEE26cLUQ5vPnHO6RYPUG9tMJJo8gN0pcvB2VSAKduyK9o7PQUlrZX
+H1bDOZ8rbeTzPvY1ZNoMHKGESy9LS+IsJJ1tk0DrtSOOMspvRdOoiXsezx76W0OL
+zc2oD2rKDF65nkeP8Nm2CgtYZRczuSPkdxl9y0oukntPLxB3sY0vaJxizOBQ+OyR
+p1RMVwnVdmPF6GUe7m1qzwmd+nxPrWAI/VaZDxUse6mAq4xhj0oHdkLePfTdsiQz
+W7i1o0TJrH93PB0j7IKppuLIBkwC/qxcmZkLLxCKpvR/1Yd0DVlJRfbwcVw5Kda/
+SiOL9V8BY9KHcyi1Swr1+KuCLH5zJTIdC2MKF4EA/7Z2Xue0sUDKIbvVgFHlSFJn
+LNJhiQcND85Cd8BEc5xEUKDbEAotlRyBr+Qc5RQe8TZBAQIvfXOn3kLMTOmJDVb3
+n5HUA8ZsyY/b2BzgQJhdZpmYgG4t/wHFzstGH6wCxkPmrqKEPMVOHj1tyRRM4y5B
+u8o5vzY8KhmqQYdOpc5LMnndkEl/AgMBAAGjYzBhMB8GA1UdIwQYMBaAFJxf0Gxj
+o1+TypOYCK2Mh6UsXME3MB0GA1UdDgQWBBScX9BsY6Nfk8qTmAitjIelLFzBNzAO
+BgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOC
+AgEATh65isagmD9uw2nAalxJUqzLK114OMHVVISfk/CHGT0sZonrDUL8zPB1hT+L
+9IBdeeUXZ701guLyPI59WzbLWoAAKfLOKyzxj6ptBZNscsdW699QIyjlRRA96Gej
+rw5VD5AJYu9LWaL2U/HANeQvwSS9eS9OICI7/RogsKQOLHDtdD+4E5UGUcjohybK
+pFtqFiGS3XNgnhAY3jyB6ugYw3yJ8otQPr0R4hUDqDZ9MwFsSBXXiJCZBMXM5gf0
+vPSQ7RPi6ovDj6MzD8EpTBNO2hVWcXNyglD2mjN8orGoGjR0ZVzO0eurU+AagNjq
+OknkJjCb5RyKqKkVMoaZkgoQI1YS4PbOTOK7vtuNknMBZi9iPrJyJ0U27U1W45eZ
+/zo1PqVUSlJZS2Db7v54EX9K3BR5YLZrZAPbFYPhor72I5dQ8AkzNqdxliXzuUJ9
+2zg/LFis6ELhDtjTO0wugumDLmsx2d1Hhk9tl5EuT+IocTUW0fJz/iUrB0ckYyfI
++PbZa/wSMVYIwFNCr5zQM378BvAxRAMU8Vjq8moNqRGyg77FGr8H6lnco4g175x2
+MjxNBiLOFeXdntiP2t7SxDnlF4HPOEfrf4htWRvfn0IUrn7PqLBmZdo3r5+qPeoo
+tt7VMVgWglvquxl1AnMaykgaIZOQCo6ThKd9OyMYkomgjaw=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Certum EC-384 CA O=Asseco Data Systems S.A. OU=Certum Certification Authority
+# Subject: CN=Certum EC-384 CA O=Asseco Data Systems S.A. OU=Certum Certification Authority
+# Label: "Certum EC-384 CA"
+# Serial: 160250656287871593594747141429395092468
+# MD5 Fingerprint: b6:65:b3:96:60:97:12:a1:ec:4e:e1:3d:a3:c6:c9:f1
+# SHA1 Fingerprint: f3:3e:78:3c:ac:df:f4:a2:cc:ac:67:55:69:56:d7:e5:16:3c:e1:ed
+# SHA256 Fingerprint: 6b:32:80:85:62:53:18:aa:50:d1:73:c9:8d:8b:da:09:d5:7e:27:41:3d:11:4c:f7:87:a0:f5:d0:6c:03:0c:f6
+-----BEGIN CERTIFICATE-----
+MIICZTCCAeugAwIBAgIQeI8nXIESUiClBNAt3bpz9DAKBggqhkjOPQQDAzB0MQsw
+CQYDVQQGEwJQTDEhMB8GA1UEChMYQXNzZWNvIERhdGEgU3lzdGVtcyBTLkEuMScw
+JQYDVQQLEx5DZXJ0dW0gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxGTAXBgNVBAMT
+EENlcnR1bSBFQy0zODQgQ0EwHhcNMTgwMzI2MDcyNDU0WhcNNDMwMzI2MDcyNDU0
+WjB0MQswCQYDVQQGEwJQTDEhMB8GA1UEChMYQXNzZWNvIERhdGEgU3lzdGVtcyBT
+LkEuMScwJQYDVQQLEx5DZXJ0dW0gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxGTAX
+BgNVBAMTEENlcnR1bSBFQy0zODQgQ0EwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAATE
+KI6rGFtqvm5kN2PkzeyrOvfMobgOgknXhimfoZTy42B4mIF4Bk3y7JoOV2CDn7Tm
+Fy8as10CW4kjPMIRBSqniBMY81CE1700LCeJVf/OTOffph8oxPBUw7l8t1Ot68Kj
+QjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFI0GZnQkdjrzife81r1HfS+8
+EF9LMA4GA1UdDwEB/wQEAwIBBjAKBggqhkjOPQQDAwNoADBlAjADVS2m5hjEfO/J
+UG7BJw+ch69u1RsIGL2SKcHvlJF40jocVYli5RsJHrpka/F2tNQCMQC0QoSZ/6vn
+nvuRlydd3LBbMHHOXjgaatkl5+r3YZJW+OraNsKHZZYuciUvf9/DE8k=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Certum Trusted Root CA O=Asseco Data Systems S.A. OU=Certum Certification Authority
+# Subject: CN=Certum Trusted Root CA O=Asseco Data Systems S.A. OU=Certum Certification Authority
+# Label: "Certum Trusted Root CA"
+# Serial: 40870380103424195783807378461123655149
+# MD5 Fingerprint: 51:e1:c2:e7:fe:4c:84:af:59:0e:2f:f4:54:6f:ea:29
+# SHA1 Fingerprint: c8:83:44:c0:18:ae:9f:cc:f1:87:b7:8f:22:d1:c5:d7:45:84:ba:e5
+# SHA256 Fingerprint: fe:76:96:57:38:55:77:3e:37:a9:5e:7a:d4:d9:cc:96:c3:01:57:c1:5d:31:76:5b:a9:b1:57:04:e1:ae:78:fd
+-----BEGIN CERTIFICATE-----
+MIIFwDCCA6igAwIBAgIQHr9ZULjJgDdMBvfrVU+17TANBgkqhkiG9w0BAQ0FADB6
+MQswCQYDVQQGEwJQTDEhMB8GA1UEChMYQXNzZWNvIERhdGEgU3lzdGVtcyBTLkEu
+MScwJQYDVQQLEx5DZXJ0dW0gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxHzAdBgNV
+BAMTFkNlcnR1bSBUcnVzdGVkIFJvb3QgQ0EwHhcNMTgwMzE2MTIxMDEzWhcNNDMw
+MzE2MTIxMDEzWjB6MQswCQYDVQQGEwJQTDEhMB8GA1UEChMYQXNzZWNvIERhdGEg
+U3lzdGVtcyBTLkEuMScwJQYDVQQLEx5DZXJ0dW0gQ2VydGlmaWNhdGlvbiBBdXRo
+b3JpdHkxHzAdBgNVBAMTFkNlcnR1bSBUcnVzdGVkIFJvb3QgQ0EwggIiMA0GCSqG
+SIb3DQEBAQUAA4ICDwAwggIKAoICAQDRLY67tzbqbTeRn06TpwXkKQMlzhyC93yZ
+n0EGze2jusDbCSzBfN8pfktlL5On1AFrAygYo9idBcEq2EXxkd7fO9CAAozPOA/q
+p1x4EaTByIVcJdPTsuclzxFUl6s1wB52HO8AU5853BSlLCIls3Jy/I2z5T4IHhQq
+NwuIPMqw9MjCoa68wb4pZ1Xi/K1ZXP69VyywkI3C7Te2fJmItdUDmj0VDT06qKhF
+8JVOJVkdzZhpu9PMMsmN74H+rX2Ju7pgE8pllWeg8xn2A1bUatMn4qGtg/BKEiJ3
+HAVz4hlxQsDsdUaakFjgao4rpUYwBI4Zshfjvqm6f1bxJAPXsiEodg42MEx51UGa
+mqi4NboMOvJEGyCI98Ul1z3G4z5D3Yf+xOr1Uz5MZf87Sst4WmsXXw3Hw09Omiqi
+7VdNIuJGmj8PkTQkfVXjjJU30xrwCSss0smNtA0Aq2cpKNgB9RkEth2+dv5yXMSF
+ytKAQd8FqKPVhJBPC/PgP5sZ0jeJP/J7UhyM9uH3PAeXjA6iWYEMspA90+NZRu0P
+qafegGtaqge2Gcu8V/OXIXoMsSt0Puvap2ctTMSYnjYJdmZm/Bo/6khUHL4wvYBQ
+v3y1zgD2DGHZ5yQD4OMBgQ692IU0iL2yNqh7XAjlRICMb/gv1SHKHRzQ+8S1h9E6
+Tsd2tTVItQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBSM+xx1
+vALTn04uSNn5YFSqxLNP+jAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQENBQAD
+ggIBAEii1QALLtA/vBzVtVRJHlpr9OTy4EA34MwUe7nJ+jW1dReTagVphZzNTxl4
+WxmB82M+w85bj/UvXgF2Ez8sALnNllI5SW0ETsXpD4YN4fqzX4IS8TrOZgYkNCvo
+zMrnadyHncI013nR03e4qllY/p0m+jiGPp2Kh2RX5Rc64vmNueMzeMGQ2Ljdt4NR
+5MTMI9UGfOZR0800McD2RrsLrfw9EAUqO0qRJe6M1ISHgCq8CYyqOhNf6DR5UMEQ
+GfnTKB7U0VEwKbOukGfWHwpjscWpxkIxYxeU72nLL/qMFH3EQxiJ2fAyQOaA4kZf
+5ePBAFmo+eggvIksDkc0C+pXwlM2/KfUrzHN/gLldfq5Jwn58/U7yn2fqSLLiMmq
+0Uc9NneoWWRrJ8/vJ8HjJLWG965+Mk2weWjROeiQWMODvA8s1pfrzgzhIMfatz7D
+P78v3DSk+yshzWePS/Tj6tQ/50+6uaWTRRxmHyH6ZF5v4HaUMst19W7l9o/HuKTM
+qJZ9ZPskWkoDbGs4xugDQ5r3V7mzKWmTOPQD8rv7gmsHINFSH5pkAnuYZttcTVoP
+0ISVoDwUQwbKytu4QTbaakRnh6+v40URFWkIsr4WOZckbxJF0WddCajJFdr60qZf
+E2Efv4WstK2tBZQIgx51F9NxO5NQI1mg7TyRVJ12AMXDuDjb
+-----END CERTIFICATE-----
diff --git a/lib/diskcache_py2/__init__.py b/lib/diskcache_py2/__init__.py
index a98cfee..e4d747b 100644
--- a/lib/diskcache_py2/__init__.py
+++ b/lib/diskcache_py2/__init__.py
@@ -46,8 +46,8 @@ except Exception:  # pylint: disable=broad-except
     pass
 
 __title__ = 'diskcache'
-__version__ = '5.0.3'
-__build__ = 0x050003
+__version__ = '5.1.0'
+__build__ = 0x050100
 __author__ = 'Grant Jenks'
 __license__ = 'Apache 2.0'
 __copyright__ = 'Copyright 2016-2020 Grant Jenks'
diff --git a/lib/diskcache_py2/fanout.py b/lib/diskcache_py2/fanout.py
index fcd1861..15716b7 100644
--- a/lib/diskcache_py2/fanout.py
+++ b/lib/diskcache_py2/fanout.py
@@ -1,5 +1,6 @@
 "Fanout cache automatically shards keys and values."
 
+import contextlib as cl
 import itertools as it
 import operator
 import os.path as op
@@ -69,9 +70,46 @@ class FanoutCache(object):
 
 
     def __getattr__(self, name):
+        safe_names = {'timeout', 'disk'}
+        valid_name = name in DEFAULT_SETTINGS or name in safe_names
+        assert valid_name, 'cannot access {} in cache shard'.format(name)
         return getattr(self._shards[0], name)
 
 
+    @cl.contextmanager
+    def transact(self, retry=True):
+        """Context manager to perform a transaction by locking the cache.
+
+        While the cache is locked, no other write operation is permitted.
+        Transactions should therefore be as short as possible. Read and write
+        operations performed in a transaction are atomic. Read operations may
+        occur concurrent to a transaction.
+
+        Transactions may be nested and may not be shared between threads.
+
+        Blocks until transactions are held on all cache shards by retrying as
+        necessary.
+
+        >>> cache = FanoutCache()
+        >>> with cache.transact():  # Atomically increment two keys.
+        ...     _ = cache.incr('total', 123.4)
+        ...     _ = cache.incr('count', 1)
+        >>> with cache.transact():  # Atomically calculate average.
+        ...     average = cache['total'] / cache['count']
+        >>> average
+        123.4
+
+        :return: context manager for use in `with` statement
+
+        """
+        assert retry, 'retry must be True in FanoutCache'
+        with cl.ExitStack() as stack:
+            for shard in self._shards:
+                shard_transaction = shard.transact(retry=True)
+                stack.enter_context(shard_transaction)
+            yield
+
+
     def set(self, key, value, expire=None, read=False, tag=None, retry=False):
         """Set `key` and `value` item in cache.
 
diff --git a/lib/diskcache_py3/__init__.py b/lib/diskcache_py3/__init__.py
index a98cfee..e4d747b 100644
--- a/lib/diskcache_py3/__init__.py
+++ b/lib/diskcache_py3/__init__.py
@@ -46,8 +46,8 @@ except Exception:  # pylint: disable=broad-except
     pass
 
 __title__ = 'diskcache'
-__version__ = '5.0.3'
-__build__ = 0x050003
+__version__ = '5.1.0'
+__build__ = 0x050100
 __author__ = 'Grant Jenks'
 __license__ = 'Apache 2.0'
 __copyright__ = 'Copyright 2016-2020 Grant Jenks'
diff --git a/lib/diskcache_py3/fanout.py b/lib/diskcache_py3/fanout.py
index a579a17..7e227c8 100644
--- a/lib/diskcache_py3/fanout.py
+++ b/lib/diskcache_py3/fanout.py
@@ -1,5 +1,6 @@
 "Fanout cache automatically shards keys and values."
 
+import contextlib as cl
 import functools
 import itertools as it
 import operator
@@ -58,9 +59,46 @@ class FanoutCache(object):
 
 
     def __getattr__(self, name):
+        safe_names = {'timeout', 'disk'}
+        valid_name = name in DEFAULT_SETTINGS or name in safe_names
+        assert valid_name, 'cannot access {} in cache shard'.format(name)
         return getattr(self._shards[0], name)
 
 
+    @cl.contextmanager
+    def transact(self, retry=True):
+        """Context manager to perform a transaction by locking the cache.
+
+        While the cache is locked, no other write operation is permitted.
+        Transactions should therefore be as short as possible. Read and write
+        operations performed in a transaction are atomic. Read operations may
+        occur concurrent to a transaction.
+
+        Transactions may be nested and may not be shared between threads.
+
+        Blocks until transactions are held on all cache shards by retrying as
+        necessary.
+
+        >>> cache = FanoutCache()
+        >>> with cache.transact():  # Atomically increment two keys.
+        ...     _ = cache.incr('total', 123.4)
+        ...     _ = cache.incr('count', 1)
+        >>> with cache.transact():  # Atomically calculate average.
+        ...     average = cache['total'] / cache['count']
+        >>> average
+        123.4
+
+        :return: context manager for use in `with` statement
+
+        """
+        assert retry, 'retry must be True in FanoutCache'
+        with cl.ExitStack() as stack:
+            for shard in self._shards:
+                shard_transaction = shard.transact(retry=True)
+                stack.enter_context(shard_transaction)
+            yield
+
+
     def set(self, key, value, expire=None, read=False, tag=None, retry=False):
         """Set `key` and `value` item in cache.
 
diff --git a/lib/encodingKludge.py b/lib/encodingKludge.py
index 77949b2..2b1cdf9 100644
--- a/lib/encodingKludge.py
+++ b/lib/encodingKludge.py
@@ -19,28 +19,61 @@
 import os
 import logging
 import locale
+import sys
 
-from six import iteritems, PY2, text_type, string_types
+from six import iteritems, moves, PY2, text_type, string_types
 
 logger = logging.getLogger('encodingKludge')
 logger.addHandler(logging.NullHandler())
 
+# noinspection PyUnreachableCode
+if False:
+    # noinspection PyUnresolvedReferences
+    from typing import AnyStr
 
 SYS_ENCODING = None
-try:
-    locale.setlocale(locale.LC_ALL, '')
-except (locale.Error, IOError):
-    pass
-try:
-    SYS_ENCODING = locale.getpreferredencoding()
-except (locale.Error, IOError):
-    pass
-
-# For OSes that are poorly configured I'll just randomly force UTF-8
-if not SYS_ENCODING or SYS_ENCODING in ('ANSI_X3.4-1968', 'US-ASCII', 'ASCII'):
-    SYS_ENCODING = 'UTF-8'
+EXIT_BAD_ENCODING = None
 
 
+def set_sys_encoding():
+    # type: (...) -> (bool, AnyStr)
+    """Set system encoding
+
+    :return: The encoding that is set
+    """
+    sys_encoding = None
+    should_exit = False
+    try:
+        locale.setlocale(locale.LC_ALL, '')
+    except (locale.Error, IOError):
+        pass
+    try:
+        sys_encoding = locale.getpreferredencoding()
+    except (locale.Error, IOError):
+        pass
+
+    # For OSes that are poorly configured I'll just randomly force UTF-8
+    if not sys_encoding or sys_encoding in ('ANSI_X3.4-1968', 'US-ASCII', 'ASCII'):
+        sys_encoding = 'UTF-8'
+
+    if not hasattr(sys, 'setdefaultencoding'):
+        moves.reload_module(sys)
+
+    if PY2:
+        try:
+            # On non-unicode builds this raises an AttributeError,
+            # if encoding type is not valid it throws a LookupError
+            # noinspection PyUnresolvedReferences
+            sys.setdefaultencoding(sys_encoding)
+        except (BaseException, Exception):
+            should_exit = True
+
+    return should_exit, sys_encoding
+
+
+if None is EXIT_BAD_ENCODING:
+    EXIT_BAD_ENCODING, SYS_ENCODING = set_sys_encoding()
+
 # This module tries to deal with the apparently random behavior of python when dealing with unicode <-> utf-8
 # encodings. It tries to just use unicode, but if that fails then it tries forcing it to utf-8. Any functions
 # which return something should always return unicode.
diff --git a/lib/humanize/__init__.py b/lib/humanize/__init__.py
index cb9657c..0ccf63e 100644
--- a/lib/humanize/__init__.py
+++ b/lib/humanize/__init__.py
@@ -1,7 +1,16 @@
 """Main package for humanize."""
+
 from humanize.filesize import naturalsize
-from humanize.i18n import activate, deactivate
-from humanize.number import apnumber, fractional, intcomma, intword, ordinal, scientific
+from humanize.i18n import activate, deactivate, thousands_separator
+from humanize.number import (
+    apnumber,
+    clamp,
+    fractional,
+    intcomma,
+    intword,
+    ordinal,
+    scientific,
+)
 from humanize.time import (
     naturaldate,
     naturalday,
@@ -10,13 +19,14 @@ from humanize.time import (
     precisedelta,
 )
 
-__version__ = VERSION = '3.1.0'
+__version__ = VERSION = '3.5.0'
 
 
 __all__ = [
     "__version__",
     "activate",
     "apnumber",
+    "clamp",
     "deactivate",
     "fractional",
     "intcomma",
@@ -29,5 +39,6 @@ __all__ = [
     "ordinal",
     "precisedelta",
     "scientific",
+    "thousands_separator",
     "VERSION",
 ]
diff --git a/lib/humanize/i18n.py b/lib/humanize/i18n.py
index c017789..195a3f0 100644
--- a/lib/humanize/i18n.py
+++ b/lib/humanize/i18n.py
@@ -4,12 +4,18 @@ import gettext as gettext_module
 import os.path
 from threading import local
 
-__all__ = ["activate", "deactivate", "gettext", "ngettext"]
+__all__ = ["activate", "deactivate", "gettext", "ngettext", "thousands_separator"]
 
 _TRANSLATIONS = {None: gettext_module.NullTranslations()}
 _CURRENT = local()
 
 
+# Mapping of locale to thousands separator
+_THOUSANDS_SEPARATOR = {
+    "fr_FR": " ",
+}
+
+
 def _get_default_locale_path():
     try:
         if __file__ is None:
@@ -130,3 +136,36 @@ def gettext_noop(message):
         str: Original text, unchanged.
     """
     return message
+
+
+def ngettext_noop(singular, plural):
+    """Mark two strings as pluralized translations without translating them.
+
+    Example usage:
+    ```python
+    CONSTANTS = [ngettext_noop('first', 'firsts'), ngettext_noop('second', 'seconds')]
+    def num_name(n):
+        return ngettext(*CONSTANTS[n])
+    ```
+
+    Args:
+        singular (str): Singular text to translate in the future.
+        plural (str): Plural text to translate in the future.
+
+    Returns:
+        tuple: Original text, unchanged.
+    """
+    return (singular, plural)
+
+
+def thousands_separator():
+    """Return the thousands separator for a locale, default to comma.
+
+    Returns:
+         str: Thousands separator.
+    """
+    try:
+        sep = _THOUSANDS_SEPARATOR[_CURRENT.locale]
+    except (AttributeError, KeyError):
+        sep = ","
+    return sep
diff --git a/lib/humanize/locale/de_DE/LC_MESSAGES/humanize.po b/lib/humanize/locale/de_DE/LC_MESSAGES/humanize.po
index 8b35e93..51a2254 100644
--- a/lib/humanize/locale/de_DE/LC_MESSAGES/humanize.po
+++ b/lib/humanize/locale/de_DE/LC_MESSAGES/humanize.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: humanize\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-29 21:07+0300\n"
+"POT-Creation-Date: 2021-04-30 22:34+0200\n"
 "PO-Revision-Date: 2016-12-18 11:50+0100\n"
 "Last-Translator: Christian Klein <chris@5711.org>\n"
 "Language-Team: German\n"
@@ -19,269 +19,297 @@ msgstr ""
 "Generated-By: Christian Klein\n"
 "X-Generator: Sublime Text 3\n"
 
-#: src/humanize/number.py:31
+#: src/humanize/number.py:56
 msgctxt "0"
 msgid "th"
 msgstr "."
 
-#: src/humanize/number.py:32
+#: src/humanize/number.py:57
 msgctxt "1"
 msgid "st"
 msgstr "."
 
-#: src/humanize/number.py:33
+#: src/humanize/number.py:58
 msgctxt "2"
 msgid "nd"
 msgstr "."
 
-#: src/humanize/number.py:34
+#: src/humanize/number.py:59
 msgctxt "3"
 msgid "rd"
 msgstr "."
 
-#: src/humanize/number.py:35
+#: src/humanize/number.py:60
 msgctxt "4"
 msgid "th"
 msgstr "."
 
-#: src/humanize/number.py:36
+#: src/humanize/number.py:61
 msgctxt "5"
 msgid "th"
 msgstr "."
 
-#: src/humanize/number.py:37
+#: src/humanize/number.py:62
 msgctxt "6"
 msgid "th"
 msgstr "."
 
-#: src/humanize/number.py:38
+#: src/humanize/number.py:63
 msgctxt "7"
 msgid "th"
 msgstr "."
 
-#: src/humanize/number.py:39
+#: src/humanize/number.py:64
 msgctxt "8"
 msgid "th"
 msgstr "."
 
-#: src/humanize/number.py:40
+#: src/humanize/number.py:65
 msgctxt "9"
 msgid "th"
 msgstr "."
 
-#: src/humanize/number.py:82
+#: src/humanize/number.py:126
+msgid "thousand"
+msgid_plural "thousand"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/humanize/number.py:127
 msgid "million"
-msgstr "Million"
+msgid_plural "million"
+msgstr[0] "Million"
+msgstr[1] "Million"
 
-#: src/humanize/number.py:83
+#: src/humanize/number.py:128
 msgid "billion"
-msgstr "Milliarde"
+msgid_plural "billion"
+msgstr[0] "Milliarde"
+msgstr[1] "Milliarde"
 
-#: src/humanize/number.py:84
+#: src/humanize/number.py:129
 msgid "trillion"
-msgstr "Billion"
+msgid_plural "trillion"
+msgstr[0] "Billion"
+msgstr[1] "Billion"
 
-#: src/humanize/number.py:85
+#: src/humanize/number.py:130
 msgid "quadrillion"
-msgstr "Billiarde"
+msgid_plural "quadrillion"
+msgstr[0] "Billiarde"
+msgstr[1] "Billiarde"
 
-#: src/humanize/number.py:86
+#: src/humanize/number.py:131
 msgid "quintillion"
-msgstr "Trillion"
+msgid_plural "quintillion"
+msgstr[0] "Trillion"
+msgstr[1] "Trillion"
 
-#: src/humanize/number.py:87
+#: src/humanize/number.py:132
 msgid "sextillion"
-msgstr "Trilliarde"
+msgid_plural "sextillion"
+msgstr[0] "Trilliarde"
+msgstr[1] "Trilliarde"
 
-#: src/humanize/number.py:88
+#: src/humanize/number.py:133
 msgid "septillion"
-msgstr "Quadrillion"
+msgid_plural "septillion"
+msgstr[0] "Quadrillion"
+msgstr[1] "Quadrillion"
 
-#: src/humanize/number.py:89
+#: src/humanize/number.py:134
 msgid "octillion"
-msgstr "Quadrillarde"
+msgid_plural "octillion"
+msgstr[0] "Quadrillarde"
+msgstr[1] "Quadrillarde"
 
-#: src/humanize/number.py:90
+#: src/humanize/number.py:135
 msgid "nonillion"
-msgstr "Quintillion"
+msgid_plural "nonillion"
+msgstr[0] "Quintillion"
+msgstr[1] "Quintillion"
 
-#: src/humanize/number.py:91
+#: src/humanize/number.py:136
 msgid "decillion"
-msgstr "Quintilliarde"
+msgid_plural "decillion"
+msgstr[0] "Quintilliarde"
+msgstr[1] "Quintilliarde"
 
-#: src/humanize/number.py:92
+#: src/humanize/number.py:137
 msgid "googol"
-msgstr "Googol"
+msgid_plural "googol"
+msgstr[0] "Googol"
+msgstr[1] "Googol"
 
-#: src/humanize/number.py:147
+#: src/humanize/number.py:228
 msgid "zero"
 msgstr "null"
 
-#: src/humanize/number.py:148
+#: src/humanize/number.py:229
 msgid "one"
 msgstr "eins"
 
-#: src/humanize/number.py:149
+#: src/humanize/number.py:230
 msgid "two"
 msgstr "zwei"
 
-#: src/humanize/number.py:150
+#: src/humanize/number.py:231
 msgid "three"
 msgstr "drei"
 
-#: src/humanize/number.py:151
+#: src/humanize/number.py:232
 msgid "four"
 msgstr "vier"
 
-#: src/humanize/number.py:152
+#: src/humanize/number.py:233
 msgid "five"
 msgstr "fünf"
 
-#: src/humanize/number.py:153
+#: src/humanize/number.py:234
 msgid "six"
 msgstr "sechs"
 
-#: src/humanize/number.py:154
+#: src/humanize/number.py:235
 msgid "seven"
 msgstr "sieben"
 
-#: src/humanize/number.py:155
+#: src/humanize/number.py:236
 msgid "eight"
 msgstr "acht"
 
-#: src/humanize/number.py:156
+#: src/humanize/number.py:237
 msgid "nine"
 msgstr "neun"
 
-#: src/humanize/time.py:119
+#: src/humanize/time.py:133
 #, fuzzy, python-format
 msgid "%d microsecond"
 msgid_plural "%d microseconds"
 msgstr[0] "%d Mikrosekunde"
 msgstr[1] "%d Mikrosekunden"
 
-#: src/humanize/time.py:128
+#: src/humanize/time.py:142
 #, fuzzy, python-format
 msgid "%d millisecond"
 msgid_plural "%d milliseconds"
 msgstr[0] "%d Millisekunde"
 msgstr[1] "%d Millisekunden"
 
-#: src/humanize/time.py:131 src/humanize/time.py:204
+#: src/humanize/time.py:145 src/humanize/time.py:220
 msgid "a moment"
 msgstr "ein Moment"
 
-#: src/humanize/time.py:133
+#: src/humanize/time.py:147
 msgid "a second"
 msgstr "eine Sekunde"
 
-#: src/humanize/time.py:135
+#: src/humanize/time.py:149
 #, python-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d Sekunde"
 msgstr[1] "%d Sekunden"
 
-#: src/humanize/time.py:137
+#: src/humanize/time.py:151
 msgid "a minute"
 msgstr "eine Minute"
 
-#: src/humanize/time.py:140
+#: src/humanize/time.py:154
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d Minute"
 msgstr[1] "%d Minuten"
 
-#: src/humanize/time.py:142
+#: src/humanize/time.py:156
 msgid "an hour"
 msgstr "eine Stunde"
 
-#: src/humanize/time.py:145
+#: src/humanize/time.py:159
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d Stunde"
 msgstr[1] "%d Stunden"
 
-#: src/humanize/time.py:148
+#: src/humanize/time.py:162
 msgid "a day"
 msgstr "ein Tag"
 
-#: src/humanize/time.py:150 src/humanize/time.py:153
+#: src/humanize/time.py:164 src/humanize/time.py:167
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d Tag"
 msgstr[1] "%d Tage"
 
-#: src/humanize/time.py:155
+#: src/humanize/time.py:169
 msgid "a month"
 msgstr "ein Monat"
 
-#: src/humanize/time.py:157
+#: src/humanize/time.py:171
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
 msgstr[0] "%d Monat"
 msgstr[1] "%d Monate"
 
-#: src/humanize/time.py:160
+#: src/humanize/time.py:174
 msgid "a year"
 msgstr "ein Jahr"
 
-#: src/humanize/time.py:162 src/humanize/time.py:171
+#: src/humanize/time.py:176 src/humanize/time.py:185
 #, python-format
 msgid "1 year, %d day"
 msgid_plural "1 year, %d days"
 msgstr[0] "ein Jahr und %d Tag"
 msgstr[1] "ein Jahr und %d Tage"
 
-#: src/humanize/time.py:165
+#: src/humanize/time.py:179
 msgid "1 year, 1 month"
 msgstr "ein Monat"
 
-#: src/humanize/time.py:168
+#: src/humanize/time.py:182
 #, python-format
 msgid "1 year, %d month"
 msgid_plural "1 year, %d months"
 msgstr[0] "ein Jahr und %d Monat"
 msgstr[1] "ein Jahr und %d Monate"
 
-#: src/humanize/time.py:173
+#: src/humanize/time.py:187
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
 msgstr[0] "%d Jahr"
 msgstr[1] "%d Jahre"
 
-#: src/humanize/time.py:201
+#: src/humanize/time.py:217
 #, python-format
 msgid "%s from now"
 msgstr "%s ab jetzt"
 
-#: src/humanize/time.py:201
+#: src/humanize/time.py:217
 #, python-format
 msgid "%s ago"
 msgstr "vor %s"
 
-#: src/humanize/time.py:205
+#: src/humanize/time.py:221
 msgid "now"
 msgstr "jetzt"
 
-#: src/humanize/time.py:227
+#: src/humanize/time.py:244
 msgid "today"
 msgstr "heute"
 
-#: src/humanize/time.py:229
+#: src/humanize/time.py:246
 msgid "tomorrow"
 msgstr "morgen"
 
-#: src/humanize/time.py:231
+#: src/humanize/time.py:248
 msgid "yesterday"
 msgstr "gestern"
 
-#: src/humanize/time.py:498
+#: src/humanize/time.py:534
 #, python-format
 msgid "%s and %s"
 msgstr "%s und %s"
diff --git a/lib/humanize/locale/es_ES/LC_MESSAGES/humanize.po b/lib/humanize/locale/es_ES/LC_MESSAGES/humanize.po
index 68f5b14..219525f 100644
--- a/lib/humanize/locale/es_ES/LC_MESSAGES/humanize.po
+++ b/lib/humanize/locale/es_ES/LC_MESSAGES/humanize.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-29 21:07+0300\n"
+"POT-Creation-Date: 2021-04-30 22:34+0200\n"
 "PO-Revision-Date: 2020-03-31 21:08+0200\n"
 "Last-Translator: Álvaro Mondéjar <mondejar1994@gmail.com>\n"
 "Language-Team: \n"
@@ -18,269 +18,297 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 2.3\n"
 
-#: src/humanize/number.py:31
+#: src/humanize/number.py:56
 msgctxt "0"
 msgid "th"
 msgstr "º"
 
-#: src/humanize/number.py:32
+#: src/humanize/number.py:57
 msgctxt "1"
 msgid "st"
 msgstr "º"
 
-#: src/humanize/number.py:33
+#: src/humanize/number.py:58
 msgctxt "2"
 msgid "nd"
 msgstr "º"
 
-#: src/humanize/number.py:34
+#: src/humanize/number.py:59
 msgctxt "3"
 msgid "rd"
 msgstr "º"
 
-#: src/humanize/number.py:35
+#: src/humanize/number.py:60
 msgctxt "4"
 msgid "th"
 msgstr "º"
 
-#: src/humanize/number.py:36
+#: src/humanize/number.py:61
 msgctxt "5"
 msgid "th"
 msgstr "º"
 
-#: src/humanize/number.py:37
+#: src/humanize/number.py:62
 msgctxt "6"
 msgid "th"
 msgstr "º"
 
-#: src/humanize/number.py:38
+#: src/humanize/number.py:63
 msgctxt "7"
 msgid "th"
 msgstr "º"
 
-#: src/humanize/number.py:39
+#: src/humanize/number.py:64
 msgctxt "8"
 msgid "th"
 msgstr "º"
 
-#: src/humanize/number.py:40
+#: src/humanize/number.py:65
 msgctxt "9"
 msgid "th"
 msgstr "º"
 
-#: src/humanize/number.py:82
+#: src/humanize/number.py:126
+msgid "thousand"
+msgid_plural "thousand"
+msgstr[0] "mil"
+msgstr[1] "mil"
+
+#: src/humanize/number.py:127
 msgid "million"
-msgstr "millón"
+msgid_plural "million"
+msgstr[0] "millón"
+msgstr[1] "millones"
 
-#: src/humanize/number.py:83
+#: src/humanize/number.py:128
 msgid "billion"
-msgstr "billón"
+msgid_plural "billion"
+msgstr[0] "billón"
+msgstr[1] "billones"
 
-#: src/humanize/number.py:84
+#: src/humanize/number.py:129
 msgid "trillion"
-msgstr "trillón"
+msgid_plural "trillion"
+msgstr[0] "trillón"
+msgstr[1] "trillones"
 
-#: src/humanize/number.py:85
+#: src/humanize/number.py:130
 msgid "quadrillion"
-msgstr "quatrillón"
+msgid_plural "quadrillion"
+msgstr[0] "quatrillón"
+msgstr[1] "quatrillones"
 
-#: src/humanize/number.py:86
+#: src/humanize/number.py:131
 msgid "quintillion"
-msgstr "quintillón"
+msgid_plural "quintillion"
+msgstr[0] "quintillón"
+msgstr[1] "quintillones"
 
-#: src/humanize/number.py:87
+#: src/humanize/number.py:132
 msgid "sextillion"
-msgstr "sextillón"
+msgid_plural "sextillion"
+msgstr[0] "sextillón"
+msgstr[1] "sextillones"
 
-#: src/humanize/number.py:88
+#: src/humanize/number.py:133
 msgid "septillion"
-msgstr "septillón"
+msgid_plural "septillion"
+msgstr[0] "septillón"
+msgstr[1] "septillones"
 
-#: src/humanize/number.py:89
+#: src/humanize/number.py:134
 msgid "octillion"
-msgstr "octillón"
+msgid_plural "octillion"
+msgstr[0] "octillón"
+msgstr[1] "octillones"
 
-#: src/humanize/number.py:90
+#: src/humanize/number.py:135
 msgid "nonillion"
-msgstr "nonillón"
+msgid_plural "nonillion"
+msgstr[0] "nonillón"
+msgstr[1] "nonillones"
 
-#: src/humanize/number.py:91
+#: src/humanize/number.py:136
 msgid "decillion"
-msgstr "decillón"
+msgid_plural "decillion"
+msgstr[0] "decillón"
+msgstr[1] "decillones"
 
-#: src/humanize/number.py:92
+#: src/humanize/number.py:137
 msgid "googol"
-msgstr "gúgol"
+msgid_plural "googol"
+msgstr[0] "gúgol"
+msgstr[1] "gúgol"
 
-#: src/humanize/number.py:147
+#: src/humanize/number.py:228
 msgid "zero"
 msgstr "cero"
 
-#: src/humanize/number.py:148
+#: src/humanize/number.py:229
 msgid "one"
 msgstr "uno"
 
-#: src/humanize/number.py:149
+#: src/humanize/number.py:230
 msgid "two"
 msgstr "dos"
 
-#: src/humanize/number.py:150
+#: src/humanize/number.py:231
 msgid "three"
 msgstr "tres"
 
-#: src/humanize/number.py:151
+#: src/humanize/number.py:232
 msgid "four"
 msgstr "cuatro"
 
-#: src/humanize/number.py:152
+#: src/humanize/number.py:233
 msgid "five"
 msgstr "cinco"
 
-#: src/humanize/number.py:153
+#: src/humanize/number.py:234
 msgid "six"
 msgstr "seis"
 
-#: src/humanize/number.py:154
+#: src/humanize/number.py:235
 msgid "seven"
 msgstr "siete"
 
-#: src/humanize/number.py:155
+#: src/humanize/number.py:236
 msgid "eight"
 msgstr "ocho"
 
-#: src/humanize/number.py:156
+#: src/humanize/number.py:237
 msgid "nine"
 msgstr "nueve"
 
-#: src/humanize/time.py:119
+#: src/humanize/time.py:133
 #, python-format
 msgid "%d microsecond"
 msgid_plural "%d microseconds"
 msgstr[0] "%d microsegundo"
 msgstr[1] "%d microsegundos"
 
-#: src/humanize/time.py:128
+#: src/humanize/time.py:142
 #, python-format
 msgid "%d millisecond"
 msgid_plural "%d milliseconds"
 msgstr[0] "%d milisegundo"
 msgstr[1] "%d milisegundos"
 
-#: src/humanize/time.py:131 src/humanize/time.py:204
+#: src/humanize/time.py:145 src/humanize/time.py:220
 msgid "a moment"
 msgstr "un momento"
 
-#: src/humanize/time.py:133
+#: src/humanize/time.py:147
 msgid "a second"
 msgstr "un segundo"
 
-#: src/humanize/time.py:135
+#: src/humanize/time.py:149
 #, python-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
-#: src/humanize/time.py:137
+#: src/humanize/time.py:151
 msgid "a minute"
 msgstr "un minuto"
 
-#: src/humanize/time.py:140
+#: src/humanize/time.py:154
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: src/humanize/time.py:142
+#: src/humanize/time.py:156
 msgid "an hour"
 msgstr "una hora"
 
-#: src/humanize/time.py:145
+#: src/humanize/time.py:159
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: src/humanize/time.py:148
+#: src/humanize/time.py:162
 msgid "a day"
 msgstr "un día"
 
-#: src/humanize/time.py:150 src/humanize/time.py:153
+#: src/humanize/time.py:164 src/humanize/time.py:167
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d día"
 msgstr[1] "%d días"
 
-#: src/humanize/time.py:155
+#: src/humanize/time.py:169
 msgid "a month"
 msgstr "un mes"
 
-#: src/humanize/time.py:157
+#: src/humanize/time.py:171
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
 msgstr[0] "%d mes"
 msgstr[1] "%d meses"
 
-#: src/humanize/time.py:160
+#: src/humanize/time.py:174
 msgid "a year"
 msgstr "un año"
 
-#: src/humanize/time.py:162 src/humanize/time.py:171
+#: src/humanize/time.py:176 src/humanize/time.py:185
 #, python-format
 msgid "1 year, %d day"
 msgid_plural "1 year, %d days"
 msgstr[0] "1 año y %d día"
 msgstr[1] "1 año y %d días"
 
-#: src/humanize/time.py:165
+#: src/humanize/time.py:179
 msgid "1 year, 1 month"
 msgstr "1 año y 1 mes"
 
-#: src/humanize/time.py:168
+#: src/humanize/time.py:182
 #, python-format
 msgid "1 year, %d month"
 msgid_plural "1 year, %d months"
 msgstr[0] "1 año y %d mes"
 msgstr[1] "1 año y %d meses"
 
-#: src/humanize/time.py:173
+#: src/humanize/time.py:187
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
 msgstr[0] "%d año"
 msgstr[1] "%d años"
 
-#: src/humanize/time.py:201
+#: src/humanize/time.py:217
 #, python-format
 msgid "%s from now"
 msgstr "en %s"
 
-#: src/humanize/time.py:201
+#: src/humanize/time.py:217
 #, python-format
 msgid "%s ago"
 msgstr "hace %s"
 
-#: src/humanize/time.py:205
+#: src/humanize/time.py:221
 msgid "now"
 msgstr "ahora"
 
-#: src/humanize/time.py:227
+#: src/humanize/time.py:244
 msgid "today"
 msgstr "hoy"
 
-#: src/humanize/time.py:229
+#: src/humanize/time.py:246
 msgid "tomorrow"
 msgstr "mañana"
 
-#: src/humanize/time.py:231
+#: src/humanize/time.py:248
 msgid "yesterday"
 msgstr "ayer"
 
-#: src/humanize/time.py:498
+#: src/humanize/time.py:534
 #, python-format
 msgid "%s and %s"
 msgstr ""
diff --git a/lib/humanize/locale/fa_IR/LC_MESSAGES/humanize.po b/lib/humanize/locale/fa_IR/LC_MESSAGES/humanize.po
index c2a70da..b3b9ad8 100644
--- a/lib/humanize/locale/fa_IR/LC_MESSAGES/humanize.po
+++ b/lib/humanize/locale/fa_IR/LC_MESSAGES/humanize.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: humanize\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-29 21:07+0300\n"
+"POT-Creation-Date: 2021-04-30 22:34+0200\n"
 "PO-Revision-Date: 2017-01-10 02:44+0330\n"
 "Last-Translator: Christian Klein <chris@5711.org>\n"
 "Language-Team: German\n"
@@ -19,269 +19,297 @@ msgstr ""
 "Generated-By: Christian Klein\n"
 "X-Generator: Poedit 1.5.4\n"
 
-#: src/humanize/number.py:31
+#: src/humanize/number.py:56
 msgctxt "0"
 msgid "th"
 msgstr "."
 
-#: src/humanize/number.py:32
+#: src/humanize/number.py:57
 msgctxt "1"
 msgid "st"
 msgstr "اولین"
 
-#: src/humanize/number.py:33
+#: src/humanize/number.py:58
 msgctxt "2"
 msgid "nd"
 msgstr "دومین"
 
-#: src/humanize/number.py:34
+#: src/humanize/number.py:59
 msgctxt "3"
 msgid "rd"
 msgstr "سومین"
 
-#: src/humanize/number.py:35
+#: src/humanize/number.py:60
 msgctxt "4"
 msgid "th"
 msgstr "چهارمین"
 
-#: src/humanize/number.py:36
+#: src/humanize/number.py:61
 msgctxt "5"
 msgid "th"
 msgstr "پنجمین"
 
-#: src/humanize/number.py:37
+#: src/humanize/number.py:62
 msgctxt "6"
 msgid "th"
 msgstr "ششمین"
 
-#: src/humanize/number.py:38
+#: src/humanize/number.py:63
 msgctxt "7"
 msgid "th"
 msgstr "هفتمین"
 
-#: src/humanize/number.py:39
+#: src/humanize/number.py:64
 msgctxt "8"
 msgid "th"
 msgstr "هشتمین"
 
-#: src/humanize/number.py:40
+#: src/humanize/number.py:65
 msgctxt "9"
 msgid "th"
 msgstr "نهمین"
 
-#: src/humanize/number.py:82
+#: src/humanize/number.py:126
+msgid "thousand"
+msgid_plural "thousand"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/humanize/number.py:127
 msgid "million"
-msgstr "میلیون"
+msgid_plural "million"
+msgstr[0] "میلیون"
+msgstr[1] "میلیون"
 
-#: src/humanize/number.py:83
+#: src/humanize/number.py:128
 msgid "billion"
-msgstr "میلیارد"
+msgid_plural "billion"
+msgstr[0] "میلیارد"
+msgstr[1] "میلیارد"
 
-#: src/humanize/number.py:84
+#: src/humanize/number.py:129
 msgid "trillion"
-msgstr "ترلیون"
+msgid_plural "trillion"
+msgstr[0] "ترلیون"
+msgstr[1] "ترلیون"
 
-#: src/humanize/number.py:85
+#: src/humanize/number.py:130
 msgid "quadrillion"
-msgstr "کوادریلیون"
+msgid_plural "quadrillion"
+msgstr[0] "کوادریلیون"
+msgstr[1] "کوادریلیون"
 
-#: src/humanize/number.py:86
+#: src/humanize/number.py:131
 msgid "quintillion"
-msgstr "کوانتیلیون"
+msgid_plural "quintillion"
+msgstr[0] "کوانتیلیون"
+msgstr[1] "کوانتیلیون"
 
-#: src/humanize/number.py:87
+#: src/humanize/number.py:132
 msgid "sextillion"
-msgstr "سکستیلیون"
+msgid_plural "sextillion"
+msgstr[0] "سکستیلیون"
+msgstr[1] "سکستیلیون"
 
-#: src/humanize/number.py:88
+#: src/humanize/number.py:133
 msgid "septillion"
-msgstr "سپتیلیون"
+msgid_plural "septillion"
+msgstr[0] "سپتیلیون"
+msgstr[1] "سپتیلیون"
 
-#: src/humanize/number.py:89
+#: src/humanize/number.py:134
 msgid "octillion"
-msgstr "اوکتیلیون"
+msgid_plural "octillion"
+msgstr[0] "اوکتیلیون"
+msgstr[1] "اوکتیلیون"
 
-#: src/humanize/number.py:90
+#: src/humanize/number.py:135
 msgid "nonillion"
-msgstr "نونیلیون"
+msgid_plural "nonillion"
+msgstr[0] "نونیلیون"
+msgstr[1] "نونیلیون"
 
-#: src/humanize/number.py:91
+#: src/humanize/number.py:136
 msgid "decillion"
-msgstr "دسیلیون"
+msgid_plural "decillion"
+msgstr[0] "دسیلیون"
+msgstr[1] "دسیلیون"
 
-#: src/humanize/number.py:92
+#: src/humanize/number.py:137
 msgid "googol"
-msgstr "گوگول"
+msgid_plural "googol"
+msgstr[0] "گوگول"
+msgstr[1] "گوگول"
 
-#: src/humanize/number.py:147
+#: src/humanize/number.py:228
 msgid "zero"
 msgstr ""
 
-#: src/humanize/number.py:148
+#: src/humanize/number.py:229
 msgid "one"
 msgstr "یک"
 
-#: src/humanize/number.py:149
+#: src/humanize/number.py:230
 msgid "two"
 msgstr "دو"
 
-#: src/humanize/number.py:150
+#: src/humanize/number.py:231
 msgid "three"
 msgstr "سه"
 
-#: src/humanize/number.py:151
+#: src/humanize/number.py:232
 msgid "four"
 msgstr "چهار"
 
-#: src/humanize/number.py:152
+#: src/humanize/number.py:233
 msgid "five"
 msgstr "پنج"
 
-#: src/humanize/number.py:153
+#: src/humanize/number.py:234
 msgid "six"
 msgstr "شش"
 
-#: src/humanize/number.py:154
+#: src/humanize/number.py:235
 msgid "seven"
 msgstr "هفت"
 
-#: src/humanize/number.py:155
+#: src/humanize/number.py:236
 msgid "eight"
 msgstr "هشت"
 
-#: src/humanize/number.py:156
+#: src/humanize/number.py:237
 msgid "nine"
 msgstr "نه"
 
-#: src/humanize/time.py:119
-#, fuzzy, python-format
+#: src/humanize/time.py:133
+#, python-format
 msgid "%d microsecond"
 msgid_plural "%d microseconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/humanize/time.py:128
-#, fuzzy, python-format
+#: src/humanize/time.py:142
+#, python-format
 msgid "%d millisecond"
 msgid_plural "%d milliseconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/humanize/time.py:131 src/humanize/time.py:204
+#: src/humanize/time.py:145 src/humanize/time.py:220
 msgid "a moment"
 msgstr "یک لحظه"
 
-#: src/humanize/time.py:133
+#: src/humanize/time.py:147
 msgid "a second"
 msgstr "یک ثانیه"
 
-#: src/humanize/time.py:135
+#: src/humanize/time.py:149
 #, python-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d ثانیه"
 msgstr[1] "%d ثانیه"
 
-#: src/humanize/time.py:137
+#: src/humanize/time.py:151
 msgid "a minute"
 msgstr "یک دقیقه"
 
-#: src/humanize/time.py:140
+#: src/humanize/time.py:154
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d دقیقه"
 msgstr[1] "%d دقیقه"
 
-#: src/humanize/time.py:142
+#: src/humanize/time.py:156
 msgid "an hour"
 msgstr "یک ساعت"
 
-#: src/humanize/time.py:145
+#: src/humanize/time.py:159
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d ساعت"
 msgstr[1] "%d ساعت"
 
-#: src/humanize/time.py:148
+#: src/humanize/time.py:162
 msgid "a day"
 msgstr "یک روز"
 
-#: src/humanize/time.py:150 src/humanize/time.py:153
+#: src/humanize/time.py:164 src/humanize/time.py:167
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d روز"
 msgstr[1] "%d روز"
 
-#: src/humanize/time.py:155
+#: src/humanize/time.py:169
 msgid "a month"
 msgstr "یک ماه"
 
-#: src/humanize/time.py:157
+#: src/humanize/time.py:171
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
 msgstr[0] "%d ماه"
 msgstr[1] "%d ماه"
 
-#: src/humanize/time.py:160
+#: src/humanize/time.py:174
 msgid "a year"
 msgstr "یک سال"
 
-#: src/humanize/time.py:162 src/humanize/time.py:171
+#: src/humanize/time.py:176 src/humanize/time.py:185
 #, python-format
 msgid "1 year, %d day"
 msgid_plural "1 year, %d days"
 msgstr[0] "۱ سال و %d روز"
 msgstr[1] "۱ سال و %d روز"
 
-#: src/humanize/time.py:165
+#: src/humanize/time.py:179
 msgid "1 year, 1 month"
 msgstr "۱ سال و ۱ ماه"
 
-#: src/humanize/time.py:168
+#: src/humanize/time.py:182
 #, python-format
 msgid "1 year, %d month"
 msgid_plural "1 year, %d months"
 msgstr[0] "۱ سال و %d ماه"
 msgstr[1] "۱ سال و %d ماه"
 
-#: src/humanize/time.py:173
+#: src/humanize/time.py:187
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
 msgstr[0] "%d سال"
 msgstr[1] "%d سال"
 
-#: src/humanize/time.py:201
+#: src/humanize/time.py:217
 #, python-format
 msgid "%s from now"
 msgstr "%s تا به اکنون"
 
-#: src/humanize/time.py:201
+#: src/humanize/time.py:217
 #, python-format
 msgid "%s ago"
 msgstr "%s پیش"
 
-#: src/humanize/time.py:205
+#: src/humanize/time.py:221
 msgid "now"
 msgstr "اکنون"
 
-#: src/humanize/time.py:227
+#: src/humanize/time.py:244
 msgid "today"
 msgstr "امروز"
 
-#: src/humanize/time.py:229
+#: src/humanize/time.py:246
 msgid "tomorrow"
 msgstr "فردا"
 
-#: src/humanize/time.py:231
+#: src/humanize/time.py:248
 msgid "yesterday"
 msgstr "دیروز"
 
-#: src/humanize/time.py:498
+#: src/humanize/time.py:534
 #, python-format
 msgid "%s and %s"
 msgstr ""
diff --git a/lib/humanize/locale/fi_FI/LC_MESSAGES/humanize.po b/lib/humanize/locale/fi_FI/LC_MESSAGES/humanize.po
index 1226296..e07c558 100644
--- a/lib/humanize/locale/fi_FI/LC_MESSAGES/humanize.po
+++ b/lib/humanize/locale/fi_FI/LC_MESSAGES/humanize.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: humanize\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-29 21:07+0300\n"
+"POT-Creation-Date: 2021-04-30 22:34+0200\n"
 "PO-Revision-Date: 2017-03-02 11:26+0200\n"
 "Last-Translator: Ville Skyttä <ville.skytta@iki.fi>\n"
 "Language-Team: Finnish\n"
@@ -18,269 +18,297 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.8.12\n"
 
-#: src/humanize/number.py:31
+#: src/humanize/number.py:56
 msgctxt "0"
 msgid "th"
 msgstr "."
 
-#: src/humanize/number.py:32
+#: src/humanize/number.py:57
 msgctxt "1"
 msgid "st"
 msgstr "."
 
-#: src/humanize/number.py:33
+#: src/humanize/number.py:58
 msgctxt "2"
 msgid "nd"
 msgstr "."
 
-#: src/humanize/number.py:34
+#: src/humanize/number.py:59
 msgctxt "3"
 msgid "rd"
 msgstr "."
 
-#: src/humanize/number.py:35
+#: src/humanize/number.py:60
 msgctxt "4"
 msgid "th"
 msgstr "."
 
-#: src/humanize/number.py:36
+#: src/humanize/number.py:61
 msgctxt "5"
 msgid "th"
 msgstr "."
 
-#: src/humanize/number.py:37
+#: src/humanize/number.py:62
 msgctxt "6"
 msgid "th"
 msgstr "."
 
-#: src/humanize/number.py:38
+#: src/humanize/number.py:63
 msgctxt "7"
 msgid "th"
 msgstr "."
 
-#: src/humanize/number.py:39
+#: src/humanize/number.py:64
 msgctxt "8"
 msgid "th"
 msgstr "."
 
-#: src/humanize/number.py:40
+#: src/humanize/number.py:65
 msgctxt "9"
 msgid "th"
 msgstr "."
 
-#: src/humanize/number.py:82
+#: src/humanize/number.py:126
+msgid "thousand"
+msgid_plural "thousand"
+msgstr[0] "tuhatta"
+msgstr[1] "tuhatta"
+
+#: src/humanize/number.py:127
 msgid "million"
-msgstr "miljoonaa"
+msgid_plural "million"
+msgstr[0] "miljoonaa"
+msgstr[1] "miljoonaa"
 
-#: src/humanize/number.py:83
+#: src/humanize/number.py:128
 msgid "billion"
-msgstr "miljardia"
+msgid_plural "billion"
+msgstr[0] "miljardia"
+msgstr[1] "miljardia"
 
-#: src/humanize/number.py:84
+#: src/humanize/number.py:129
 msgid "trillion"
-msgstr "biljoonaa"
+msgid_plural "trillion"
+msgstr[0] "biljoonaa"
+msgstr[1] "biljoonaa"
 
-#: src/humanize/number.py:85
+#: src/humanize/number.py:130
 msgid "quadrillion"
-msgstr "kvadriljoonaa"
+msgid_plural "quadrillion"
+msgstr[0] "kvadriljoonaa"
+msgstr[1] "kvadriljoonaa"
 
-#: src/humanize/number.py:86
+#: src/humanize/number.py:131
 msgid "quintillion"
-msgstr "kvintiljoonaa"
+msgid_plural "quintillion"
+msgstr[0] "kvintiljoonaa"
+msgstr[1] "kvintiljoonaa"
 
-#: src/humanize/number.py:87
+#: src/humanize/number.py:132
 msgid "sextillion"
-msgstr "sekstiljoonaa"
+msgid_plural "sextillion"
+msgstr[0] "sekstiljoonaa"
+msgstr[1] "sekstiljoonaa"
 
-#: src/humanize/number.py:88
+#: src/humanize/number.py:133
 msgid "septillion"
-msgstr "septiljoonaa"
+msgid_plural "septillion"
+msgstr[0] "septiljoonaa"
+msgstr[1] "septiljoonaa"
 
-#: src/humanize/number.py:89
+#: src/humanize/number.py:134
 msgid "octillion"
-msgstr "oktiljoonaa"
+msgid_plural "octillion"
+msgstr[0] "oktiljoonaa"
+msgstr[1] "oktiljoonaa"
 
-#: src/humanize/number.py:90
+#: src/humanize/number.py:135
 msgid "nonillion"
-msgstr "noniljoonaa"
+msgid_plural "nonillion"
+msgstr[0] "noniljoonaa"
+msgstr[1] "noniljoonaa"
 
-#: src/humanize/number.py:91
+#: src/humanize/number.py:136
 msgid "decillion"
-msgstr "dekiljoonaa"
+msgid_plural "decillion"
+msgstr[0] "dekiljoonaa"
+msgstr[1] "dekiljoonaa"
 
-#: src/humanize/number.py:92
+#: src/humanize/number.py:137
 msgid "googol"
-msgstr "googol"
+msgid_plural "googol"
+msgstr[0] "googol"
+msgstr[1] "googol"
 
-#: src/humanize/number.py:147
+#: src/humanize/number.py:228
 msgid "zero"
 msgstr "nolla"
 
-#: src/humanize/number.py:148
+#: src/humanize/number.py:229
 msgid "one"
 msgstr "yksi"
 
-#: src/humanize/number.py:149
+#: src/humanize/number.py:230
 msgid "two"
 msgstr "kaksi"
 
-#: src/humanize/number.py:150
+#: src/humanize/number.py:231
 msgid "three"
 msgstr "kolme"
 
-#: src/humanize/number.py:151
+#: src/humanize/number.py:232
 msgid "four"
 msgstr "neljä"
 
-#: src/humanize/number.py:152
+#: src/humanize/number.py:233
 msgid "five"
 msgstr "viisi"
 
-#: src/humanize/number.py:153
+#: src/humanize/number.py:234
 msgid "six"
 msgstr "kuusi"
 
-#: src/humanize/number.py:154
+#: src/humanize/number.py:235
 msgid "seven"
 msgstr "seitsemän"
 
-#: src/humanize/number.py:155
+#: src/humanize/number.py:236
 msgid "eight"
 msgstr "kahdeksan"
 
-#: src/humanize/number.py:156
+#: src/humanize/number.py:237
 msgid "nine"
 msgstr "yhdeksän"
 
-#: src/humanize/time.py:119
+#: src/humanize/time.py:133
 #, fuzzy, python-format
 msgid "%d microsecond"
 msgid_plural "%d microseconds"
 msgstr[0] "%d mikrosekunti"
 msgstr[1] "%d mikrosekuntia"
 
-#: src/humanize/time.py:128
+#: src/humanize/time.py:142
 #, fuzzy, python-format
 msgid "%d millisecond"
 msgid_plural "%d milliseconds"
 msgstr[0] "%d millisekunti"
 msgstr[1] "%d millisekuntia"
 
-#: src/humanize/time.py:131 src/humanize/time.py:204
+#: src/humanize/time.py:145 src/humanize/time.py:220
 msgid "a moment"
 msgstr "hetki"
 
-#: src/humanize/time.py:133
+#: src/humanize/time.py:147
 msgid "a second"
 msgstr "sekunti"
 
-#: src/humanize/time.py:135
+#: src/humanize/time.py:149
 #, python-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d sekunti"
 msgstr[1] "%d sekuntia"
 
-#: src/humanize/time.py:137
+#: src/humanize/time.py:151
 msgid "a minute"
 msgstr "minuutti"
 
-#: src/humanize/time.py:140
+#: src/humanize/time.py:154
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuutti"
 msgstr[1] "%d minuuttia"
 
-#: src/humanize/time.py:142
+#: src/humanize/time.py:156
 msgid "an hour"
 msgstr "tunti"
 
-#: src/humanize/time.py:145
+#: src/humanize/time.py:159
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d tunti"
 msgstr[1] "%d tuntia"
 
-#: src/humanize/time.py:148
+#: src/humanize/time.py:162
 msgid "a day"
 msgstr "päivä"
 
-#: src/humanize/time.py:150 src/humanize/time.py:153
+#: src/humanize/time.py:164 src/humanize/time.py:167
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d päivä"
 msgstr[1] "%d päivää"
 
-#: src/humanize/time.py:155
+#: src/humanize/time.py:169
 msgid "a month"
 msgstr "kuukausi"
 
-#: src/humanize/time.py:157
+#: src/humanize/time.py:171
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
 msgstr[0] "%d kuukausi"
 msgstr[1] "%d kuukautta"
 
-#: src/humanize/time.py:160
+#: src/humanize/time.py:174
 msgid "a year"
 msgstr "vuosi"
 
-#: src/humanize/time.py:162 src/humanize/time.py:171
+#: src/humanize/time.py:176 src/humanize/time.py:185
 #, python-format
 msgid "1 year, %d day"
 msgid_plural "1 year, %d days"
 msgstr[0] "1 vuosi, %d päivä"
 msgstr[1] "1 vuosi, %d päivää"
 
-#: src/humanize/time.py:165
+#: src/humanize/time.py:179
 msgid "1 year, 1 month"
 msgstr "1 vuosi, 1 kuukausi"
 
-#: src/humanize/time.py:168
+#: src/humanize/time.py:182
 #, python-format
 msgid "1 year, %d month"
 msgid_plural "1 year, %d months"
 msgstr[0] "1 vuosi, %d kuukausi"
 msgstr[1] "1 vuosi, %d kuukautta"
 
-#: src/humanize/time.py:173
+#: src/humanize/time.py:187
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
 msgstr[0] "%d vuosi"
 msgstr[1] "%d vuotta"
 
-#: src/humanize/time.py:201
+#: src/humanize/time.py:217
 #, python-format
 msgid "%s from now"
 msgstr "%s tästä"
 
-#: src/humanize/time.py:201
+#: src/humanize/time.py:217
 #, python-format
 msgid "%s ago"
 msgstr "%s sitten"
 
-#: src/humanize/time.py:205
+#: src/humanize/time.py:221
 msgid "now"
 msgstr "nyt"
 
-#: src/humanize/time.py:227
+#: src/humanize/time.py:244
 msgid "today"
 msgstr "tänään"
 
-#: src/humanize/time.py:229
+#: src/humanize/time.py:246
 msgid "tomorrow"
 msgstr "huomenna"
 
-#: src/humanize/time.py:231
+#: src/humanize/time.py:248
 msgid "yesterday"
 msgstr "eilen"
 
-#: src/humanize/time.py:498
+#: src/humanize/time.py:534
 #, python-format
 msgid "%s and %s"
 msgstr "%s ja %s"
diff --git a/lib/humanize/locale/fr_FR/LC_MESSAGES/humanize.po b/lib/humanize/locale/fr_FR/LC_MESSAGES/humanize.po
index df85d62..01bb94a 100644
--- a/lib/humanize/locale/fr_FR/LC_MESSAGES/humanize.po
+++ b/lib/humanize/locale/fr_FR/LC_MESSAGES/humanize.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-29 21:07+0300\n"
+"POT-Creation-Date: 2021-04-30 22:34+0200\n"
 "PO-Revision-Date: 2013-06-22 08:52+0100\n"
 "Last-Translator: Olivier Cortès <oc@1flow.io>\n"
 "Language-Team: fr_FR <LL@li.org>\n"
@@ -19,289 +19,317 @@ msgstr ""
 "Generated-By: Babel 0.9.6\n"
 "X-Generator: Poedit 1.5.5\n"
 
-#: src/humanize/number.py:31
+#: src/humanize/number.py:56
 #, fuzzy
 msgctxt "0"
 msgid "th"
 msgstr "e"
 
-#: src/humanize/number.py:32
+#: src/humanize/number.py:57
 #, fuzzy
 msgctxt "1"
 msgid "st"
 msgstr "er"
 
-#: src/humanize/number.py:33
+#: src/humanize/number.py:58
 #, fuzzy
 msgctxt "2"
 msgid "nd"
 msgstr "e"
 
-#: src/humanize/number.py:34
+#: src/humanize/number.py:59
 #, fuzzy
 msgctxt "3"
 msgid "rd"
 msgstr "e"
 
-#: src/humanize/number.py:35
+#: src/humanize/number.py:60
 #, fuzzy
 msgctxt "4"
 msgid "th"
 msgstr "e"
 
-#: src/humanize/number.py:36
+#: src/humanize/number.py:61
 #, fuzzy
 msgctxt "5"
 msgid "th"
 msgstr "e"
 
-#: src/humanize/number.py:37
+#: src/humanize/number.py:62
 #, fuzzy
 msgctxt "6"
 msgid "th"
 msgstr "e"
 
-#: src/humanize/number.py:38
+#: src/humanize/number.py:63
 #, fuzzy
 msgctxt "7"
 msgid "th"
 msgstr "e"
 
-#: src/humanize/number.py:39
+#: src/humanize/number.py:64
 #, fuzzy
 msgctxt "8"
 msgid "th"
 msgstr "e"
 
-#: src/humanize/number.py:40
+#: src/humanize/number.py:65
 #, fuzzy
 msgctxt "9"
 msgid "th"
 msgstr "e"
 
-#: src/humanize/number.py:82
+#: src/humanize/number.py:126
+msgid "thousand"
+msgid_plural "thousand"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/humanize/number.py:127
 #, fuzzy
 msgid "million"
-msgstr "%(value)s million"
+msgid_plural "million"
+msgstr[0] "%(value)s million"
+msgstr[1] "%(value)s million"
 
-#: src/humanize/number.py:83
+#: src/humanize/number.py:128
 msgid "billion"
-msgstr "milliard"
+msgid_plural "billion"
+msgstr[0] "milliard"
+msgstr[1] "milliard"
 
-#: src/humanize/number.py:84
+#: src/humanize/number.py:129
 #, fuzzy
 msgid "trillion"
-msgstr "%(value)s billion"
+msgid_plural "trillion"
+msgstr[0] "%(value)s billion"
+msgstr[1] "%(value)s billion"
 
-#: src/humanize/number.py:85
+#: src/humanize/number.py:130
 #, fuzzy
 msgid "quadrillion"
-msgstr "%(value)s billiard"
+msgid_plural "quadrillion"
+msgstr[0] "%(value)s billiard"
+msgstr[1] "%(value)s billiard"
 
-#: src/humanize/number.py:86
+#: src/humanize/number.py:131
 #, fuzzy
 msgid "quintillion"
-msgstr "%(value)s trillion"
+msgid_plural "quintillion"
+msgstr[0] "%(value)s trillion"
+msgstr[1] "%(value)s trillion"
 
-#: src/humanize/number.py:87
+#: src/humanize/number.py:132
 #, fuzzy
 msgid "sextillion"
-msgstr "%(value)s trilliard"
+msgid_plural "sextillion"
+msgstr[0] "%(value)s trilliard"
+msgstr[1] "%(value)s trilliard"
 
-#: src/humanize/number.py:88
+#: src/humanize/number.py:133
 #, fuzzy
 msgid "septillion"
-msgstr "%(value)s quatrillion"
+msgid_plural "septillion"
+msgstr[0] "%(value)s quatrillion"
+msgstr[1] "%(value)s quatrillion"
 
-#: src/humanize/number.py:89
+#: src/humanize/number.py:134
 #, fuzzy
 msgid "octillion"
-msgstr "%(value)s quadrilliard"
+msgid_plural "octillion"
+msgstr[0] "%(value)s quadrilliard"
+msgstr[1] "%(value)s quadrilliard"
 
-#: src/humanize/number.py:90
+#: src/humanize/number.py:135
 #, fuzzy
 msgid "nonillion"
-msgstr "%(value)s quintillion"
+msgid_plural "nonillion"
+msgstr[0] "%(value)s quintillion"
+msgstr[1] "%(value)s quintillion"
 
-#: src/humanize/number.py:91
+#: src/humanize/number.py:136
 #, fuzzy
 msgid "decillion"
-msgstr "%(value)s quintilliard"
+msgid_plural "decillion"
+msgstr[0] "%(value)s quintilliard"
+msgstr[1] "%(value)s quintilliard"
 
-#: src/humanize/number.py:92
+#: src/humanize/number.py:137
 #, fuzzy
 msgid "googol"
-msgstr "%(value)s gogol"
+msgid_plural "googol"
+msgstr[0] "%(value)s gogol"
+msgstr[1] "%(value)s gogol"
 
-#: src/humanize/number.py:147
+#: src/humanize/number.py:228
 msgid "zero"
 msgstr "zéro"
 
-#: src/humanize/number.py:148
+#: src/humanize/number.py:229
 msgid "one"
 msgstr "un"
 
-#: src/humanize/number.py:149
+#: src/humanize/number.py:230
 msgid "two"
 msgstr "deux"
 
-#: src/humanize/number.py:150
+#: src/humanize/number.py:231
 msgid "three"
 msgstr "trois"
 
-#: src/humanize/number.py:151
+#: src/humanize/number.py:232
 msgid "four"
 msgstr "quatre"
 
-#: src/humanize/number.py:152
+#: src/humanize/number.py:233
 msgid "five"
 msgstr "cinq"
 
-#: src/humanize/number.py:153
+#: src/humanize/number.py:234
 msgid "six"
 msgstr "six"
 
-#: src/humanize/number.py:154
+#: src/humanize/number.py:235
 msgid "seven"
 msgstr "sept"
 
-#: src/humanize/number.py:155
+#: src/humanize/number.py:236
 msgid "eight"
 msgstr "huit"
 
-#: src/humanize/number.py:156
+#: src/humanize/number.py:237
 msgid "nine"
 msgstr "neuf"
 
-#: src/humanize/time.py:119
+#: src/humanize/time.py:133
 #, fuzzy, python-format
 msgid "%d microsecond"
 msgid_plural "%d microseconds"
 msgstr[0] "%d microseconde"
 msgstr[1] "%d microsecondes"
 
-#: src/humanize/time.py:128
+#: src/humanize/time.py:142
 #, fuzzy, python-format
 msgid "%d millisecond"
 msgid_plural "%d milliseconds"
 msgstr[0] "%d milliseconde"
 msgstr[1] "%d millisecondes"
 
-#: src/humanize/time.py:131 src/humanize/time.py:204
+#: src/humanize/time.py:145 src/humanize/time.py:220
 msgid "a moment"
 msgstr "un moment"
 
-#: src/humanize/time.py:133
+#: src/humanize/time.py:147
 msgid "a second"
 msgstr "une seconde"
 
-#: src/humanize/time.py:135
+#: src/humanize/time.py:149
 #, python-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d seconde"
 msgstr[1] "%d secondes"
 
-#: src/humanize/time.py:137
+#: src/humanize/time.py:151
 msgid "a minute"
 msgstr "une minute"
 
-#: src/humanize/time.py:140
+#: src/humanize/time.py:154
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minute"
 msgstr[1] "%d minutes"
 
-#: src/humanize/time.py:142
+#: src/humanize/time.py:156
 msgid "an hour"
 msgstr "une heure"
 
-#: src/humanize/time.py:145
+#: src/humanize/time.py:159
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d heure"
 msgstr[1] "%d heures"
 
-#: src/humanize/time.py:148
+#: src/humanize/time.py:162
 msgid "a day"
 msgstr "un jour"
 
-#: src/humanize/time.py:150 src/humanize/time.py:153
+#: src/humanize/time.py:164 src/humanize/time.py:167
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d jour"
 msgstr[1] "%d jours"
 
-#: src/humanize/time.py:155
+#: src/humanize/time.py:169
 msgid "a month"
 msgstr "un mois"
 
-#: src/humanize/time.py:157
+#: src/humanize/time.py:171
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
 msgstr[0] "%d mois"
 msgstr[1] "%d mois"
 
-#: src/humanize/time.py:160
+#: src/humanize/time.py:174
 msgid "a year"
 msgstr "un an"
 
-#: src/humanize/time.py:162 src/humanize/time.py:171
+#: src/humanize/time.py:176 src/humanize/time.py:185
 #, python-format
 msgid "1 year, %d day"
 msgid_plural "1 year, %d days"
 msgstr[0] "un an et %d jour"
 msgstr[1] "un an et %d jours"
 
-#: src/humanize/time.py:165
+#: src/humanize/time.py:179
 msgid "1 year, 1 month"
 msgstr "un an et un mois"
 
-#: src/humanize/time.py:168
+#: src/humanize/time.py:182
 #, python-format
 msgid "1 year, %d month"
 msgid_plural "1 year, %d months"
 msgstr[0] "un an et %d mois"
 msgstr[1] "un an et %d mois"
 
-#: src/humanize/time.py:173
+#: src/humanize/time.py:187
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
 msgstr[0] "%d an"
 msgstr[1] "%d ans"
 
-#: src/humanize/time.py:201
+#: src/humanize/time.py:217
 #, python-format
 msgid "%s from now"
 msgstr "dans %s"
 
-#: src/humanize/time.py:201
+#: src/humanize/time.py:217
 #, python-format
 msgid "%s ago"
 msgstr "il y a %s"
 
-#: src/humanize/time.py:205
+#: src/humanize/time.py:221
 msgid "now"
 msgstr "maintenant"
 
-#: src/humanize/time.py:227
+#: src/humanize/time.py:244
 msgid "today"
 msgstr "aujourd'hui"
 
-#: src/humanize/time.py:229
+#: src/humanize/time.py:246
 msgid "tomorrow"
 msgstr "demain"
 
-#: src/humanize/time.py:231
+#: src/humanize/time.py:248
 msgid "yesterday"
 msgstr "hier"
 
-#: src/humanize/time.py:498
+#: src/humanize/time.py:534
 #, python-format
 msgid "%s and %s"
 msgstr "%s et %s"
diff --git a/lib/humanize/locale/id_ID/LC_MESSAGES/humanize.po b/lib/humanize/locale/id_ID/LC_MESSAGES/humanize.po
index 8ec63ef..a2725b9 100644
--- a/lib/humanize/locale/id_ID/LC_MESSAGES/humanize.po
+++ b/lib/humanize/locale/id_ID/LC_MESSAGES/humanize.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-29 21:07+0300\n"
+"POT-Creation-Date: 2021-04-30 22:34+0200\n"
 "PO-Revision-Date: 2017-03-18 15:41+0700\n"
 "Last-Translator: adie.rebel@gmail.com\n"
 "Language-Team: Indonesian\n"
@@ -18,259 +18,275 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 1.8.11\n"
 
-#: src/humanize/number.py:31
+#: src/humanize/number.py:56
 msgctxt "0"
 msgid "th"
 msgstr "."
 
-#: src/humanize/number.py:32
+#: src/humanize/number.py:57
 msgctxt "1"
 msgid "st"
 msgstr "."
 
-#: src/humanize/number.py:33
+#: src/humanize/number.py:58
 msgctxt "2"
 msgid "nd"
 msgstr "."
 
-#: src/humanize/number.py:34
+#: src/humanize/number.py:59
 msgctxt "3"
 msgid "rd"
 msgstr "."
 
-#: src/humanize/number.py:35
+#: src/humanize/number.py:60
 msgctxt "4"
 msgid "th"
 msgstr "."
 
-#: src/humanize/number.py:36
+#: src/humanize/number.py:61
 msgctxt "5"
 msgid "th"
 msgstr "."
 
-#: src/humanize/number.py:37
+#: src/humanize/number.py:62
 msgctxt "6"
 msgid "th"
 msgstr "."
 
-#: src/humanize/number.py:38
+#: src/humanize/number.py:63
 msgctxt "7"
 msgid "th"
 msgstr "."
 
-#: src/humanize/number.py:39
+#: src/humanize/number.py:64
 msgctxt "8"
 msgid "th"
 msgstr "."
 
-#: src/humanize/number.py:40
+#: src/humanize/number.py:65
 msgctxt "9"
 msgid "th"
 msgstr "."
 
-#: src/humanize/number.py:82
+#: src/humanize/number.py:126
+msgid "thousand"
+msgid_plural "thousand"
+msgstr[0] ""
+
+#: src/humanize/number.py:127
 msgid "million"
-msgstr "juta"
+msgid_plural "million"
+msgstr[0] "juta"
 
-#: src/humanize/number.py:83
+#: src/humanize/number.py:128
 msgid "billion"
-msgstr "miliar"
+msgid_plural "billion"
+msgstr[0] "miliar"
 
-#: src/humanize/number.py:84
+#: src/humanize/number.py:129
 msgid "trillion"
-msgstr "triliun"
+msgid_plural "trillion"
+msgstr[0] "triliun"
 
-#: src/humanize/number.py:85
+#: src/humanize/number.py:130
 msgid "quadrillion"
-msgstr "kuadriliun"
+msgid_plural "quadrillion"
+msgstr[0] "kuadriliun"
 
-#: src/humanize/number.py:86
+#: src/humanize/number.py:131
 msgid "quintillion"
-msgstr "quintillion"
+msgid_plural "quintillion"
+msgstr[0] "quintillion"
 
-#: src/humanize/number.py:87
+#: src/humanize/number.py:132
 msgid "sextillion"
-msgstr "sextillion"
+msgid_plural "sextillion"
+msgstr[0] "sextillion"
 
-#: src/humanize/number.py:88
+#: src/humanize/number.py:133
 msgid "septillion"
-msgstr "septillion"
+msgid_plural "septillion"
+msgstr[0] "septillion"
 
-#: src/humanize/number.py:89
+#: src/humanize/number.py:134
 msgid "octillion"
-msgstr "octillion"
+msgid_plural "octillion"
+msgstr[0] "octillion"
 
-#: src/humanize/number.py:90
+#: src/humanize/number.py:135
 msgid "nonillion"
-msgstr "nonillion"
+msgid_plural "nonillion"
+msgstr[0] "nonillion"
 
-#: src/humanize/number.py:91
+#: src/humanize/number.py:136
 msgid "decillion"
-msgstr "decillion"
+msgid_plural "decillion"
+msgstr[0] "decillion"
 
-#: src/humanize/number.py:92
+#: src/humanize/number.py:137
 msgid "googol"
-msgstr "googol"
+msgid_plural "googol"
+msgstr[0] "googol"
 
-#: src/humanize/number.py:147
+#: src/humanize/number.py:228
 msgid "zero"
 msgstr "nol"
 
-#: src/humanize/number.py:148
+#: src/humanize/number.py:229
 msgid "one"
 msgstr "satu"
 
-#: src/humanize/number.py:149
+#: src/humanize/number.py:230
 msgid "two"
 msgstr "dua"
 
-#: src/humanize/number.py:150
+#: src/humanize/number.py:231
 msgid "three"
 msgstr "tiga"
 
-#: src/humanize/number.py:151
+#: src/humanize/number.py:232
 msgid "four"
 msgstr "empat"
 
-#: src/humanize/number.py:152
+#: src/humanize/number.py:233
 msgid "five"
 msgstr "lima"
 
-#: src/humanize/number.py:153
+#: src/humanize/number.py:234
 msgid "six"
 msgstr "enam"
 
-#: src/humanize/number.py:154
+#: src/humanize/number.py:235
 msgid "seven"
 msgstr "tujuh"
 
-#: src/humanize/number.py:155
+#: src/humanize/number.py:236
 msgid "eight"
 msgstr "delapan"
 
-#: src/humanize/number.py:156
+#: src/humanize/number.py:237
 msgid "nine"
 msgstr "sembilan"
 
-#: src/humanize/time.py:119
+#: src/humanize/time.py:133
 #, fuzzy, python-format
 msgid "%d microsecond"
 msgid_plural "%d microseconds"
 msgstr[0] "%d mikro detik"
 
-#: src/humanize/time.py:128
+#: src/humanize/time.py:142
 #, fuzzy, python-format
 msgid "%d millisecond"
 msgid_plural "%d milliseconds"
 msgstr[0] "%d mili detik"
 
-#: src/humanize/time.py:131 src/humanize/time.py:204
+#: src/humanize/time.py:145 src/humanize/time.py:220
 msgid "a moment"
 msgstr "beberapa saat"
 
-#: src/humanize/time.py:133
+#: src/humanize/time.py:147
 msgid "a second"
 msgstr "sedetik"
 
-#: src/humanize/time.py:135
+#: src/humanize/time.py:149
 #, python-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d detik"
 
-#: src/humanize/time.py:137
+#: src/humanize/time.py:151
 msgid "a minute"
 msgstr "semenit"
 
-#: src/humanize/time.py:140
+#: src/humanize/time.py:154
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d menit"
 
-#: src/humanize/time.py:142
+#: src/humanize/time.py:156
 msgid "an hour"
 msgstr "sejam"
 
-#: src/humanize/time.py:145
+#: src/humanize/time.py:159
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d jam"
 
-#: src/humanize/time.py:148
+#: src/humanize/time.py:162
 msgid "a day"
 msgstr "sehari"
 
-#: src/humanize/time.py:150 src/humanize/time.py:153
+#: src/humanize/time.py:164 src/humanize/time.py:167
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d hari"
 
-#: src/humanize/time.py:155
+#: src/humanize/time.py:169
 msgid "a month"
 msgstr "sebulan"
 
-#: src/humanize/time.py:157
+#: src/humanize/time.py:171
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
 msgstr[0] "%d bulan"
 
-#: src/humanize/time.py:160
+#: src/humanize/time.py:174
 msgid "a year"
 msgstr "setahun"
 
-#: src/humanize/time.py:162 src/humanize/time.py:171
+#: src/humanize/time.py:176 src/humanize/time.py:185
 #, python-format
 msgid "1 year, %d day"
 msgid_plural "1 year, %d days"
 msgstr[0] "1 tahun, %d hari"
 
-#: src/humanize/time.py:165
+#: src/humanize/time.py:179
 msgid "1 year, 1 month"
 msgstr "1 tahun, 1 bulan"
 
-#: src/humanize/time.py:168
+#: src/humanize/time.py:182
 #, python-format
 msgid "1 year, %d month"
 msgid_plural "1 year, %d months"
 msgstr[0] "1 tahun, %d bulan"
 
-#: src/humanize/time.py:173
+#: src/humanize/time.py:187
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
 msgstr[0] "%d tahun"
 
-#: src/humanize/time.py:201
+#: src/humanize/time.py:217
 #, python-format
 msgid "%s from now"
 msgstr "%s dari sekarang"
 
-#: src/humanize/time.py:201
+#: src/humanize/time.py:217
 #, python-format
 msgid "%s ago"
 msgstr "%s yang lalu"
 
-#: src/humanize/time.py:205
+#: src/humanize/time.py:221
 msgid "now"
 msgstr "sekarang"
 
-#: src/humanize/time.py:227
+#: src/humanize/time.py:244
 msgid "today"
 msgstr "hari ini"
 
-#: src/humanize/time.py:229
+#: src/humanize/time.py:246
 msgid "tomorrow"
 msgstr "besok"
 
-#: src/humanize/time.py:231
+#: src/humanize/time.py:248
 msgid "yesterday"
 msgstr "kemarin"
 
-#: src/humanize/time.py:498
+#: src/humanize/time.py:534
 #, python-format
 msgid "%s and %s"
 msgstr "%s dan %s"
diff --git a/lib/humanize/locale/it_IT/LC_MESSAGES/humanize.po b/lib/humanize/locale/it_IT/LC_MESSAGES/humanize.po
index a0992bc..d9a12b4 100644
--- a/lib/humanize/locale/it_IT/LC_MESSAGES/humanize.po
+++ b/lib/humanize/locale/it_IT/LC_MESSAGES/humanize.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-29 21:07+0300\n"
+"POT-Creation-Date: 2021-04-30 22:34+0200\n"
 "PO-Revision-Date: 2018-10-27 22:52+0200\n"
 "Last-Translator: derfel <code@derfel.net>\n"
 "Language-Team: Italian\n"
@@ -18,269 +18,297 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 2.2\n"
 
-#: src/humanize/number.py:31
+#: src/humanize/number.py:56
 msgctxt "0"
 msgid "th"
 msgstr "º"
 
-#: src/humanize/number.py:32
+#: src/humanize/number.py:57
 msgctxt "1"
 msgid "st"
 msgstr "º"
 
-#: src/humanize/number.py:33
+#: src/humanize/number.py:58
 msgctxt "2"
 msgid "nd"
 msgstr "º"
 
-#: src/humanize/number.py:34
+#: src/humanize/number.py:59
 msgctxt "3"
 msgid "rd"
 msgstr "º"
 
-#: src/humanize/number.py:35
+#: src/humanize/number.py:60
 msgctxt "4"
 msgid "th"
 msgstr "º"
 
-#: src/humanize/number.py:36
+#: src/humanize/number.py:61
 msgctxt "5"
 msgid "th"
 msgstr "º"
 
-#: src/humanize/number.py:37
+#: src/humanize/number.py:62
 msgctxt "6"
 msgid "th"
 msgstr "º"
 
-#: src/humanize/number.py:38
+#: src/humanize/number.py:63
 msgctxt "7"
 msgid "th"
 msgstr "º"
 
-#: src/humanize/number.py:39
+#: src/humanize/number.py:64
 msgctxt "8"
 msgid "th"
 msgstr "º"
 
-#: src/humanize/number.py:40
+#: src/humanize/number.py:65
 msgctxt "9"
 msgid "th"
 msgstr "º"
 
-#: src/humanize/number.py:82
+#: src/humanize/number.py:126
+msgid "thousand"
+msgid_plural "thousand"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/humanize/number.py:127
 msgid "million"
-msgstr "milioni"
+msgid_plural "million"
+msgstr[0] "milioni"
+msgstr[1] "milioni"
 
-#: src/humanize/number.py:83
+#: src/humanize/number.py:128
 msgid "billion"
-msgstr "miliardi"
+msgid_plural "billion"
+msgstr[0] "miliardi"
+msgstr[1] "miliardi"
 
-#: src/humanize/number.py:84
+#: src/humanize/number.py:129
 msgid "trillion"
-msgstr "bilioni"
+msgid_plural "trillion"
+msgstr[0] "bilioni"
+msgstr[1] "bilioni"
 
-#: src/humanize/number.py:85
+#: src/humanize/number.py:130
 msgid "quadrillion"
-msgstr "biliardi"
+msgid_plural "quadrillion"
+msgstr[0] "biliardi"
+msgstr[1] "biliardi"
 
-#: src/humanize/number.py:86
+#: src/humanize/number.py:131
 msgid "quintillion"
-msgstr "trilioni"
+msgid_plural "quintillion"
+msgstr[0] "trilioni"
+msgstr[1] "trilioni"
 
-#: src/humanize/number.py:87
+#: src/humanize/number.py:132
 msgid "sextillion"
-msgstr "triliardi"
+msgid_plural "sextillion"
+msgstr[0] "triliardi"
+msgstr[1] "triliardi"
 
-#: src/humanize/number.py:88
+#: src/humanize/number.py:133
 msgid "septillion"
-msgstr "quadrilioni"
+msgid_plural "septillion"
+msgstr[0] "quadrilioni"
+msgstr[1] "quadrilioni"
 
-#: src/humanize/number.py:89
+#: src/humanize/number.py:134
 msgid "octillion"
-msgstr "quadriliardi"
+msgid_plural "octillion"
+msgstr[0] "quadriliardi"
+msgstr[1] "quadriliardi"
 
-#: src/humanize/number.py:90
+#: src/humanize/number.py:135
 msgid "nonillion"
-msgstr "quintilioni"
+msgid_plural "nonillion"
+msgstr[0] "quintilioni"
+msgstr[1] "quintilioni"
 
-#: src/humanize/number.py:91
+#: src/humanize/number.py:136
 msgid "decillion"
-msgstr "quintiliardi"
+msgid_plural "decillion"
+msgstr[0] "quintiliardi"
+msgstr[1] "quintiliardi"
 
-#: src/humanize/number.py:92
+#: src/humanize/number.py:137
 msgid "googol"
-msgstr "googol"
+msgid_plural "googol"
+msgstr[0] "googol"
+msgstr[1] "googol"
 
-#: src/humanize/number.py:147
+#: src/humanize/number.py:228
 msgid "zero"
 msgstr "zero"
 
-#: src/humanize/number.py:148
+#: src/humanize/number.py:229
 msgid "one"
 msgstr "uno"
 
-#: src/humanize/number.py:149
+#: src/humanize/number.py:230
 msgid "two"
 msgstr "due"
 
-#: src/humanize/number.py:150
+#: src/humanize/number.py:231
 msgid "three"
 msgstr "tre"
 
-#: src/humanize/number.py:151
+#: src/humanize/number.py:232
 msgid "four"
 msgstr "quattro"
 
-#: src/humanize/number.py:152
+#: src/humanize/number.py:233
 msgid "five"
 msgstr "cinque"
 
-#: src/humanize/number.py:153
+#: src/humanize/number.py:234
 msgid "six"
 msgstr "sei"
 
-#: src/humanize/number.py:154
+#: src/humanize/number.py:235
 msgid "seven"
 msgstr "sette"
 
-#: src/humanize/number.py:155
+#: src/humanize/number.py:236
 msgid "eight"
 msgstr "otto"
 
-#: src/humanize/number.py:156
+#: src/humanize/number.py:237
 msgid "nine"
 msgstr "nove"
 
-#: src/humanize/time.py:119
+#: src/humanize/time.py:133
 #, fuzzy, python-format
 msgid "%d microsecond"
 msgid_plural "%d microseconds"
 msgstr[0] "%d microsecondo"
 msgstr[1] "%d microsecondi"
 
-#: src/humanize/time.py:128
+#: src/humanize/time.py:142
 #, fuzzy, python-format
 msgid "%d millisecond"
 msgid_plural "%d milliseconds"
 msgstr[0] "%d millisecondo"
 msgstr[1] "%d millisecondi"
 
-#: src/humanize/time.py:131 src/humanize/time.py:204
+#: src/humanize/time.py:145 src/humanize/time.py:220
 msgid "a moment"
 msgstr "un momento"
 
-#: src/humanize/time.py:133
+#: src/humanize/time.py:147
 msgid "a second"
 msgstr "un secondo"
 
-#: src/humanize/time.py:135
+#: src/humanize/time.py:149
 #, python-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d secondo"
 msgstr[1] "%d secondi"
 
-#: src/humanize/time.py:137
+#: src/humanize/time.py:151
 msgid "a minute"
 msgstr "un minuto"
 
-#: src/humanize/time.py:140
+#: src/humanize/time.py:154
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minuti"
 
-#: src/humanize/time.py:142
+#: src/humanize/time.py:156
 msgid "an hour"
 msgstr "un'ora"
 
-#: src/humanize/time.py:145
+#: src/humanize/time.py:159
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d ora"
 msgstr[1] "%d ore"
 
-#: src/humanize/time.py:148
+#: src/humanize/time.py:162
 msgid "a day"
 msgstr "un giorno"
 
-#: src/humanize/time.py:150 src/humanize/time.py:153
+#: src/humanize/time.py:164 src/humanize/time.py:167
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d giorno"
 msgstr[1] "%d giorni"
 
-#: src/humanize/time.py:155
+#: src/humanize/time.py:169
 msgid "a month"
 msgstr "un mese"
 
-#: src/humanize/time.py:157
+#: src/humanize/time.py:171
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
 msgstr[0] "%d mese"
 msgstr[1] "%d mesi"
 
-#: src/humanize/time.py:160
+#: src/humanize/time.py:174
 msgid "a year"
 msgstr "un anno"
 
-#: src/humanize/time.py:162 src/humanize/time.py:171
+#: src/humanize/time.py:176 src/humanize/time.py:185
 #, python-format
 msgid "1 year, %d day"
 msgid_plural "1 year, %d days"
 msgstr[0] "un anno e %d giorno"
 msgstr[1] "un anno e %d giorni"
 
-#: src/humanize/time.py:165
+#: src/humanize/time.py:179
 msgid "1 year, 1 month"
 msgstr "un anno ed un mese"
 
-#: src/humanize/time.py:168
+#: src/humanize/time.py:182
 #, python-format
 msgid "1 year, %d month"
 msgid_plural "1 year, %d months"
 msgstr[0] "un anno e %d mese"
 msgstr[1] "un anno e %d mesi"
 
-#: src/humanize/time.py:173
+#: src/humanize/time.py:187
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
 msgstr[0] "%d anno"
 msgstr[1] "%d anni"
 
-#: src/humanize/time.py:201
+#: src/humanize/time.py:217
 #, python-format
 msgid "%s from now"
 msgstr "fra %s"
 
-#: src/humanize/time.py:201
+#: src/humanize/time.py:217
 #, python-format
 msgid "%s ago"
 msgstr "%s fa"
 
-#: src/humanize/time.py:205
+#: src/humanize/time.py:221
 msgid "now"
 msgstr "adesso"
 
-#: src/humanize/time.py:227
+#: src/humanize/time.py:244
 msgid "today"
 msgstr "oggi"
 
-#: src/humanize/time.py:229
+#: src/humanize/time.py:246
 msgid "tomorrow"
 msgstr "domani"
 
-#: src/humanize/time.py:231
+#: src/humanize/time.py:248
 msgid "yesterday"
 msgstr "ieri"
 
-#: src/humanize/time.py:498
+#: src/humanize/time.py:534
 #, python-format
 msgid "%s and %s"
 msgstr ""
diff --git a/lib/humanize/locale/ja_JP/LC_MESSAGES/humanize.po b/lib/humanize/locale/ja_JP/LC_MESSAGES/humanize.po
index c055cae..21a21f8 100644
--- a/lib/humanize/locale/ja_JP/LC_MESSAGES/humanize.po
+++ b/lib/humanize/locale/ja_JP/LC_MESSAGES/humanize.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: humanize\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-29 21:07+0300\n"
+"POT-Creation-Date: 2021-04-30 22:34+0200\n"
 "PO-Revision-Date: 2018-01-22 10:48+0900\n"
 "Last-Translator: Kan Torii <oss@qoolloop.com>\n"
 "Language-Team: Japanese\n"
@@ -19,270 +19,286 @@ msgstr ""
 "Generated-By: Babel 0.9.6\n"
 "X-Generator: Poedit 2.0.6\n"
 
-#: src/humanize/number.py:31
+#: src/humanize/number.py:56
 msgctxt "0"
 msgid "th"
 msgstr "番目"
 
-#: src/humanize/number.py:32
+#: src/humanize/number.py:57
 msgctxt "1"
 msgid "st"
 msgstr "番目"
 
-#: src/humanize/number.py:33
+#: src/humanize/number.py:58
 msgctxt "2"
 msgid "nd"
 msgstr "番目"
 
-#: src/humanize/number.py:34
+#: src/humanize/number.py:59
 msgctxt "3"
 msgid "rd"
 msgstr "番目"
 
-#: src/humanize/number.py:35
+#: src/humanize/number.py:60
 msgctxt "4"
 msgid "th"
 msgstr "番目"
 
-#: src/humanize/number.py:36
+#: src/humanize/number.py:61
 msgctxt "5"
 msgid "th"
 msgstr "番目"
 
-#: src/humanize/number.py:37
+#: src/humanize/number.py:62
 msgctxt "6"
 msgid "th"
 msgstr "番目"
 
-#: src/humanize/number.py:38
+#: src/humanize/number.py:63
 msgctxt "7"
 msgid "th"
 msgstr "番目"
 
-#: src/humanize/number.py:39
+#: src/humanize/number.py:64
 msgctxt "8"
 msgid "th"
 msgstr "番目"
 
-#: src/humanize/number.py:40
+#: src/humanize/number.py:65
 msgctxt "9"
 msgid "th"
 msgstr "番目"
 
-#: src/humanize/number.py:82
+#: src/humanize/number.py:126
+msgid "thousand"
+msgid_plural "thousand"
+msgstr[0] ""
+
+#: src/humanize/number.py:127
 msgid "million"
-msgstr "百万"
+msgid_plural "million"
+msgstr[0] "百万"
 
-#: src/humanize/number.py:83
+#: src/humanize/number.py:128
 #, fuzzy
 msgid "billion"
-msgstr "十億"
+msgid_plural "billion"
+msgstr[0] "十億"
 
-#: src/humanize/number.py:84
+#: src/humanize/number.py:129
 msgid "trillion"
-msgstr "兆"
+msgid_plural "trillion"
+msgstr[0] "兆"
 
-#: src/humanize/number.py:85
+#: src/humanize/number.py:130
 #, fuzzy
 msgid "quadrillion"
-msgstr "千兆"
+msgid_plural "quadrillion"
+msgstr[0] "千兆"
 
-#: src/humanize/number.py:86
+#: src/humanize/number.py:131
 #, fuzzy
 msgid "quintillion"
-msgstr "百京"
+msgid_plural "quintillion"
+msgstr[0] "百京"
 
-#: src/humanize/number.py:87
+#: src/humanize/number.py:132
 #, fuzzy
 msgid "sextillion"
-msgstr "十垓"
+msgid_plural "sextillion"
+msgstr[0] "十垓"
 
-#: src/humanize/number.py:88
+#: src/humanize/number.py:133
 #, fuzzy
 msgid "septillion"
-msgstr "じょ"
+msgid_plural "septillion"
+msgstr[0] "じょ"
 
-#: src/humanize/number.py:89
+#: src/humanize/number.py:134
 #, fuzzy
 msgid "octillion"
-msgstr "千じょ"
+msgid_plural "octillion"
+msgstr[0] "千じょ"
 
-#: src/humanize/number.py:90
+#: src/humanize/number.py:135
 #, fuzzy
 msgid "nonillion"
-msgstr "百穣"
+msgid_plural "nonillion"
+msgstr[0] "百穣"
 
-#: src/humanize/number.py:91
+#: src/humanize/number.py:136
 #, fuzzy
 msgid "decillion"
-msgstr "十溝"
+msgid_plural "decillion"
+msgstr[0] "十溝"
 
-#: src/humanize/number.py:92
+#: src/humanize/number.py:137
 #, fuzzy
 msgid "googol"
-msgstr "溝無量大数"
+msgid_plural "googol"
+msgstr[0] "溝無量大数"
 
-#: src/humanize/number.py:147
+#: src/humanize/number.py:228
 msgid "zero"
 msgstr ""
 
-#: src/humanize/number.py:148
+#: src/humanize/number.py:229
 msgid "one"
 msgstr "一"
 
-#: src/humanize/number.py:149
+#: src/humanize/number.py:230
 msgid "two"
 msgstr "二"
 
-#: src/humanize/number.py:150
+#: src/humanize/number.py:231
 msgid "three"
 msgstr "三"
 
-#: src/humanize/number.py:151
+#: src/humanize/number.py:232
 msgid "four"
 msgstr "四"
 
-#: src/humanize/number.py:152
+#: src/humanize/number.py:233
 msgid "five"
 msgstr "五"
 
-#: src/humanize/number.py:153
+#: src/humanize/number.py:234
 msgid "six"
 msgstr "六"
 
-#: src/humanize/number.py:154
+#: src/humanize/number.py:235
 msgid "seven"
 msgstr "七"
 
-#: src/humanize/number.py:155
+#: src/humanize/number.py:236
 msgid "eight"
 msgstr "八"
 
-#: src/humanize/number.py:156
+#: src/humanize/number.py:237
 msgid "nine"
 msgstr "九"
 
-#: src/humanize/time.py:119
-#, fuzzy, python-format
+#: src/humanize/time.py:133
+#, python-format
 msgid "%d microsecond"
 msgid_plural "%d microseconds"
 msgstr[0] ""
 
-#: src/humanize/time.py:128
-#, fuzzy, python-format
+#: src/humanize/time.py:142
+#, python-format
 msgid "%d millisecond"
 msgid_plural "%d milliseconds"
 msgstr[0] ""
 
-#: src/humanize/time.py:131 src/humanize/time.py:204
+#: src/humanize/time.py:145 src/humanize/time.py:220
 #, fuzzy
 msgid "a moment"
 msgstr "短時間"
 
-#: src/humanize/time.py:133
+#: src/humanize/time.py:147
 msgid "a second"
 msgstr "1秒"
 
-#: src/humanize/time.py:135
+#: src/humanize/time.py:149
 #, python-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d秒"
 
-#: src/humanize/time.py:137
+#: src/humanize/time.py:151
 msgid "a minute"
 msgstr "1分"
 
-#: src/humanize/time.py:140
+#: src/humanize/time.py:154
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d分"
 
-#: src/humanize/time.py:142
+#: src/humanize/time.py:156
 msgid "an hour"
 msgstr "1時間"
 
-#: src/humanize/time.py:145
+#: src/humanize/time.py:159
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d時間"
 
-#: src/humanize/time.py:148
+#: src/humanize/time.py:162
 msgid "a day"
 msgstr "1日"
 
-#: src/humanize/time.py:150 src/humanize/time.py:153
+#: src/humanize/time.py:164 src/humanize/time.py:167
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d日"
 
-#: src/humanize/time.py:155
+#: src/humanize/time.py:169
 msgid "a month"
 msgstr "1ヶ月"
 
-#: src/humanize/time.py:157
+#: src/humanize/time.py:171
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
 msgstr[0] "%dヶ月"
 
-#: src/humanize/time.py:160
+#: src/humanize/time.py:174
 msgid "a year"
 msgstr "1年"
 
-#: src/humanize/time.py:162 src/humanize/time.py:171
+#: src/humanize/time.py:176 src/humanize/time.py:185
 #, python-format
 msgid "1 year, %d day"
 msgid_plural "1 year, %d days"
 msgstr[0] "1年 %d日"
 
-#: src/humanize/time.py:165
+#: src/humanize/time.py:179
 msgid "1 year, 1 month"
 msgstr "1年 1ヶ月"
 
-#: src/humanize/time.py:168
+#: src/humanize/time.py:182
 #, python-format
 msgid "1 year, %d month"
 msgid_plural "1 year, %d months"
 msgstr[0] "1年 %dヶ月"
 
-#: src/humanize/time.py:173
+#: src/humanize/time.py:187
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
 msgstr[0] "%d年"
 
-#: src/humanize/time.py:201
+#: src/humanize/time.py:217
 #, python-format
 msgid "%s from now"
 msgstr "%s後"
 
-#: src/humanize/time.py:201
+#: src/humanize/time.py:217
 #, python-format
 msgid "%s ago"
 msgstr "%s前"
 
-#: src/humanize/time.py:205
+#: src/humanize/time.py:221
 #, fuzzy
 msgid "now"
 msgstr "今"
 
-#: src/humanize/time.py:227
+#: src/humanize/time.py:244
 msgid "today"
 msgstr "本日"
 
-#: src/humanize/time.py:229
+#: src/humanize/time.py:246
 msgid "tomorrow"
 msgstr "明日"
 
-#: src/humanize/time.py:231
+#: src/humanize/time.py:248
 msgid "yesterday"
 msgstr "昨日"
 
-#: src/humanize/time.py:498
+#: src/humanize/time.py:534
 #, python-format
 msgid "%s and %s"
 msgstr ""
diff --git a/lib/humanize/locale/ko_KR/LC_MESSAGES/humanize.po b/lib/humanize/locale/ko_KR/LC_MESSAGES/humanize.po
index 27c274e..e316ebe 100644
--- a/lib/humanize/locale/ko_KR/LC_MESSAGES/humanize.po
+++ b/lib/humanize/locale/ko_KR/LC_MESSAGES/humanize.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-29 21:07+0300\n"
+"POT-Creation-Date: 2021-04-30 22:34+0200\n"
 "PO-Revision-Date: 2013-07-10 11:38+0900\n"
 "Last-Translator: @youngrok\n"
 "Language-Team: ko_KR <LL@li.org>\n"
@@ -19,288 +19,316 @@ msgstr ""
 "Generated-By: Babel 0.9.6\n"
 "X-Generator: Poedit 1.5.7\n"
 
-#: src/humanize/number.py:31
+#: src/humanize/number.py:56
 #, fuzzy
 msgctxt "0"
 msgid "th"
 msgstr "번째"
 
-#: src/humanize/number.py:32
+#: src/humanize/number.py:57
 #, fuzzy
 msgctxt "1"
 msgid "st"
 msgstr "번째"
 
-#: src/humanize/number.py:33
+#: src/humanize/number.py:58
 #, fuzzy
 msgctxt "2"
 msgid "nd"
 msgstr "번째"
 
-#: src/humanize/number.py:34
+#: src/humanize/number.py:59
 #, fuzzy
 msgctxt "3"
 msgid "rd"
 msgstr "번째"
 
-#: src/humanize/number.py:35
+#: src/humanize/number.py:60
 #, fuzzy
 msgctxt "4"
 msgid "th"
 msgstr "번째"
 
-#: src/humanize/number.py:36
+#: src/humanize/number.py:61
 #, fuzzy
 msgctxt "5"
 msgid "th"
 msgstr "번째"
 
-#: src/humanize/number.py:37
+#: src/humanize/number.py:62
 #, fuzzy
 msgctxt "6"
 msgid "th"
 msgstr "번째"
 
-#: src/humanize/number.py:38
+#: src/humanize/number.py:63
 #, fuzzy
 msgctxt "7"
 msgid "th"
 msgstr "번째"
 
-#: src/humanize/number.py:39
+#: src/humanize/number.py:64
 #, fuzzy
 msgctxt "8"
 msgid "th"
 msgstr "번째"
 
-#: src/humanize/number.py:40
+#: src/humanize/number.py:65
 #, fuzzy
 msgctxt "9"
 msgid "th"
 msgstr "번째"
 
-#: src/humanize/number.py:82
+#: src/humanize/number.py:126
+msgid "thousand"
+msgid_plural "thousand"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/humanize/number.py:127
 msgid "million"
-msgstr "%(value)s million"
+msgid_plural "million"
+msgstr[0] "%(value)s million"
+msgstr[1] "%(value)s million"
 
-#: src/humanize/number.py:83
+#: src/humanize/number.py:128
 msgid "billion"
-msgstr "milliard"
+msgid_plural "billion"
+msgstr[0] "milliard"
+msgstr[1] "milliard"
 
-#: src/humanize/number.py:84
+#: src/humanize/number.py:129
 #, fuzzy
 msgid "trillion"
-msgstr "%(value)s billion"
+msgid_plural "trillion"
+msgstr[0] "%(value)s billion"
+msgstr[1] "%(value)s billion"
 
-#: src/humanize/number.py:85
+#: src/humanize/number.py:130
 #, fuzzy
 msgid "quadrillion"
-msgstr "%(value)s quadrillion"
+msgid_plural "quadrillion"
+msgstr[0] "%(value)s quadrillion"
+msgstr[1] "%(value)s quadrillion"
 
-#: src/humanize/number.py:86
+#: src/humanize/number.py:131
 #, fuzzy
 msgid "quintillion"
-msgstr "%(value)s quintillion"
+msgid_plural "quintillion"
+msgstr[0] "%(value)s quintillion"
+msgstr[1] "%(value)s quintillion"
 
-#: src/humanize/number.py:87
+#: src/humanize/number.py:132
 #, fuzzy
 msgid "sextillion"
-msgstr "%(value)s sextillion"
+msgid_plural "sextillion"
+msgstr[0] "%(value)s sextillion"
+msgstr[1] "%(value)s sextillion"
 
-#: src/humanize/number.py:88
+#: src/humanize/number.py:133
 #, fuzzy
 msgid "septillion"
-msgstr "%(value)s septillion"
+msgid_plural "septillion"
+msgstr[0] "%(value)s septillion"
+msgstr[1] "%(value)s septillion"
 
-#: src/humanize/number.py:89
+#: src/humanize/number.py:134
 #, fuzzy
 msgid "octillion"
-msgstr "%(value)s octillion"
+msgid_plural "octillion"
+msgstr[0] "%(value)s octillion"
+msgstr[1] "%(value)s octillion"
 
-#: src/humanize/number.py:90
+#: src/humanize/number.py:135
 #, fuzzy
 msgid "nonillion"
-msgstr "%(value)s nonillion"
+msgid_plural "nonillion"
+msgstr[0] "%(value)s nonillion"
+msgstr[1] "%(value)s nonillion"
 
-#: src/humanize/number.py:91
+#: src/humanize/number.py:136
 #, fuzzy
 msgid "decillion"
-msgstr "%(value)s décillion"
+msgid_plural "decillion"
+msgstr[0] "%(value)s décillion"
+msgstr[1] "%(value)s décillion"
 
-#: src/humanize/number.py:92
+#: src/humanize/number.py:137
 #, fuzzy
 msgid "googol"
-msgstr "%(value)s gogol"
+msgid_plural "googol"
+msgstr[0] "%(value)s gogol"
+msgstr[1] "%(value)s gogol"
 
-#: src/humanize/number.py:147
+#: src/humanize/number.py:228
 msgid "zero"
 msgstr ""
 
-#: src/humanize/number.py:148
+#: src/humanize/number.py:229
 msgid "one"
 msgstr "하나"
 
-#: src/humanize/number.py:149
+#: src/humanize/number.py:230
 msgid "two"
 msgstr "둘"
 
-#: src/humanize/number.py:150
+#: src/humanize/number.py:231
 msgid "three"
 msgstr "셋"
 
-#: src/humanize/number.py:151
+#: src/humanize/number.py:232
 msgid "four"
 msgstr "넷"
 
-#: src/humanize/number.py:152
+#: src/humanize/number.py:233
 msgid "five"
 msgstr "다섯"
 
-#: src/humanize/number.py:153
+#: src/humanize/number.py:234
 msgid "six"
 msgstr "여섯"
 
-#: src/humanize/number.py:154
+#: src/humanize/number.py:235
 msgid "seven"
 msgstr "일곱"
 
-#: src/humanize/number.py:155
+#: src/humanize/number.py:236
 msgid "eight"
 msgstr "여덟"
 
-#: src/humanize/number.py:156
+#: src/humanize/number.py:237
 msgid "nine"
 msgstr "아홉"
 
-#: src/humanize/time.py:119
-#, fuzzy, python-format
+#: src/humanize/time.py:133
+#, python-format
 msgid "%d microsecond"
 msgid_plural "%d microseconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/humanize/time.py:128
-#, fuzzy, python-format
+#: src/humanize/time.py:142
+#, python-format
 msgid "%d millisecond"
 msgid_plural "%d milliseconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/humanize/time.py:131 src/humanize/time.py:204
+#: src/humanize/time.py:145 src/humanize/time.py:220
 msgid "a moment"
 msgstr "잠깐"
 
-#: src/humanize/time.py:133
+#: src/humanize/time.py:147
 msgid "a second"
 msgstr "1초"
 
-#: src/humanize/time.py:135
+#: src/humanize/time.py:149
 #, python-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d초"
 msgstr[1] "%d초"
 
-#: src/humanize/time.py:137
+#: src/humanize/time.py:151
 msgid "a minute"
 msgstr "1분"
 
-#: src/humanize/time.py:140
+#: src/humanize/time.py:154
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d분"
 msgstr[1] "%d분"
 
-#: src/humanize/time.py:142
+#: src/humanize/time.py:156
 msgid "an hour"
 msgstr "1시간"
 
-#: src/humanize/time.py:145
+#: src/humanize/time.py:159
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d heure"
 msgstr[1] "%d시간"
 
-#: src/humanize/time.py:148
+#: src/humanize/time.py:162
 msgid "a day"
 msgstr "하루"
 
-#: src/humanize/time.py:150 src/humanize/time.py:153
+#: src/humanize/time.py:164 src/humanize/time.py:167
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d jour"
 msgstr[1] "%d일"
 
-#: src/humanize/time.py:155
+#: src/humanize/time.py:169
 msgid "a month"
 msgstr "한달"
 
-#: src/humanize/time.py:157
+#: src/humanize/time.py:171
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
 msgstr[0] "%d mois"
 msgstr[1] "%d개월"
 
-#: src/humanize/time.py:160
+#: src/humanize/time.py:174
 msgid "a year"
 msgstr "1년"
 
-#: src/humanize/time.py:162 src/humanize/time.py:171
+#: src/humanize/time.py:176 src/humanize/time.py:185
 #, python-format
 msgid "1 year, %d day"
 msgid_plural "1 year, %d days"
 msgstr[0] "1년 %d일"
 msgstr[1] "1년 %d일"
 
-#: src/humanize/time.py:165
+#: src/humanize/time.py:179
 msgid "1 year, 1 month"
 msgstr "1년, 1개월"
 
-#: src/humanize/time.py:168
+#: src/humanize/time.py:182
 #, python-format
 msgid "1 year, %d month"
 msgid_plural "1 year, %d months"
 msgstr[0] "1년, %d개월"
 msgstr[1] "1년, %d개월"
 
-#: src/humanize/time.py:173
+#: src/humanize/time.py:187
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
 msgstr[0] "%d 년"
 msgstr[1] "%d ans"
 
-#: src/humanize/time.py:201
+#: src/humanize/time.py:217
 #, python-format
 msgid "%s from now"
 msgstr "%s 후"
 
-#: src/humanize/time.py:201
+#: src/humanize/time.py:217
 #, python-format
 msgid "%s ago"
 msgstr "%s 전"
 
-#: src/humanize/time.py:205
+#: src/humanize/time.py:221
 msgid "now"
 msgstr "방금"
 
-#: src/humanize/time.py:227
+#: src/humanize/time.py:244
 msgid "today"
 msgstr "오늘"
 
-#: src/humanize/time.py:229
+#: src/humanize/time.py:246
 msgid "tomorrow"
 msgstr "내일"
 
-#: src/humanize/time.py:231
+#: src/humanize/time.py:248
 msgid "yesterday"
 msgstr "어제"
 
-#: src/humanize/time.py:498
+#: src/humanize/time.py:534
 #, python-format
 msgid "%s and %s"
 msgstr ""
diff --git a/lib/humanize/locale/nl_NL/LC_MESSAGES/humanize.mo b/lib/humanize/locale/nl_NL/LC_MESSAGES/humanize.mo
index 541391f..de1be93 100644
Binary files a/lib/humanize/locale/nl_NL/LC_MESSAGES/humanize.mo and b/lib/humanize/locale/nl_NL/LC_MESSAGES/humanize.mo differ
diff --git a/lib/humanize/locale/nl_NL/LC_MESSAGES/humanize.po b/lib/humanize/locale/nl_NL/LC_MESSAGES/humanize.po
index fdb0480..3fc7594 100644
--- a/lib/humanize/locale/nl_NL/LC_MESSAGES/humanize.po
+++ b/lib/humanize/locale/nl_NL/LC_MESSAGES/humanize.po
@@ -1,5 +1,5 @@
-# French (France) translations for PROJECT.
-# Copyright (C) 2013 ORGANIZATION
+# Dutch (Netherlands) translations for PROJECT.
+# Copyright (C) 2020 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
 #
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-29 21:07+0300\n"
+"POT-Creation-Date: 2021-04-30 22:34+0200\n"
 "PO-Revision-Date: 2015-03-25 21:08+0100\n"
 "Last-Translator: Martin van Wingerden\n"
 "Language-Team: nl_NL\n"
@@ -19,269 +19,297 @@ msgstr ""
 "Generated-By: Babel 0.9.6\n"
 "X-Generator: Poedit 1.7.5\n"
 
-#: src/humanize/number.py:31
+#: src/humanize/number.py:56
 msgctxt "0"
 msgid "th"
 msgstr "de"
 
-#: src/humanize/number.py:32
+#: src/humanize/number.py:57
 msgctxt "1"
 msgid "st"
 msgstr "ste"
 
-#: src/humanize/number.py:33
+#: src/humanize/number.py:58
 msgctxt "2"
 msgid "nd"
 msgstr "de"
 
-#: src/humanize/number.py:34
+#: src/humanize/number.py:59
 msgctxt "3"
 msgid "rd"
 msgstr "de"
 
-#: src/humanize/number.py:35
+#: src/humanize/number.py:60
 msgctxt "4"
 msgid "th"
 msgstr "de"
 
-#: src/humanize/number.py:36
+#: src/humanize/number.py:61
 msgctxt "5"
 msgid "th"
 msgstr "de"
 
-#: src/humanize/number.py:37
+#: src/humanize/number.py:62
 msgctxt "6"
 msgid "th"
 msgstr "de"
 
-#: src/humanize/number.py:38
+#: src/humanize/number.py:63
 msgctxt "7"
 msgid "th"
 msgstr "de"
 
-#: src/humanize/number.py:39
+#: src/humanize/number.py:64
 msgctxt "8"
 msgid "th"
 msgstr "de"
 
-#: src/humanize/number.py:40
+#: src/humanize/number.py:65
 msgctxt "9"
 msgid "th"
 msgstr "de"
 
-#: src/humanize/number.py:82
+#: src/humanize/number.py:126
+msgid "thousand"
+msgid_plural "thousand"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/humanize/number.py:127
 msgid "million"
-msgstr "miljoen"
+msgid_plural "million"
+msgstr[0] "miljoen"
+msgstr[1] "miljoen"
 
-#: src/humanize/number.py:83
+#: src/humanize/number.py:128
 msgid "billion"
-msgstr "miljard"
+msgid_plural "billion"
+msgstr[0] "miljard"
+msgstr[1] "miljard"
 
-#: src/humanize/number.py:84
+#: src/humanize/number.py:129
 msgid "trillion"
-msgstr "biljoen"
+msgid_plural "trillion"
+msgstr[0] "biljoen"
+msgstr[1] "biljoen"
 
-#: src/humanize/number.py:85
+#: src/humanize/number.py:130
 msgid "quadrillion"
-msgstr "biljard"
+msgid_plural "quadrillion"
+msgstr[0] "biljard"
+msgstr[1] "biljard"
 
-#: src/humanize/number.py:86
+#: src/humanize/number.py:131
 msgid "quintillion"
-msgstr "triljoen"
+msgid_plural "quintillion"
+msgstr[0] "triljoen"
+msgstr[1] "triljoen"
 
-#: src/humanize/number.py:87
+#: src/humanize/number.py:132
 msgid "sextillion"
-msgstr "triljard"
+msgid_plural "sextillion"
+msgstr[0] "triljard"
+msgstr[1] "triljard"
 
-#: src/humanize/number.py:88
+#: src/humanize/number.py:133
 msgid "septillion"
-msgstr "quadriljoen"
+msgid_plural "septillion"
+msgstr[0] "quadriljoen"
+msgstr[1] "quadriljoen"
 
-#: src/humanize/number.py:89
+#: src/humanize/number.py:134
 msgid "octillion"
-msgstr "quadriljard"
+msgid_plural "octillion"
+msgstr[0] "quadriljard"
+msgstr[1] "quadriljard"
 
-#: src/humanize/number.py:90
+#: src/humanize/number.py:135
 msgid "nonillion"
-msgstr "quintiljoen"
+msgid_plural "nonillion"
+msgstr[0] "quintiljoen"
+msgstr[1] "quintiljoen"
 
-#: src/humanize/number.py:91
+#: src/humanize/number.py:136
 msgid "decillion"
-msgstr "quintiljard"
+msgid_plural "decillion"
+msgstr[0] "quintiljard"
+msgstr[1] "quintiljard"
 
-#: src/humanize/number.py:92
+#: src/humanize/number.py:137
 msgid "googol"
-msgstr "googol"
+msgid_plural "googol"
+msgstr[0] "googol"
+msgstr[1] "googol"
 
-#: src/humanize/number.py:147
+#: src/humanize/number.py:228
 msgid "zero"
 msgstr "nul"
 
-#: src/humanize/number.py:148
+#: src/humanize/number.py:229
 msgid "one"
 msgstr "één"
 
-#: src/humanize/number.py:149
+#: src/humanize/number.py:230
 msgid "two"
 msgstr "twee"
 
-#: src/humanize/number.py:150
+#: src/humanize/number.py:231
 msgid "three"
 msgstr "drie"
 
-#: src/humanize/number.py:151
+#: src/humanize/number.py:232
 msgid "four"
 msgstr "vier"
 
-#: src/humanize/number.py:152
+#: src/humanize/number.py:233
 msgid "five"
 msgstr "vijf"
 
-#: src/humanize/number.py:153
+#: src/humanize/number.py:234
 msgid "six"
 msgstr "zes"
 
-#: src/humanize/number.py:154
+#: src/humanize/number.py:235
 msgid "seven"
 msgstr "zeven"
 
-#: src/humanize/number.py:155
+#: src/humanize/number.py:236
 msgid "eight"
 msgstr "acht"
 
-#: src/humanize/number.py:156
+#: src/humanize/number.py:237
 msgid "nine"
 msgstr "negen"
 
-#: src/humanize/time.py:119
+#: src/humanize/time.py:133
 #, fuzzy, python-format
 msgid "%d microsecond"
 msgid_plural "%d microseconds"
 msgstr[0] "%d microseconde"
 msgstr[1] "%d microseconden"
 
-#: src/humanize/time.py:128
+#: src/humanize/time.py:142
 #, fuzzy, python-format
 msgid "%d millisecond"
 msgid_plural "%d milliseconds"
 msgstr[0] "%d milliseconde"
 msgstr[1] "%d milliseconden"
 
-#: src/humanize/time.py:131 src/humanize/time.py:204
+#: src/humanize/time.py:145 src/humanize/time.py:220
 msgid "a moment"
 msgstr "een moment"
 
-#: src/humanize/time.py:133
+#: src/humanize/time.py:147
 msgid "a second"
 msgstr "een seconde"
 
-#: src/humanize/time.py:135
+#: src/humanize/time.py:149
 #, python-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d seconde"
 msgstr[1] "%d seconden"
 
-#: src/humanize/time.py:137
+#: src/humanize/time.py:151
 msgid "a minute"
 msgstr "een minuut"
 
-#: src/humanize/time.py:140
+#: src/humanize/time.py:154
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuut"
 msgstr[1] "%d minuten"
 
-#: src/humanize/time.py:142
+#: src/humanize/time.py:156
 msgid "an hour"
 msgstr "een uur"
 
-#: src/humanize/time.py:145
+#: src/humanize/time.py:159
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d uur"
-msgstr[1] "%d uren"
+msgstr[1] "%d uur"
 
-#: src/humanize/time.py:148
+#: src/humanize/time.py:162
 msgid "a day"
 msgstr "een dag"
 
-#: src/humanize/time.py:150 src/humanize/time.py:153
+#: src/humanize/time.py:164 src/humanize/time.py:167
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dag"
 msgstr[1] "%d dagen"
 
-#: src/humanize/time.py:155
+#: src/humanize/time.py:169
 msgid "a month"
 msgstr "een maand"
 
-#: src/humanize/time.py:157
+#: src/humanize/time.py:171
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
 msgstr[0] "%d maand"
 msgstr[1] "%d maanden"
 
-#: src/humanize/time.py:160
+#: src/humanize/time.py:174
 msgid "a year"
 msgstr "een jaar"
 
-#: src/humanize/time.py:162 src/humanize/time.py:171
+#: src/humanize/time.py:176 src/humanize/time.py:185
 #, python-format
 msgid "1 year, %d day"
 msgid_plural "1 year, %d days"
 msgstr[0] "1 jaar, %d dag"
 msgstr[1] "1 jaar, %d dagen"
 
-#: src/humanize/time.py:165
+#: src/humanize/time.py:179
 msgid "1 year, 1 month"
 msgstr "1 jaar, 1 maand"
 
-#: src/humanize/time.py:168
+#: src/humanize/time.py:182
 #, python-format
 msgid "1 year, %d month"
 msgid_plural "1 year, %d months"
 msgstr[0] "1 jaar, %d maand"
 msgstr[1] "1 jaar, %d maanden"
 
-#: src/humanize/time.py:173
+#: src/humanize/time.py:187
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
 msgstr[0] "%d jaar"
 msgstr[1] "%d jaar"
 
-#: src/humanize/time.py:201
+#: src/humanize/time.py:217
 #, python-format
 msgid "%s from now"
 msgstr "over %s"
 
-#: src/humanize/time.py:201
+#: src/humanize/time.py:217
 #, python-format
 msgid "%s ago"
 msgstr "%s geleden"
 
-#: src/humanize/time.py:205
+#: src/humanize/time.py:221
 msgid "now"
 msgstr "nu"
 
-#: src/humanize/time.py:227
+#: src/humanize/time.py:244
 msgid "today"
 msgstr "vandaag"
 
-#: src/humanize/time.py:229
+#: src/humanize/time.py:246
 msgid "tomorrow"
 msgstr "morgen"
 
-#: src/humanize/time.py:231
+#: src/humanize/time.py:248
 msgid "yesterday"
 msgstr "gisteren"
 
-#: src/humanize/time.py:498
+#: src/humanize/time.py:534
 #, python-format
 msgid "%s and %s"
 msgstr "%s en %s"
diff --git a/lib/humanize/locale/pl_PL/LC_MESSAGES/humanize.po b/lib/humanize/locale/pl_PL/LC_MESSAGES/humanize.po
index 34dd72d..0b41c09 100644
--- a/lib/humanize/locale/pl_PL/LC_MESSAGES/humanize.po
+++ b/lib/humanize/locale/pl_PL/LC_MESSAGES/humanize.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-29 21:07+0300\n"
+"POT-Creation-Date: 2021-04-30 22:34+0200\n"
 "PO-Revision-Date: 2020-04-22 10:02+0200\n"
 "Last-Translator: Bartosz Bubak <bartosz.bubak gmail com>\n"
 "Language-Team: Polish\n"
@@ -18,141 +18,181 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
-#: src/humanize/number.py:31
+#: src/humanize/number.py:56
 msgctxt "0"
 msgid "th"
 msgstr "."
 
-#: src/humanize/number.py:32
+#: src/humanize/number.py:57
 msgctxt "1"
 msgid "st"
 msgstr "."
 
-#: src/humanize/number.py:33
+#: src/humanize/number.py:58
 msgctxt "2"
 msgid "nd"
 msgstr "."
 
-#: src/humanize/number.py:34
+#: src/humanize/number.py:59
 msgctxt "3"
 msgid "rd"
 msgstr "."
 
-#: src/humanize/number.py:35
+#: src/humanize/number.py:60
 msgctxt "4"
 msgid "th"
 msgstr "."
 
-#: src/humanize/number.py:36
+#: src/humanize/number.py:61
 msgctxt "5"
 msgid "th"
 msgstr "."
 
-#: src/humanize/number.py:37
+#: src/humanize/number.py:62
 msgctxt "6"
 msgid "th"
 msgstr "."
 
-#: src/humanize/number.py:38
+#: src/humanize/number.py:63
 msgctxt "7"
 msgid "th"
 msgstr "."
 
-#: src/humanize/number.py:39
+#: src/humanize/number.py:64
 msgctxt "8"
 msgid "th"
 msgstr "."
 
-#: src/humanize/number.py:40
+#: src/humanize/number.py:65
 msgctxt "9"
 msgid "th"
 msgstr "."
 
-#: src/humanize/number.py:82
+#: src/humanize/number.py:126
+msgid "thousand"
+msgid_plural "thousand"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: src/humanize/number.py:127
 msgid "million"
-msgstr "milion"
+msgid_plural "million"
+msgstr[0] "milion"
+msgstr[1] "milion"
+msgstr[2] "milion"
 
-#: src/humanize/number.py:83
+#: src/humanize/number.py:128
 msgid "billion"
-msgstr "bilion"
+msgid_plural "billion"
+msgstr[0] "bilion"
+msgstr[1] "bilion"
+msgstr[2] "bilion"
 
-#: src/humanize/number.py:84
+#: src/humanize/number.py:129
 msgid "trillion"
-msgstr "trylion"
+msgid_plural "trillion"
+msgstr[0] "trylion"
+msgstr[1] "trylion"
+msgstr[2] "trylion"
 
-#: src/humanize/number.py:85
+#: src/humanize/number.py:130
 msgid "quadrillion"
-msgstr "kwadrylion"
+msgid_plural "quadrillion"
+msgstr[0] "kwadrylion"
+msgstr[1] "kwadrylion"
+msgstr[2] "kwadrylion"
 
-#: src/humanize/number.py:86
+#: src/humanize/number.py:131
 msgid "quintillion"
-msgstr "kwintylion"
+msgid_plural "quintillion"
+msgstr[0] "kwintylion"
+msgstr[1] "kwintylion"
+msgstr[2] "kwintylion"
 
-#: src/humanize/number.py:87
+#: src/humanize/number.py:132
 msgid "sextillion"
-msgstr "sekstylion"
+msgid_plural "sextillion"
+msgstr[0] "sekstylion"
+msgstr[1] "sekstylion"
+msgstr[2] "sekstylion"
 
-#: src/humanize/number.py:88
+#: src/humanize/number.py:133
 msgid "septillion"
-msgstr "septylion"
+msgid_plural "septillion"
+msgstr[0] "septylion"
+msgstr[1] "septylion"
+msgstr[2] "septylion"
 
-#: src/humanize/number.py:89
+#: src/humanize/number.py:134
 msgid "octillion"
-msgstr "oktylion"
+msgid_plural "octillion"
+msgstr[0] "oktylion"
+msgstr[1] "oktylion"
+msgstr[2] "oktylion"
 
-#: src/humanize/number.py:90
+#: src/humanize/number.py:135
 msgid "nonillion"
-msgstr "nonilion"
+msgid_plural "nonillion"
+msgstr[0] "nonilion"
+msgstr[1] "nonilion"
+msgstr[2] "nonilion"
 
-#: src/humanize/number.py:91
+#: src/humanize/number.py:136
 msgid "decillion"
-msgstr "decylion"
+msgid_plural "decillion"
+msgstr[0] "decylion"
+msgstr[1] "decylion"
+msgstr[2] "decylion"
 
-#: src/humanize/number.py:92
+#: src/humanize/number.py:137
 msgid "googol"
-msgstr "googol"
+msgid_plural "googol"
+msgstr[0] "googol"
+msgstr[1] "googol"
+msgstr[2] "googol"
 
-#: src/humanize/number.py:147
+#: src/humanize/number.py:228
 msgid "zero"
 msgstr "zero"
 
-#: src/humanize/number.py:148
+#: src/humanize/number.py:229
 msgid "one"
 msgstr "jeden"
 
-#: src/humanize/number.py:149
+#: src/humanize/number.py:230
 msgid "two"
 msgstr "dwa"
 
-#: src/humanize/number.py:150
+#: src/humanize/number.py:231
 msgid "three"
 msgstr "trzy"
 
-#: src/humanize/number.py:151
+#: src/humanize/number.py:232
 msgid "four"
 msgstr "cztery"
 
-#: src/humanize/number.py:152
+#: src/humanize/number.py:233
 msgid "five"
 msgstr "pięć"
 
-#: src/humanize/number.py:153
+#: src/humanize/number.py:234
 msgid "six"
 msgstr "sześć"
 
-#: src/humanize/number.py:154
+#: src/humanize/number.py:235
 msgid "seven"
 msgstr "siedem"
 
-#: src/humanize/number.py:155
+#: src/humanize/number.py:236
 msgid "eight"
 msgstr "osiem"
 
-#: src/humanize/number.py:156
+#: src/humanize/number.py:237
 msgid "nine"
 msgstr "dziewięć"
 
-#: src/humanize/time.py:119
+#: src/humanize/time.py:133
 #, python-format
 msgid "%d microsecond"
 msgid_plural "%d microseconds"
@@ -160,7 +200,7 @@ msgstr[0] "%d mikrosekunda"
 msgstr[1] "%d mikrosekundy"
 msgstr[2] "%d mikrosekund"
 
-#: src/humanize/time.py:128
+#: src/humanize/time.py:142
 #, python-format
 msgid "%d millisecond"
 msgid_plural "%d milliseconds"
@@ -168,15 +208,15 @@ msgstr[0] "%d milisekunda"
 msgstr[1] "%d milisekundy"
 msgstr[2] "%d milisekund"
 
-#: src/humanize/time.py:131 src/humanize/time.py:204
+#: src/humanize/time.py:145 src/humanize/time.py:220
 msgid "a moment"
 msgstr "chwila"
 
-#: src/humanize/time.py:133
+#: src/humanize/time.py:147
 msgid "a second"
 msgstr "sekunda"
 
-#: src/humanize/time.py:135
+#: src/humanize/time.py:149
 #, python-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -184,11 +224,11 @@ msgstr[0] "%d sekunda"
 msgstr[1] "%d sekundy"
 msgstr[2] "%d sekund"
 
-#: src/humanize/time.py:137
+#: src/humanize/time.py:151
 msgid "a minute"
 msgstr "minuta"
 
-#: src/humanize/time.py:140
+#: src/humanize/time.py:154
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -196,11 +236,11 @@ msgstr[0] "%d minuta"
 msgstr[1] "%d minuty"
 msgstr[2] "%d minut"
 
-#: src/humanize/time.py:142
+#: src/humanize/time.py:156
 msgid "an hour"
 msgstr "godzina"
 
-#: src/humanize/time.py:145
+#: src/humanize/time.py:159
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -208,11 +248,11 @@ msgstr[0] "%d godzina"
 msgstr[1] "%d godziny"
 msgstr[2] "%d godzin"
 
-#: src/humanize/time.py:148
+#: src/humanize/time.py:162
 msgid "a day"
 msgstr "dzień"
 
-#: src/humanize/time.py:150 src/humanize/time.py:153
+#: src/humanize/time.py:164 src/humanize/time.py:167
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -220,11 +260,11 @@ msgstr[0] "%d dzień"
 msgstr[1] "%d dni"
 msgstr[2] "%d dni"
 
-#: src/humanize/time.py:155
+#: src/humanize/time.py:169
 msgid "a month"
 msgstr "miesiąc"
 
-#: src/humanize/time.py:157
+#: src/humanize/time.py:171
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
@@ -232,11 +272,11 @@ msgstr[0] "%d miesiąc"
 msgstr[1] "%d miesiące"
 msgstr[2] "%d miesięcy"
 
-#: src/humanize/time.py:160
+#: src/humanize/time.py:174
 msgid "a year"
 msgstr "rok"
 
-#: src/humanize/time.py:162 src/humanize/time.py:171
+#: src/humanize/time.py:176 src/humanize/time.py:185
 #, python-format
 msgid "1 year, %d day"
 msgid_plural "1 year, %d days"
@@ -244,11 +284,11 @@ msgstr[0] "1 rok, %d dzień"
 msgstr[1] "1 rok, %d dni"
 msgstr[2] "1 rok, %d dni"
 
-#: src/humanize/time.py:165
+#: src/humanize/time.py:179
 msgid "1 year, 1 month"
 msgstr ""
 
-#: src/humanize/time.py:168
+#: src/humanize/time.py:182
 #, python-format
 msgid "1 year, %d month"
 msgid_plural "1 year, %d months"
@@ -256,7 +296,7 @@ msgstr[0] "1 rok, %d miesiąc"
 msgstr[1] "1 rok, %d miesiące"
 msgstr[2] "1 rok, %d miesięcy"
 
-#: src/humanize/time.py:173
+#: src/humanize/time.py:187
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
@@ -264,33 +304,33 @@ msgstr[0] "%d rok"
 msgstr[1] "%d lat"
 msgstr[2] "%d lata"
 
-#: src/humanize/time.py:201
+#: src/humanize/time.py:217
 #, python-format
 msgid "%s from now"
 msgstr "%s od teraz"
 
-#: src/humanize/time.py:201
+#: src/humanize/time.py:217
 #, python-format
 msgid "%s ago"
 msgstr "%s temu"
 
-#: src/humanize/time.py:205
+#: src/humanize/time.py:221
 msgid "now"
 msgstr "teraz"
 
-#: src/humanize/time.py:227
+#: src/humanize/time.py:244
 msgid "today"
 msgstr "dziś"
 
-#: src/humanize/time.py:229
+#: src/humanize/time.py:246
 msgid "tomorrow"
 msgstr "jutro"
 
-#: src/humanize/time.py:231
+#: src/humanize/time.py:248
 msgid "yesterday"
 msgstr "wczoraj"
 
-#: src/humanize/time.py:498
+#: src/humanize/time.py:534
 #, python-format
 msgid "%s and %s"
 msgstr ""
diff --git a/lib/humanize/locale/pt_BR/LC_MESSAGES/humanize.po b/lib/humanize/locale/pt_BR/LC_MESSAGES/humanize.po
index 27688c7..13f604a 100644
--- a/lib/humanize/locale/pt_BR/LC_MESSAGES/humanize.po
+++ b/lib/humanize/locale/pt_BR/LC_MESSAGES/humanize.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-29 21:07+0300\n"
+"POT-Creation-Date: 2021-04-30 22:34+0200\n"
 "PO-Revision-Date: 2016-06-15 15:58-0300\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -18,269 +18,297 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Poedit 1.8.5\n"
 
-#: src/humanize/number.py:31
+#: src/humanize/number.py:56
 msgctxt "0"
 msgid "th"
 msgstr "º"
 
-#: src/humanize/number.py:32
+#: src/humanize/number.py:57
 msgctxt "1"
 msgid "st"
 msgstr "º"
 
-#: src/humanize/number.py:33
+#: src/humanize/number.py:58
 msgctxt "2"
 msgid "nd"
 msgstr "º"
 
-#: src/humanize/number.py:34
+#: src/humanize/number.py:59
 msgctxt "3"
 msgid "rd"
 msgstr "º"
 
-#: src/humanize/number.py:35
+#: src/humanize/number.py:60
 msgctxt "4"
 msgid "th"
 msgstr "º"
 
-#: src/humanize/number.py:36
+#: src/humanize/number.py:61
 msgctxt "5"
 msgid "th"
 msgstr "º"
 
-#: src/humanize/number.py:37
+#: src/humanize/number.py:62
 msgctxt "6"
 msgid "th"
 msgstr "º"
 
-#: src/humanize/number.py:38
+#: src/humanize/number.py:63
 msgctxt "7"
 msgid "th"
 msgstr "º"
 
-#: src/humanize/number.py:39
+#: src/humanize/number.py:64
 msgctxt "8"
 msgid "th"
 msgstr "º"
 
-#: src/humanize/number.py:40
+#: src/humanize/number.py:65
 msgctxt "9"
 msgid "th"
 msgstr "º"
 
-#: src/humanize/number.py:82
+#: src/humanize/number.py:126
+msgid "thousand"
+msgid_plural "thousand"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/humanize/number.py:127
 msgid "million"
-msgstr "milhão"
+msgid_plural "million"
+msgstr[0] "milhão"
+msgstr[1] "milhão"
 
-#: src/humanize/number.py:83
+#: src/humanize/number.py:128
 msgid "billion"
-msgstr "bilhão"
+msgid_plural "billion"
+msgstr[0] "bilhão"
+msgstr[1] "bilhão"
 
-#: src/humanize/number.py:84
+#: src/humanize/number.py:129
 msgid "trillion"
-msgstr "trilhão"
+msgid_plural "trillion"
+msgstr[0] "trilhão"
+msgstr[1] "trilhão"
 
-#: src/humanize/number.py:85
+#: src/humanize/number.py:130
 msgid "quadrillion"
-msgstr "quatrilhão"
+msgid_plural "quadrillion"
+msgstr[0] "quatrilhão"
+msgstr[1] "quatrilhão"
 
-#: src/humanize/number.py:86
+#: src/humanize/number.py:131
 msgid "quintillion"
-msgstr "quintilhão"
+msgid_plural "quintillion"
+msgstr[0] "quintilhão"
+msgstr[1] "quintilhão"
 
-#: src/humanize/number.py:87
+#: src/humanize/number.py:132
 msgid "sextillion"
-msgstr "sextilhão"
+msgid_plural "sextillion"
+msgstr[0] "sextilhão"
+msgstr[1] "sextilhão"
 
-#: src/humanize/number.py:88
+#: src/humanize/number.py:133
 msgid "septillion"
-msgstr "septilhão"
+msgid_plural "septillion"
+msgstr[0] "septilhão"
+msgstr[1] "septilhão"
 
-#: src/humanize/number.py:89
+#: src/humanize/number.py:134
 msgid "octillion"
-msgstr "octilhão"
+msgid_plural "octillion"
+msgstr[0] "octilhão"
+msgstr[1] "octilhão"
 
-#: src/humanize/number.py:90
+#: src/humanize/number.py:135
 msgid "nonillion"
-msgstr "nonilhão"
+msgid_plural "nonillion"
+msgstr[0] "nonilhão"
+msgstr[1] "nonilhão"
 
-#: src/humanize/number.py:91
+#: src/humanize/number.py:136
 msgid "decillion"
-msgstr "decilhão"
+msgid_plural "decillion"
+msgstr[0] "decilhão"
+msgstr[1] "decilhão"
 
-#: src/humanize/number.py:92
+#: src/humanize/number.py:137
 msgid "googol"
-msgstr "undecilhão"
+msgid_plural "googol"
+msgstr[0] "undecilhão"
+msgstr[1] "undecilhão"
 
-#: src/humanize/number.py:147
+#: src/humanize/number.py:228
 msgid "zero"
 msgstr "zero"
 
-#: src/humanize/number.py:148
+#: src/humanize/number.py:229
 msgid "one"
 msgstr "um"
 
-#: src/humanize/number.py:149
+#: src/humanize/number.py:230
 msgid "two"
 msgstr "dois"
 
-#: src/humanize/number.py:150
+#: src/humanize/number.py:231
 msgid "three"
 msgstr "três"
 
-#: src/humanize/number.py:151
+#: src/humanize/number.py:232
 msgid "four"
 msgstr "quatro"
 
-#: src/humanize/number.py:152
+#: src/humanize/number.py:233
 msgid "five"
 msgstr "cinco"
 
-#: src/humanize/number.py:153
+#: src/humanize/number.py:234
 msgid "six"
 msgstr "seis"
 
-#: src/humanize/number.py:154
+#: src/humanize/number.py:235
 msgid "seven"
 msgstr "sete"
 
-#: src/humanize/number.py:155
+#: src/humanize/number.py:236
 msgid "eight"
 msgstr "oito"
 
-#: src/humanize/number.py:156
+#: src/humanize/number.py:237
 msgid "nine"
 msgstr "nove"
 
-#: src/humanize/time.py:119
+#: src/humanize/time.py:133
 #, fuzzy, python-format
 msgid "%d microsecond"
 msgid_plural "%d microseconds"
 msgstr[0] "%d microssegundo"
 msgstr[1] "%d microssegundos"
 
-#: src/humanize/time.py:128
+#: src/humanize/time.py:142
 #, fuzzy, python-format
 msgid "%d millisecond"
 msgid_plural "%d milliseconds"
 msgstr[0] "%d milissegundo"
 msgstr[1] "%d milissegundos"
 
-#: src/humanize/time.py:131 src/humanize/time.py:204
+#: src/humanize/time.py:145 src/humanize/time.py:220
 msgid "a moment"
 msgstr "um momento"
 
-#: src/humanize/time.py:133
+#: src/humanize/time.py:147
 msgid "a second"
 msgstr "um segundo"
 
-#: src/humanize/time.py:135
+#: src/humanize/time.py:149
 #, python-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
-#: src/humanize/time.py:137
+#: src/humanize/time.py:151
 msgid "a minute"
 msgstr "um minuto"
 
-#: src/humanize/time.py:140
+#: src/humanize/time.py:154
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: src/humanize/time.py:142
+#: src/humanize/time.py:156
 msgid "an hour"
 msgstr "uma hora"
 
-#: src/humanize/time.py:145
+#: src/humanize/time.py:159
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: src/humanize/time.py:148
+#: src/humanize/time.py:162
 msgid "a day"
 msgstr "um dia"
 
-#: src/humanize/time.py:150 src/humanize/time.py:153
+#: src/humanize/time.py:164 src/humanize/time.py:167
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dia"
 msgstr[1] "%d dias"
 
-#: src/humanize/time.py:155
+#: src/humanize/time.py:169
 msgid "a month"
 msgstr "um mês"
 
-#: src/humanize/time.py:157
+#: src/humanize/time.py:171
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
 msgstr[0] "%d mês"
 msgstr[1] "%d meses"
 
-#: src/humanize/time.py:160
+#: src/humanize/time.py:174
 msgid "a year"
 msgstr "um ano"
 
-#: src/humanize/time.py:162 src/humanize/time.py:171
+#: src/humanize/time.py:176 src/humanize/time.py:185
 #, python-format
 msgid "1 year, %d day"
 msgid_plural "1 year, %d days"
 msgstr[0] "1 ano e %d dia"
 msgstr[1] "1 ano e %d dias"
 
-#: src/humanize/time.py:165
+#: src/humanize/time.py:179
 msgid "1 year, 1 month"
 msgstr "1 ano e 1 mês"
 
-#: src/humanize/time.py:168
+#: src/humanize/time.py:182
 #, python-format
 msgid "1 year, %d month"
 msgid_plural "1 year, %d months"
 msgstr[0] "1 ano e %d mês"
 msgstr[1] "1 ano e %d meses"
 
-#: src/humanize/time.py:173
+#: src/humanize/time.py:187
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
 msgstr[0] "%d ano"
 msgstr[1] "%d anos"
 
-#: src/humanize/time.py:201
+#: src/humanize/time.py:217
 #, python-format
 msgid "%s from now"
 msgstr "em %s"
 
-#: src/humanize/time.py:201
+#: src/humanize/time.py:217
 #, python-format
 msgid "%s ago"
 msgstr "há %s"
 
-#: src/humanize/time.py:205
+#: src/humanize/time.py:221
 msgid "now"
 msgstr "agora"
 
-#: src/humanize/time.py:227
+#: src/humanize/time.py:244
 msgid "today"
 msgstr "hoje"
 
-#: src/humanize/time.py:229
+#: src/humanize/time.py:246
 msgid "tomorrow"
 msgstr "amanhã"
 
-#: src/humanize/time.py:231
+#: src/humanize/time.py:248
 msgid "yesterday"
 msgstr "ontem"
 
-#: src/humanize/time.py:498
+#: src/humanize/time.py:534
 #, python-format
 msgid "%s and %s"
 msgstr "%s e %s"
diff --git a/lib/humanize/locale/pt_PT/LC_MESSAGES/humanize.po b/lib/humanize/locale/pt_PT/LC_MESSAGES/humanize.po
index eecd597..82e9b28 100644
--- a/lib/humanize/locale/pt_PT/LC_MESSAGES/humanize.po
+++ b/lib/humanize/locale/pt_PT/LC_MESSAGES/humanize.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-29 21:07+0300\n"
+"POT-Creation-Date: 2021-04-30 22:34+0200\n"
 "PO-Revision-Date: 2020-07-05 18:17+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -18,269 +18,297 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Poedit 2.3.1\n"
 
-#: src/humanize/number.py:31
+#: src/humanize/number.py:56
 msgctxt "0"
 msgid "th"
 msgstr "º"
 
-#: src/humanize/number.py:32
+#: src/humanize/number.py:57
 msgctxt "1"
 msgid "st"
 msgstr "º"
 
-#: src/humanize/number.py:33
+#: src/humanize/number.py:58
 msgctxt "2"
 msgid "nd"
 msgstr "º"
 
-#: src/humanize/number.py:34
+#: src/humanize/number.py:59
 msgctxt "3"
 msgid "rd"
 msgstr "º"
 
-#: src/humanize/number.py:35
+#: src/humanize/number.py:60
 msgctxt "4"
 msgid "th"
 msgstr "º"
 
-#: src/humanize/number.py:36
+#: src/humanize/number.py:61
 msgctxt "5"
 msgid "th"
 msgstr "º"
 
-#: src/humanize/number.py:37
+#: src/humanize/number.py:62
 msgctxt "6"
 msgid "th"
 msgstr "º"
 
-#: src/humanize/number.py:38
+#: src/humanize/number.py:63
 msgctxt "7"
 msgid "th"
 msgstr "º"
 
-#: src/humanize/number.py:39
+#: src/humanize/number.py:64
 msgctxt "8"
 msgid "th"
 msgstr "º"
 
-#: src/humanize/number.py:40
+#: src/humanize/number.py:65
 msgctxt "9"
 msgid "th"
 msgstr "º"
 
-#: src/humanize/number.py:82
+#: src/humanize/number.py:126
+msgid "thousand"
+msgid_plural "thousand"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/humanize/number.py:127
 msgid "million"
-msgstr "milhão"
+msgid_plural "million"
+msgstr[0] "milhão"
+msgstr[1] "milhão"
 
-#: src/humanize/number.py:83
+#: src/humanize/number.py:128
 msgid "billion"
-msgstr "milhar de milhão"
+msgid_plural "billion"
+msgstr[0] "milhar de milhão"
+msgstr[1] "milhar de milhão"
 
-#: src/humanize/number.py:84
+#: src/humanize/number.py:129
 msgid "trillion"
-msgstr "bilião"
+msgid_plural "trillion"
+msgstr[0] "bilião"
+msgstr[1] "bilião"
 
-#: src/humanize/number.py:85
+#: src/humanize/number.py:130
 msgid "quadrillion"
-msgstr "mil biliões"
+msgid_plural "quadrillion"
+msgstr[0] "mil biliões"
+msgstr[1] "mil biliões"
 
-#: src/humanize/number.py:86
+#: src/humanize/number.py:131
 msgid "quintillion"
-msgstr "trilião"
+msgid_plural "quintillion"
+msgstr[0] "trilião"
+msgstr[1] "trilião"
 
-#: src/humanize/number.py:87
+#: src/humanize/number.py:132
 msgid "sextillion"
-msgstr "mil triliões"
+msgid_plural "sextillion"
+msgstr[0] "mil triliões"
+msgstr[1] "mil triliões"
 
-#: src/humanize/number.py:88
+#: src/humanize/number.py:133
 msgid "septillion"
-msgstr "quatrilião"
+msgid_plural "septillion"
+msgstr[0] "quatrilião"
+msgstr[1] "quatrilião"
 
-#: src/humanize/number.py:89
+#: src/humanize/number.py:134
 msgid "octillion"
-msgstr "mil quatriliões"
+msgid_plural "octillion"
+msgstr[0] "mil quatriliões"
+msgstr[1] "mil quatriliões"
 
-#: src/humanize/number.py:90
+#: src/humanize/number.py:135
 msgid "nonillion"
-msgstr "quintilhão"
+msgid_plural "nonillion"
+msgstr[0] "quintilhão"
+msgstr[1] "quintilhão"
 
-#: src/humanize/number.py:91
+#: src/humanize/number.py:136
 msgid "decillion"
-msgstr "mil quintilhões"
+msgid_plural "decillion"
+msgstr[0] "mil quintilhões"
+msgstr[1] "mil quintilhões"
 
-#: src/humanize/number.py:92
+#: src/humanize/number.py:137
 msgid "googol"
-msgstr "sextilhão"
+msgid_plural "googol"
+msgstr[0] "sextilhão"
+msgstr[1] "sextilhão"
 
-#: src/humanize/number.py:147
+#: src/humanize/number.py:228
 msgid "zero"
 msgstr "zero"
 
-#: src/humanize/number.py:148
+#: src/humanize/number.py:229
 msgid "one"
 msgstr "um"
 
-#: src/humanize/number.py:149
+#: src/humanize/number.py:230
 msgid "two"
 msgstr "dois"
 
-#: src/humanize/number.py:150
+#: src/humanize/number.py:231
 msgid "three"
 msgstr "três"
 
-#: src/humanize/number.py:151
+#: src/humanize/number.py:232
 msgid "four"
 msgstr "quatro"
 
-#: src/humanize/number.py:152
+#: src/humanize/number.py:233
 msgid "five"
 msgstr "cinco"
 
-#: src/humanize/number.py:153
+#: src/humanize/number.py:234
 msgid "six"
 msgstr "seis"
 
-#: src/humanize/number.py:154
+#: src/humanize/number.py:235
 msgid "seven"
 msgstr "sete"
 
-#: src/humanize/number.py:155
+#: src/humanize/number.py:236
 msgid "eight"
 msgstr "oito"
 
-#: src/humanize/number.py:156
+#: src/humanize/number.py:237
 msgid "nine"
 msgstr "nove"
 
-#: src/humanize/time.py:119
+#: src/humanize/time.py:133
 #, python-format
 msgid "%d microsecond"
 msgid_plural "%d microseconds"
 msgstr[0] "%d microssegundo"
 msgstr[1] "%d microssegundos"
 
-#: src/humanize/time.py:128
+#: src/humanize/time.py:142
 #, python-format
 msgid "%d millisecond"
 msgid_plural "%d milliseconds"
 msgstr[0] "%d milissegundo"
 msgstr[1] "%d milissegundos"
 
-#: src/humanize/time.py:131 src/humanize/time.py:204
+#: src/humanize/time.py:145 src/humanize/time.py:220
 msgid "a moment"
 msgstr "um momento"
 
-#: src/humanize/time.py:133
+#: src/humanize/time.py:147
 msgid "a second"
 msgstr "um segundo"
 
-#: src/humanize/time.py:135
+#: src/humanize/time.py:149
 #, python-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
-#: src/humanize/time.py:137
+#: src/humanize/time.py:151
 msgid "a minute"
 msgstr "um minuto"
 
-#: src/humanize/time.py:140
+#: src/humanize/time.py:154
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: src/humanize/time.py:142
+#: src/humanize/time.py:156
 msgid "an hour"
 msgstr "uma hora"
 
-#: src/humanize/time.py:145
+#: src/humanize/time.py:159
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: src/humanize/time.py:148
+#: src/humanize/time.py:162
 msgid "a day"
 msgstr "um dia"
 
-#: src/humanize/time.py:150 src/humanize/time.py:153
+#: src/humanize/time.py:164 src/humanize/time.py:167
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dia"
 msgstr[1] "%d dias"
 
-#: src/humanize/time.py:155
+#: src/humanize/time.py:169
 msgid "a month"
 msgstr "um mês"
 
-#: src/humanize/time.py:157
+#: src/humanize/time.py:171
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
 msgstr[0] "%d mês"
 msgstr[1] "%d meses"
 
-#: src/humanize/time.py:160
+#: src/humanize/time.py:174
 msgid "a year"
 msgstr "um ano"
 
-#: src/humanize/time.py:162 src/humanize/time.py:171
+#: src/humanize/time.py:176 src/humanize/time.py:185
 #, python-format
 msgid "1 year, %d day"
 msgid_plural "1 year, %d days"
 msgstr[0] "1 ano e %d dia"
 msgstr[1] "1 ano e %d dias"
 
-#: src/humanize/time.py:165
+#: src/humanize/time.py:179
 msgid "1 year, 1 month"
 msgstr "1 ano e 1 mês"
 
-#: src/humanize/time.py:168
+#: src/humanize/time.py:182
 #, python-format
 msgid "1 year, %d month"
 msgid_plural "1 year, %d months"
 msgstr[0] "1 ano e %d mês"
 msgstr[1] "1 ano e %d meses"
 
-#: src/humanize/time.py:173
+#: src/humanize/time.py:187
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
 msgstr[0] "%d ano"
 msgstr[1] "%d anos"
 
-#: src/humanize/time.py:201
+#: src/humanize/time.py:217
 #, python-format
 msgid "%s from now"
 msgstr "daqui a %s"
 
-#: src/humanize/time.py:201
+#: src/humanize/time.py:217
 #, python-format
 msgid "%s ago"
 msgstr "há %s"
 
-#: src/humanize/time.py:205
+#: src/humanize/time.py:221
 msgid "now"
 msgstr "agora"
 
-#: src/humanize/time.py:227
+#: src/humanize/time.py:244
 msgid "today"
 msgstr "hoje"
 
-#: src/humanize/time.py:229
+#: src/humanize/time.py:246
 msgid "tomorrow"
 msgstr "amanhã"
 
-#: src/humanize/time.py:231
+#: src/humanize/time.py:248
 msgid "yesterday"
 msgstr "ontem"
 
-#: src/humanize/time.py:498
+#: src/humanize/time.py:534
 #, python-format
 msgid "%s and %s"
 msgstr "%s e %s"
diff --git a/lib/humanize/locale/ru_RU/LC_MESSAGES/humanize.po b/lib/humanize/locale/ru_RU/LC_MESSAGES/humanize.po
index cfa8ad4..1362683 100644
--- a/lib/humanize/locale/ru_RU/LC_MESSAGES/humanize.po
+++ b/lib/humanize/locale/ru_RU/LC_MESSAGES/humanize.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-29 20:53+0300\n"
+"POT-Creation-Date: 2021-04-30 22:34+0200\n"
 "PO-Revision-Date: 2014-03-24 20:32+0300\n"
 "Last-Translator: Sergey Prokhorov <me@seriyps.ru>\n"
 "Language-Team: ru_RU <LL@li.org>\n"
@@ -21,171 +21,211 @@ msgstr ""
 "X-Generator: Poedit 1.5.4\n"
 
 # в Django тут "ий" но на самом деле оба варианта работают плохо
-#: src/humanize/number.py:31
+#: src/humanize/number.py:56
 msgctxt "0"
 msgid "th"
 msgstr "ой"
 
-#: src/humanize/number.py:32
+#: src/humanize/number.py:57
 msgctxt "1"
 msgid "st"
 msgstr "ый"
 
-#: src/humanize/number.py:33
+#: src/humanize/number.py:58
 msgctxt "2"
 msgid "nd"
 msgstr "ой"
 
-#: src/humanize/number.py:34
+#: src/humanize/number.py:59
 msgctxt "3"
 msgid "rd"
 msgstr "ий"
 
 # в Django тут "ий" но на самом деле оба варианта работают плохо
-#: src/humanize/number.py:35
+#: src/humanize/number.py:60
 msgctxt "4"
 msgid "th"
 msgstr "ый"
 
 # в Django тут "ий" но на самом деле оба варианта работают плохо
-#: src/humanize/number.py:36
+#: src/humanize/number.py:61
 msgctxt "5"
 msgid "th"
 msgstr "ый"
 
 # в Django тут "ий" но на самом деле оба варианта работают плохо
-#: src/humanize/number.py:37
+#: src/humanize/number.py:62
 msgctxt "6"
 msgid "th"
 msgstr "ой"
 
 # в Django тут "ий" но на самом деле оба варианта работают плохо
-#: src/humanize/number.py:38
+#: src/humanize/number.py:63
 msgctxt "7"
 msgid "th"
 msgstr "ой"
 
 # в Django тут "ий" но на самом деле оба варианта работают плохо
-#: src/humanize/number.py:39
+#: src/humanize/number.py:64
 msgctxt "8"
 msgid "th"
 msgstr "ой"
 
 # в Django тут "ий" но на самом деле оба варианта работают плохо
-#: src/humanize/number.py:40
+#: src/humanize/number.py:65
 msgctxt "9"
 msgid "th"
 msgstr "ый"
 
-#: src/humanize/number.py:82
+#: src/humanize/number.py:126
+msgid "thousand"
+msgid_plural "thousand"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: src/humanize/number.py:127
 msgid "million"
-msgstr "миллиона"
+msgid_plural "million"
+msgstr[0] "миллиона"
+msgstr[1] "миллиона"
+msgstr[2] "миллиона"
 
-#: src/humanize/number.py:83
+#: src/humanize/number.py:128
 msgid "billion"
-msgstr "миллиарда"
+msgid_plural "billion"
+msgstr[0] "миллиарда"
+msgstr[1] "миллиарда"
+msgstr[2] "миллиарда"
 
-#: src/humanize/number.py:84
+#: src/humanize/number.py:129
 msgid "trillion"
-msgstr "триллиона"
+msgid_plural "trillion"
+msgstr[0] "триллиона"
+msgstr[1] "триллиона"
+msgstr[2] "триллиона"
 
-#: src/humanize/number.py:85
+#: src/humanize/number.py:130
 msgid "quadrillion"
-msgstr "квадриллиона"
+msgid_plural "quadrillion"
+msgstr[0] "квадриллиона"
+msgstr[1] "квадриллиона"
+msgstr[2] "квадриллиона"
 
-#: src/humanize/number.py:86
+#: src/humanize/number.py:131
 msgid "quintillion"
-msgstr "квинтиллиона"
+msgid_plural "quintillion"
+msgstr[0] "квинтиллиона"
+msgstr[1] "квинтиллиона"
+msgstr[2] "квинтиллиона"
 
-#: src/humanize/number.py:87
+#: src/humanize/number.py:132
 msgid "sextillion"
-msgstr "сикстиллиона"
+msgid_plural "sextillion"
+msgstr[0] "сикстиллиона"
+msgstr[1] "сикстиллиона"
+msgstr[2] "сикстиллиона"
 
-#: src/humanize/number.py:88
+#: src/humanize/number.py:133
 msgid "septillion"
-msgstr "септиллиона"
+msgid_plural "septillion"
+msgstr[0] "септиллиона"
+msgstr[1] "септиллиона"
+msgstr[2] "септиллиона"
 
-#: src/humanize/number.py:89
+#: src/humanize/number.py:134
 msgid "octillion"
-msgstr "октиллиона"
+msgid_plural "octillion"
+msgstr[0] "октиллиона"
+msgstr[1] "октиллиона"
+msgstr[2] "октиллиона"
 
-#: src/humanize/number.py:90
+#: src/humanize/number.py:135
 msgid "nonillion"
-msgstr "нониллиона"
+msgid_plural "nonillion"
+msgstr[0] "нониллиона"
+msgstr[1] "нониллиона"
+msgstr[2] "нониллиона"
 
-#: src/humanize/number.py:91
+#: src/humanize/number.py:136
 msgid "decillion"
-msgstr "децилиона"
+msgid_plural "decillion"
+msgstr[0] "децилиона"
+msgstr[1] "децилиона"
+msgstr[2] "децилиона"
 
-#: src/humanize/number.py:92
+#: src/humanize/number.py:137
 msgid "googol"
-msgstr "гогола"
+msgid_plural "googol"
+msgstr[0] "гогола"
+msgstr[1] "гогола"
+msgstr[2] "гогола"
 
-#: src/humanize/number.py:147
+#: src/humanize/number.py:228
 msgid "zero"
 msgstr ""
 
-#: src/humanize/number.py:148
+#: src/humanize/number.py:229
 msgid "one"
 msgstr "один"
 
-#: src/humanize/number.py:149
+#: src/humanize/number.py:230
 msgid "two"
 msgstr "два"
 
-#: src/humanize/number.py:150
+#: src/humanize/number.py:231
 msgid "three"
 msgstr "три"
 
-#: src/humanize/number.py:151
+#: src/humanize/number.py:232
 msgid "four"
 msgstr "четыре"
 
-#: src/humanize/number.py:152
+#: src/humanize/number.py:233
 msgid "five"
 msgstr "пять"
 
-#: src/humanize/number.py:153
+#: src/humanize/number.py:234
 msgid "six"
 msgstr "шесть"
 
-#: src/humanize/number.py:154
+#: src/humanize/number.py:235
 msgid "seven"
 msgstr "семь"
 
-#: src/humanize/number.py:155
+#: src/humanize/number.py:236
 msgid "eight"
 msgstr "восемь"
 
-#: src/humanize/number.py:156
+#: src/humanize/number.py:237
 msgid "nine"
 msgstr "девять"
 
-#: src/humanize/time.py:119
-#, fuzzy, python-format
+#: src/humanize/time.py:133
+#, python-format
 msgid "%d microsecond"
 msgid_plural "%d microseconds"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/humanize/time.py:128
-#, fuzzy, python-format
+#: src/humanize/time.py:142
+#, python-format
 msgid "%d millisecond"
 msgid_plural "%d milliseconds"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/humanize/time.py:131 src/humanize/time.py:204
+#: src/humanize/time.py:145 src/humanize/time.py:220
 msgid "a moment"
 msgstr "только что"
 
-#: src/humanize/time.py:133
+#: src/humanize/time.py:147
 msgid "a second"
 msgstr "секунду"
 
-#: src/humanize/time.py:135
+#: src/humanize/time.py:149
 #, python-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -193,11 +233,11 @@ msgstr[0] "%d секунда"
 msgstr[1] "%d секунды"
 msgstr[2] "%d секунд"
 
-#: src/humanize/time.py:137
+#: src/humanize/time.py:151
 msgid "a minute"
 msgstr "минуту"
 
-#: src/humanize/time.py:140
+#: src/humanize/time.py:154
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -205,11 +245,11 @@ msgstr[0] "%d минута"
 msgstr[1] "%d минуты"
 msgstr[2] "%d минут"
 
-#: src/humanize/time.py:142
+#: src/humanize/time.py:156
 msgid "an hour"
 msgstr "час"
 
-#: src/humanize/time.py:145
+#: src/humanize/time.py:159
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -217,11 +257,11 @@ msgstr[0] "%d час"
 msgstr[1] "%d часа"
 msgstr[2] "%d часов"
 
-#: src/humanize/time.py:148
+#: src/humanize/time.py:162
 msgid "a day"
 msgstr "день"
 
-#: src/humanize/time.py:150 src/humanize/time.py:153
+#: src/humanize/time.py:164 src/humanize/time.py:167
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -229,11 +269,11 @@ msgstr[0] "%d день"
 msgstr[1] "%d дня"
 msgstr[2] "%d дней"
 
-#: src/humanize/time.py:155
+#: src/humanize/time.py:169
 msgid "a month"
 msgstr "месяц"
 
-#: src/humanize/time.py:157
+#: src/humanize/time.py:171
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
@@ -241,11 +281,11 @@ msgstr[0] "%d месяц"
 msgstr[1] "%d месяца"
 msgstr[2] "%d месяцев"
 
-#: src/humanize/time.py:160
+#: src/humanize/time.py:174
 msgid "a year"
 msgstr "год"
 
-#: src/humanize/time.py:162 src/humanize/time.py:171
+#: src/humanize/time.py:176 src/humanize/time.py:185
 #, python-format
 msgid "1 year, %d day"
 msgid_plural "1 year, %d days"
@@ -253,11 +293,11 @@ msgstr[0] "1 год, %d день"
 msgstr[1] "1 год, %d дня"
 msgstr[2] "1 год, %d дней"
 
-#: src/humanize/time.py:165
+#: src/humanize/time.py:179
 msgid "1 year, 1 month"
 msgstr "1 год, 1 месяц"
 
-#: src/humanize/time.py:168
+#: src/humanize/time.py:182
 #, python-format
 msgid "1 year, %d month"
 msgid_plural "1 year, %d months"
@@ -265,7 +305,7 @@ msgstr[0] "1 год, %d месяц"
 msgstr[1] "1 год, %d месяца"
 msgstr[2] "1 год, %d месяцев"
 
-#: src/humanize/time.py:173
+#: src/humanize/time.py:187
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
@@ -273,33 +313,33 @@ msgstr[0] "%d год"
 msgstr[1] "%d года"
 msgstr[2] "%d лет"
 
-#: src/humanize/time.py:201
+#: src/humanize/time.py:217
 #, python-format
 msgid "%s from now"
 msgstr "через %s"
 
-#: src/humanize/time.py:201
+#: src/humanize/time.py:217
 #, python-format
 msgid "%s ago"
 msgstr "%s назад"
 
-#: src/humanize/time.py:205
+#: src/humanize/time.py:221
 msgid "now"
 msgstr "сейчас"
 
-#: src/humanize/time.py:227
+#: src/humanize/time.py:244
 msgid "today"
 msgstr "сегодня"
 
-#: src/humanize/time.py:229
+#: src/humanize/time.py:246
 msgid "tomorrow"
 msgstr "завтра"
 
-#: src/humanize/time.py:231
+#: src/humanize/time.py:248
 msgid "yesterday"
 msgstr "вчера"
 
-#: src/humanize/time.py:498
+#: src/humanize/time.py:534
 #, python-format
 msgid "%s and %s"
 msgstr "%s и %s"
diff --git a/lib/humanize/locale/sk_SK/LC_MESSAGES/humanize.po b/lib/humanize/locale/sk_SK/LC_MESSAGES/humanize.po
index 04c206a..c72c81d 100644
--- a/lib/humanize/locale/sk_SK/LC_MESSAGES/humanize.po
+++ b/lib/humanize/locale/sk_SK/LC_MESSAGES/humanize.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: humanize\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-29 21:07+0300\n"
+"POT-Creation-Date: 2021-04-30 22:34+0200\n"
 "PO-Revision-Date: 2020-09-29 22:43+0300\n"
 "Last-Translator: Jose Riha <jose1711 gmail com>\n"
 "Language-Team: sk <LL@li.org>\n"
@@ -18,141 +18,181 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: src/humanize/number.py:31
+#: src/humanize/number.py:56
 msgctxt "0"
 msgid "th"
 msgstr "."
 
-#: src/humanize/number.py:32
+#: src/humanize/number.py:57
 msgctxt "1"
 msgid "st"
 msgstr "."
 
-#: src/humanize/number.py:33
+#: src/humanize/number.py:58
 msgctxt "2"
 msgid "nd"
 msgstr "."
 
-#: src/humanize/number.py:34
+#: src/humanize/number.py:59
 msgctxt "3"
 msgid "rd"
 msgstr "."
 
-#: src/humanize/number.py:35
+#: src/humanize/number.py:60
 msgctxt "4"
 msgid "th"
 msgstr "."
 
-#: src/humanize/number.py:36
+#: src/humanize/number.py:61
 msgctxt "5"
 msgid "th"
 msgstr "."
 
-#: src/humanize/number.py:37
+#: src/humanize/number.py:62
 msgctxt "6"
 msgid "th"
 msgstr "."
 
-#: src/humanize/number.py:38
+#: src/humanize/number.py:63
 msgctxt "7"
 msgid "th"
 msgstr "."
 
-#: src/humanize/number.py:39
+#: src/humanize/number.py:64
 msgctxt "8"
 msgid "th"
 msgstr "."
 
-#: src/humanize/number.py:40
+#: src/humanize/number.py:65
 msgctxt "9"
 msgid "th"
 msgstr "."
 
-#: src/humanize/number.py:82
+#: src/humanize/number.py:126
+msgid "thousand"
+msgid_plural "thousand"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: src/humanize/number.py:127
 msgid "million"
-msgstr "milióna/ov"
+msgid_plural "million"
+msgstr[0] "milióna/ov"
+msgstr[1] "milióna/ov"
+msgstr[2] "milióna/ov"
 
-#: src/humanize/number.py:83
+#: src/humanize/number.py:128
 msgid "billion"
-msgstr "miliardy/árd"
+msgid_plural "billion"
+msgstr[0] "miliardy/árd"
+msgstr[1] "miliardy/árd"
+msgstr[2] "miliardy/árd"
 
-#: src/humanize/number.py:84
+#: src/humanize/number.py:129
 msgid "trillion"
-msgstr "bilióna/ov"
+msgid_plural "trillion"
+msgstr[0] "bilióna/ov"
+msgstr[1] "bilióna/ov"
+msgstr[2] "bilióna/ov"
 
-#: src/humanize/number.py:85
+#: src/humanize/number.py:130
 msgid "quadrillion"
-msgstr "biliardy/árd"
+msgid_plural "quadrillion"
+msgstr[0] "biliardy/árd"
+msgstr[1] "biliardy/árd"
+msgstr[2] "biliardy/árd"
 
-#: src/humanize/number.py:86
+#: src/humanize/number.py:131
 msgid "quintillion"
-msgstr "trilióna/árd"
+msgid_plural "quintillion"
+msgstr[0] "trilióna/árd"
+msgstr[1] "trilióna/árd"
+msgstr[2] "trilióna/árd"
 
-#: src/humanize/number.py:87
+#: src/humanize/number.py:132
 msgid "sextillion"
-msgstr "triliardy/árd"
+msgid_plural "sextillion"
+msgstr[0] "triliardy/árd"
+msgstr[1] "triliardy/árd"
+msgstr[2] "triliardy/árd"
 
-#: src/humanize/number.py:88
+#: src/humanize/number.py:133
 msgid "septillion"
-msgstr "kvadrilióna/ov"
+msgid_plural "septillion"
+msgstr[0] "kvadrilióna/ov"
+msgstr[1] "kvadrilióna/ov"
+msgstr[2] "kvadrilióna/ov"
 
-#: src/humanize/number.py:89
+#: src/humanize/number.py:134
 msgid "octillion"
-msgstr "kvadriliardy/árd"
+msgid_plural "octillion"
+msgstr[0] "kvadriliardy/árd"
+msgstr[1] "kvadriliardy/árd"
+msgstr[2] "kvadriliardy/árd"
 
-#: src/humanize/number.py:90
+#: src/humanize/number.py:135
 msgid "nonillion"
-msgstr "kvintilióna/ov"
+msgid_plural "nonillion"
+msgstr[0] "kvintilióna/ov"
+msgstr[1] "kvintilióna/ov"
+msgstr[2] "kvintilióna/ov"
 
-#: src/humanize/number.py:91
+#: src/humanize/number.py:136
 msgid "decillion"
-msgstr "kvintiliardy/árd"
+msgid_plural "decillion"
+msgstr[0] "kvintiliardy/árd"
+msgstr[1] "kvintiliardy/árd"
+msgstr[2] "kvintiliardy/árd"
 
-#: src/humanize/number.py:92
+#: src/humanize/number.py:137
 msgid "googol"
-msgstr "googola/ov"
+msgid_plural "googol"
+msgstr[0] "googola/ov"
+msgstr[1] "googola/ov"
+msgstr[2] "googola/ov"
 
-#: src/humanize/number.py:147
+#: src/humanize/number.py:228
 msgid "zero"
 msgstr "nula"
 
-#: src/humanize/number.py:148
+#: src/humanize/number.py:229
 msgid "one"
 msgstr "jedna"
 
-#: src/humanize/number.py:149
+#: src/humanize/number.py:230
 msgid "two"
 msgstr "dve"
 
-#: src/humanize/number.py:150
+#: src/humanize/number.py:231
 msgid "three"
 msgstr "tri"
 
-#: src/humanize/number.py:151
+#: src/humanize/number.py:232
 msgid "four"
 msgstr "štyri"
 
-#: src/humanize/number.py:152
+#: src/humanize/number.py:233
 msgid "five"
 msgstr "päť"
 
-#: src/humanize/number.py:153
+#: src/humanize/number.py:234
 msgid "six"
 msgstr "šesť"
 
-#: src/humanize/number.py:154
+#: src/humanize/number.py:235
 msgid "seven"
 msgstr "sedem"
 
-#: src/humanize/number.py:155
+#: src/humanize/number.py:236
 msgid "eight"
 msgstr "osem"
 
-#: src/humanize/number.py:156
+#: src/humanize/number.py:237
 msgid "nine"
 msgstr "deväť"
 
-#: src/humanize/time.py:119
+#: src/humanize/time.py:133
 #, fuzzy, python-format
 msgid "%d microsecond"
 msgid_plural "%d microseconds"
@@ -160,7 +200,7 @@ msgstr[0] "%d mikrosekundu"
 msgstr[1] "%d mikrosekundy"
 msgstr[2] "%d mikrosekúnd"
 
-#: src/humanize/time.py:128
+#: src/humanize/time.py:142
 #, fuzzy, python-format
 msgid "%d millisecond"
 msgid_plural "%d milliseconds"
@@ -168,15 +208,15 @@ msgstr[0] "%d milisekundu"
 msgstr[1] "%d milisekundy"
 msgstr[2] "%d milisekúnd"
 
-#: src/humanize/time.py:131 src/humanize/time.py:204
+#: src/humanize/time.py:145 src/humanize/time.py:220
 msgid "a moment"
 msgstr "chvíľku"
 
-#: src/humanize/time.py:133
+#: src/humanize/time.py:147
 msgid "a second"
 msgstr "sekundu"
 
-#: src/humanize/time.py:135
+#: src/humanize/time.py:149
 #, python-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -184,11 +224,11 @@ msgstr[0] "%d sekundu"
 msgstr[1] "%d sekundy"
 msgstr[2] "%d sekúnd"
 
-#: src/humanize/time.py:137
+#: src/humanize/time.py:151
 msgid "a minute"
 msgstr "minútu"
 
-#: src/humanize/time.py:140
+#: src/humanize/time.py:154
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -196,11 +236,11 @@ msgstr[0] "%d minútu"
 msgstr[1] "%d minúty"
 msgstr[2] "%d minút"
 
-#: src/humanize/time.py:142
+#: src/humanize/time.py:156
 msgid "an hour"
 msgstr "hodinu"
 
-#: src/humanize/time.py:145
+#: src/humanize/time.py:159
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -208,11 +248,11 @@ msgstr[0] "%d hodina"
 msgstr[1] "%d hodiny"
 msgstr[2] "%d hodín"
 
-#: src/humanize/time.py:148
+#: src/humanize/time.py:162
 msgid "a day"
 msgstr "deň"
 
-#: src/humanize/time.py:150 src/humanize/time.py:153
+#: src/humanize/time.py:164 src/humanize/time.py:167
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -220,11 +260,11 @@ msgstr[0] "%d deň"
 msgstr[1] "%d dni"
 msgstr[2] "%d dní"
 
-#: src/humanize/time.py:155
+#: src/humanize/time.py:169
 msgid "a month"
 msgstr "mesiac"
 
-#: src/humanize/time.py:157
+#: src/humanize/time.py:171
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
@@ -232,11 +272,11 @@ msgstr[0] "%d mesiac"
 msgstr[1] "%d mesiace"
 msgstr[2] "%d mesiacov"
 
-#: src/humanize/time.py:160
+#: src/humanize/time.py:174
 msgid "a year"
 msgstr "rok"
 
-#: src/humanize/time.py:162 src/humanize/time.py:171
+#: src/humanize/time.py:176 src/humanize/time.py:185
 #, python-format
 msgid "1 year, %d day"
 msgid_plural "1 year, %d days"
@@ -244,11 +284,11 @@ msgstr[0] "1 rok, %d deň"
 msgstr[1] "1 rok, %d dni"
 msgstr[2] "1 rok, %d dní"
 
-#: src/humanize/time.py:165
+#: src/humanize/time.py:179
 msgid "1 year, 1 month"
 msgstr "1 rok, 1 mesiac"
 
-#: src/humanize/time.py:168
+#: src/humanize/time.py:182
 #, python-format
 msgid "1 year, %d month"
 msgid_plural "1 year, %d months"
@@ -256,7 +296,7 @@ msgstr[0] "1 rok, %d mesiac"
 msgstr[1] "1 rok, %d mesiace"
 msgstr[2] "1 rok, %d mesiacov"
 
-#: src/humanize/time.py:173
+#: src/humanize/time.py:187
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
@@ -264,33 +304,33 @@ msgstr[0] "%d rok"
 msgstr[1] "%d roky"
 msgstr[2] "%d rokov"
 
-#: src/humanize/time.py:201
+#: src/humanize/time.py:217
 #, python-format
 msgid "%s from now"
 msgstr "o %s"
 
-#: src/humanize/time.py:201
+#: src/humanize/time.py:217
 #, python-format
 msgid "%s ago"
 msgstr "%s naspäť"
 
-#: src/humanize/time.py:205
+#: src/humanize/time.py:221
 msgid "now"
 msgstr "teraz"
 
-#: src/humanize/time.py:227
+#: src/humanize/time.py:244
 msgid "today"
 msgstr "dnes"
 
-#: src/humanize/time.py:229
+#: src/humanize/time.py:246
 msgid "tomorrow"
 msgstr "zajtra"
 
-#: src/humanize/time.py:231
+#: src/humanize/time.py:248
 msgid "yesterday"
 msgstr "včera"
 
-#: src/humanize/time.py:498
+#: src/humanize/time.py:534
 #, python-format
 msgid "%s and %s"
 msgstr ""
diff --git a/lib/humanize/locale/tr_TR/LC_MESSAGES/humanize.po b/lib/humanize/locale/tr_TR/LC_MESSAGES/humanize.po
index a3da4da..3533eb1 100644
--- a/lib/humanize/locale/tr_TR/LC_MESSAGES/humanize.po
+++ b/lib/humanize/locale/tr_TR/LC_MESSAGES/humanize.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: humanize\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-29 21:07+0300\n"
+"POT-Creation-Date: 2021-04-30 22:34+0200\n"
 "PO-Revision-Date: 2017-02-23 20:00+0300\n"
 "Last-Translator: Emre Çintay <emre@cintay.com>\n"
 "Language-Team: Turkish\n"
@@ -19,269 +19,297 @@ msgstr ""
 "X-Generator: Poedit 1.8.7.1\n"
 "Generated-By: Emre Çintay\n"
 
-#: src/humanize/number.py:31
+#: src/humanize/number.py:56
 msgctxt "0"
 msgid "th"
 msgstr "."
 
-#: src/humanize/number.py:32
+#: src/humanize/number.py:57
 msgctxt "1"
 msgid "st"
 msgstr "."
 
-#: src/humanize/number.py:33
+#: src/humanize/number.py:58
 msgctxt "2"
 msgid "nd"
 msgstr "."
 
-#: src/humanize/number.py:34
+#: src/humanize/number.py:59
 msgctxt "3"
 msgid "rd"
 msgstr "."
 
-#: src/humanize/number.py:35
+#: src/humanize/number.py:60
 msgctxt "4"
 msgid "th"
 msgstr "."
 
-#: src/humanize/number.py:36
+#: src/humanize/number.py:61
 msgctxt "5"
 msgid "th"
 msgstr "."
 
-#: src/humanize/number.py:37
+#: src/humanize/number.py:62
 msgctxt "6"
 msgid "th"
 msgstr "."
 
-#: src/humanize/number.py:38
+#: src/humanize/number.py:63
 msgctxt "7"
 msgid "th"
 msgstr "."
 
-#: src/humanize/number.py:39
+#: src/humanize/number.py:64
 msgctxt "8"
 msgid "th"
 msgstr "."
 
-#: src/humanize/number.py:40
+#: src/humanize/number.py:65
 msgctxt "9"
 msgid "th"
 msgstr "."
 
-#: src/humanize/number.py:82
+#: src/humanize/number.py:126
+msgid "thousand"
+msgid_plural "thousand"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/humanize/number.py:127
 msgid "million"
-msgstr "milyon"
+msgid_plural "million"
+msgstr[0] "milyon"
+msgstr[1] "milyon"
 
-#: src/humanize/number.py:83
+#: src/humanize/number.py:128
 msgid "billion"
-msgstr "milyar"
+msgid_plural "billion"
+msgstr[0] "milyar"
+msgstr[1] "milyar"
 
-#: src/humanize/number.py:84
+#: src/humanize/number.py:129
 msgid "trillion"
-msgstr "trilyon"
+msgid_plural "trillion"
+msgstr[0] "trilyon"
+msgstr[1] "trilyon"
 
-#: src/humanize/number.py:85
+#: src/humanize/number.py:130
 msgid "quadrillion"
-msgstr "katrilyon"
+msgid_plural "quadrillion"
+msgstr[0] "katrilyon"
+msgstr[1] "katrilyon"
 
-#: src/humanize/number.py:86
+#: src/humanize/number.py:131
 msgid "quintillion"
-msgstr "kentilyon"
+msgid_plural "quintillion"
+msgstr[0] "kentilyon"
+msgstr[1] "kentilyon"
 
-#: src/humanize/number.py:87
+#: src/humanize/number.py:132
 msgid "sextillion"
-msgstr "sekstilyon"
+msgid_plural "sextillion"
+msgstr[0] "sekstilyon"
+msgstr[1] "sekstilyon"
 
-#: src/humanize/number.py:88
+#: src/humanize/number.py:133
 msgid "septillion"
-msgstr "septilyon"
+msgid_plural "septillion"
+msgstr[0] "septilyon"
+msgstr[1] "septilyon"
 
-#: src/humanize/number.py:89
+#: src/humanize/number.py:134
 msgid "octillion"
-msgstr "oktilyon"
+msgid_plural "octillion"
+msgstr[0] "oktilyon"
+msgstr[1] "oktilyon"
 
-#: src/humanize/number.py:90
+#: src/humanize/number.py:135
 msgid "nonillion"
-msgstr "nonilyon"
+msgid_plural "nonillion"
+msgstr[0] "nonilyon"
+msgstr[1] "nonilyon"
 
-#: src/humanize/number.py:91
+#: src/humanize/number.py:136
 msgid "decillion"
-msgstr "desilyon"
+msgid_plural "decillion"
+msgstr[0] "desilyon"
+msgstr[1] "desilyon"
 
-#: src/humanize/number.py:92
+#: src/humanize/number.py:137
 msgid "googol"
-msgstr "googol"
+msgid_plural "googol"
+msgstr[0] "googol"
+msgstr[1] "googol"
 
-#: src/humanize/number.py:147
+#: src/humanize/number.py:228
 msgid "zero"
 msgstr ""
 
-#: src/humanize/number.py:148
+#: src/humanize/number.py:229
 msgid "one"
 msgstr "bir"
 
-#: src/humanize/number.py:149
+#: src/humanize/number.py:230
 msgid "two"
 msgstr "iki"
 
-#: src/humanize/number.py:150
+#: src/humanize/number.py:231
 msgid "three"
 msgstr "üç"
 
-#: src/humanize/number.py:151
+#: src/humanize/number.py:232
 msgid "four"
 msgstr "dört"
 
-#: src/humanize/number.py:152
+#: src/humanize/number.py:233
 msgid "five"
 msgstr "beş"
 
-#: src/humanize/number.py:153
+#: src/humanize/number.py:234
 msgid "six"
 msgstr "altı"
 
-#: src/humanize/number.py:154
+#: src/humanize/number.py:235
 msgid "seven"
 msgstr "yedi"
 
-#: src/humanize/number.py:155
+#: src/humanize/number.py:236
 msgid "eight"
 msgstr "sekiz"
 
-#: src/humanize/number.py:156
+#: src/humanize/number.py:237
 msgid "nine"
 msgstr "dokuz"
 
-#: src/humanize/time.py:119
-#, fuzzy, python-format
+#: src/humanize/time.py:133
+#, python-format
 msgid "%d microsecond"
 msgid_plural "%d microseconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/humanize/time.py:128
-#, fuzzy, python-format
+#: src/humanize/time.py:142
+#, python-format
 msgid "%d millisecond"
 msgid_plural "%d milliseconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/humanize/time.py:131 src/humanize/time.py:204
+#: src/humanize/time.py:145 src/humanize/time.py:220
 msgid "a moment"
 msgstr "biraz"
 
-#: src/humanize/time.py:133
+#: src/humanize/time.py:147
 msgid "a second"
 msgstr "bir saniye"
 
-#: src/humanize/time.py:135
+#: src/humanize/time.py:149
 #, python-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d saniye"
 msgstr[1] "%d saniye"
 
-#: src/humanize/time.py:137
+#: src/humanize/time.py:151
 msgid "a minute"
 msgstr "bir dakika"
 
-#: src/humanize/time.py:140
+#: src/humanize/time.py:154
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d dakika"
 msgstr[1] "%d dakika"
 
-#: src/humanize/time.py:142
+#: src/humanize/time.py:156
 msgid "an hour"
 msgstr "bir saat"
 
-#: src/humanize/time.py:145
+#: src/humanize/time.py:159
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d saat"
 msgstr[1] "%d saat"
 
-#: src/humanize/time.py:148
+#: src/humanize/time.py:162
 msgid "a day"
 msgstr "bir gün"
 
-#: src/humanize/time.py:150 src/humanize/time.py:153
+#: src/humanize/time.py:164 src/humanize/time.py:167
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d gün"
 msgstr[1] "%d gün"
 
-#: src/humanize/time.py:155
+#: src/humanize/time.py:169
 msgid "a month"
 msgstr "bir ay"
 
-#: src/humanize/time.py:157
+#: src/humanize/time.py:171
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
 msgstr[0] "%d ay"
 msgstr[1] "%d ay"
 
-#: src/humanize/time.py:160
+#: src/humanize/time.py:174
 msgid "a year"
 msgstr "bir yıl"
 
-#: src/humanize/time.py:162 src/humanize/time.py:171
+#: src/humanize/time.py:176 src/humanize/time.py:185
 #, python-format
 msgid "1 year, %d day"
 msgid_plural "1 year, %d days"
 msgstr[0] "1 yıl, %d gün"
 msgstr[1] "1 yıl, %d gün"
 
-#: src/humanize/time.py:165
+#: src/humanize/time.py:179
 msgid "1 year, 1 month"
 msgstr "1 yıl, 1 ay"
 
-#: src/humanize/time.py:168
+#: src/humanize/time.py:182
 #, python-format
 msgid "1 year, %d month"
 msgid_plural "1 year, %d months"
 msgstr[0] "1 yıl, %d ay"
 msgstr[1] "1 yıl, %d ay"
 
-#: src/humanize/time.py:173
+#: src/humanize/time.py:187
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
 msgstr[0] "%d yıl"
 msgstr[1] "%d yıl"
 
-#: src/humanize/time.py:201
+#: src/humanize/time.py:217
 #, python-format
 msgid "%s from now"
 msgstr "şu andan itibaren %s"
 
-#: src/humanize/time.py:201
+#: src/humanize/time.py:217
 #, python-format
 msgid "%s ago"
 msgstr "%s önce"
 
-#: src/humanize/time.py:205
+#: src/humanize/time.py:221
 msgid "now"
 msgstr "şimdi"
 
-#: src/humanize/time.py:227
+#: src/humanize/time.py:244
 msgid "today"
 msgstr "bugün"
 
-#: src/humanize/time.py:229
+#: src/humanize/time.py:246
 msgid "tomorrow"
 msgstr "yarın"
 
-#: src/humanize/time.py:231
+#: src/humanize/time.py:248
 msgid "yesterday"
 msgstr "dün"
 
-#: src/humanize/time.py:498
+#: src/humanize/time.py:534
 #, python-format
 msgid "%s and %s"
 msgstr ""
diff --git a/lib/humanize/locale/uk_UA/LC_MESSAGES/humanize.po b/lib/humanize/locale/uk_UA/LC_MESSAGES/humanize.po
index c4d1d98..527f113 100644
--- a/lib/humanize/locale/uk_UA/LC_MESSAGES/humanize.po
+++ b/lib/humanize/locale/uk_UA/LC_MESSAGES/humanize.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-29 21:07+0300\n"
+"POT-Creation-Date: 2021-04-30 22:34+0200\n"
 "PO-Revision-Date: \n"
 "Last-Translator: TL\n"
 "Language-Team: uk_UA\n"
@@ -15,141 +15,181 @@ msgstr ""
 "Generated-By:\n"
 "X-Generator: \n"
 
-#: src/humanize/number.py:31
+#: src/humanize/number.py:56
 msgctxt "0"
 msgid "th"
 msgstr "ий"
 
-#: src/humanize/number.py:32
+#: src/humanize/number.py:57
 msgctxt "1"
 msgid "st"
 msgstr "ий"
 
-#: src/humanize/number.py:33
+#: src/humanize/number.py:58
 msgctxt "2"
 msgid "nd"
 msgstr "ий"
 
-#: src/humanize/number.py:34
+#: src/humanize/number.py:59
 msgctxt "3"
 msgid "rd"
 msgstr "ій"
 
-#: src/humanize/number.py:35
+#: src/humanize/number.py:60
 msgctxt "4"
 msgid "th"
 msgstr "ий"
 
-#: src/humanize/number.py:36
+#: src/humanize/number.py:61
 msgctxt "5"
 msgid "th"
 msgstr "ий"
 
-#: src/humanize/number.py:37
+#: src/humanize/number.py:62
 msgctxt "6"
 msgid "th"
 msgstr "ий"
 
-#: src/humanize/number.py:38
+#: src/humanize/number.py:63
 msgctxt "7"
 msgid "th"
 msgstr "ий"
 
-#: src/humanize/number.py:39
+#: src/humanize/number.py:64
 msgctxt "8"
 msgid "th"
 msgstr "ий"
 
-#: src/humanize/number.py:40
+#: src/humanize/number.py:65
 msgctxt "9"
 msgid "th"
 msgstr "ий"
 
-#: src/humanize/number.py:82
+#: src/humanize/number.py:126
+msgid "thousand"
+msgid_plural "thousand"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: src/humanize/number.py:127
 msgid "million"
-msgstr "мільйонів"
+msgid_plural "million"
+msgstr[0] "мільйонів"
+msgstr[1] "мільйонів"
+msgstr[2] "мільйонів"
 
-#: src/humanize/number.py:83
+#: src/humanize/number.py:128
 msgid "billion"
-msgstr "мільярдів"
+msgid_plural "billion"
+msgstr[0] "мільярдів"
+msgstr[1] "мільярдів"
+msgstr[2] "мільярдів"
 
-#: src/humanize/number.py:84
+#: src/humanize/number.py:129
 msgid "trillion"
-msgstr "трильйонів"
+msgid_plural "trillion"
+msgstr[0] "трильйонів"
+msgstr[1] "трильйонів"
+msgstr[2] "трильйонів"
 
-#: src/humanize/number.py:85
+#: src/humanize/number.py:130
 msgid "quadrillion"
-msgstr "квадрильйонів"
+msgid_plural "quadrillion"
+msgstr[0] "квадрильйонів"
+msgstr[1] "квадрильйонів"
+msgstr[2] "квадрильйонів"
 
-#: src/humanize/number.py:86
+#: src/humanize/number.py:131
 msgid "quintillion"
-msgstr "квинтиліонів"
+msgid_plural "quintillion"
+msgstr[0] "квинтиліонів"
+msgstr[1] "квинтиліонів"
+msgstr[2] "квинтиліонів"
 
-#: src/humanize/number.py:87
+#: src/humanize/number.py:132
 msgid "sextillion"
-msgstr "сикстильйонів"
+msgid_plural "sextillion"
+msgstr[0] "сикстильйонів"
+msgstr[1] "сикстильйонів"
+msgstr[2] "сикстильйонів"
 
-#: src/humanize/number.py:88
+#: src/humanize/number.py:133
 msgid "septillion"
-msgstr "септильйонів"
+msgid_plural "septillion"
+msgstr[0] "септильйонів"
+msgstr[1] "септильйонів"
+msgstr[2] "септильйонів"
 
-#: src/humanize/number.py:89
+#: src/humanize/number.py:134
 msgid "octillion"
-msgstr "октильйонів"
+msgid_plural "octillion"
+msgstr[0] "октильйонів"
+msgstr[1] "октильйонів"
+msgstr[2] "октильйонів"
 
-#: src/humanize/number.py:90
+#: src/humanize/number.py:135
 msgid "nonillion"
-msgstr "нонильйонів"
+msgid_plural "nonillion"
+msgstr[0] "нонильйонів"
+msgstr[1] "нонильйонів"
+msgstr[2] "нонильйонів"
 
-#: src/humanize/number.py:91
+#: src/humanize/number.py:136
 msgid "decillion"
-msgstr "децильйонів"
+msgid_plural "decillion"
+msgstr[0] "децильйонів"
+msgstr[1] "децильйонів"
+msgstr[2] "децильйонів"
 
-#: src/humanize/number.py:92
+#: src/humanize/number.py:137
 msgid "googol"
-msgstr "гугола"
+msgid_plural "googol"
+msgstr[0] "гугола"
+msgstr[1] "гугола"
+msgstr[2] "гугола"
 
-#: src/humanize/number.py:147
+#: src/humanize/number.py:228
 msgid "zero"
 msgstr "нуль"
 
-#: src/humanize/number.py:148
+#: src/humanize/number.py:229
 msgid "one"
 msgstr "один"
 
-#: src/humanize/number.py:149
+#: src/humanize/number.py:230
 msgid "two"
 msgstr "два"
 
-#: src/humanize/number.py:150
+#: src/humanize/number.py:231
 msgid "three"
 msgstr "три"
 
-#: src/humanize/number.py:151
+#: src/humanize/number.py:232
 msgid "four"
 msgstr "чотири"
 
-#: src/humanize/number.py:152
+#: src/humanize/number.py:233
 msgid "five"
 msgstr "п'ять"
 
-#: src/humanize/number.py:153
+#: src/humanize/number.py:234
 msgid "six"
 msgstr "шість"
 
-#: src/humanize/number.py:154
+#: src/humanize/number.py:235
 msgid "seven"
 msgstr "сім"
 
-#: src/humanize/number.py:155
+#: src/humanize/number.py:236
 msgid "eight"
 msgstr "вісім"
 
-#: src/humanize/number.py:156
+#: src/humanize/number.py:237
 msgid "nine"
 msgstr "дев'ять"
 
-#: src/humanize/time.py:119
+#: src/humanize/time.py:133
 #, fuzzy, python-format
 msgid "%d microsecond"
 msgid_plural "%d microseconds"
@@ -157,7 +197,7 @@ msgstr[0] "%d мікросекунда"
 msgstr[1] "%d мікросекунд"
 msgstr[2] "%d мікросекунди"
 
-#: src/humanize/time.py:128
+#: src/humanize/time.py:142
 #, fuzzy, python-format
 msgid "%d millisecond"
 msgid_plural "%d milliseconds"
@@ -165,15 +205,15 @@ msgstr[0] "%d мілісекунда"
 msgstr[1] "%d мілісекунди"
 msgstr[2] "%d мілісекунди"
 
-#: src/humanize/time.py:131 src/humanize/time.py:204
+#: src/humanize/time.py:145 src/humanize/time.py:220
 msgid "a moment"
 msgstr "у цей момент"
 
-#: src/humanize/time.py:133
+#: src/humanize/time.py:147
 msgid "a second"
 msgstr "секунду"
 
-#: src/humanize/time.py:135
+#: src/humanize/time.py:149
 #, python-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -181,11 +221,11 @@ msgstr[0] "%d секунда"
 msgstr[1] "%d секунд"
 msgstr[2] "%d секунд"
 
-#: src/humanize/time.py:137
+#: src/humanize/time.py:151
 msgid "a minute"
 msgstr "хвилина"
 
-#: src/humanize/time.py:140
+#: src/humanize/time.py:154
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -193,11 +233,11 @@ msgstr[0] "%d хвилина"
 msgstr[1] "%d хвилини"
 msgstr[2] "%d хвилин"
 
-#: src/humanize/time.py:142
+#: src/humanize/time.py:156
 msgid "an hour"
 msgstr "година"
 
-#: src/humanize/time.py:145
+#: src/humanize/time.py:159
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -205,11 +245,11 @@ msgstr[0] "%d година"
 msgstr[1] "%d годин"
 msgstr[2] "%d годин"
 
-#: src/humanize/time.py:148
+#: src/humanize/time.py:162
 msgid "a day"
 msgstr "день"
 
-#: src/humanize/time.py:150 src/humanize/time.py:153
+#: src/humanize/time.py:164 src/humanize/time.py:167
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -217,11 +257,11 @@ msgstr[0] "%d день"
 msgstr[1] "%d дня"
 msgstr[2] "%d дні"
 
-#: src/humanize/time.py:155
+#: src/humanize/time.py:169
 msgid "a month"
 msgstr "місяць"
 
-#: src/humanize/time.py:157
+#: src/humanize/time.py:171
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
@@ -229,11 +269,11 @@ msgstr[0] "%d місяць"
 msgstr[1] "%d місяця"
 msgstr[2] "%d місяців"
 
-#: src/humanize/time.py:160
+#: src/humanize/time.py:174
 msgid "a year"
 msgstr "рік"
 
-#: src/humanize/time.py:162 src/humanize/time.py:171
+#: src/humanize/time.py:176 src/humanize/time.py:185
 #, python-format
 msgid "1 year, %d day"
 msgid_plural "1 year, %d days"
@@ -241,11 +281,11 @@ msgstr[0] "1 рік, %d день"
 msgstr[1] "1 рік, %d дня"
 msgstr[2] "1 рік, %d днів"
 
-#: src/humanize/time.py:165
+#: src/humanize/time.py:179
 msgid "1 year, 1 month"
 msgstr "1 рік, 1 місяць"
 
-#: src/humanize/time.py:168
+#: src/humanize/time.py:182
 #, python-format
 msgid "1 year, %d month"
 msgid_plural "1 year, %d months"
@@ -253,7 +293,7 @@ msgstr[0] "1 рік, %d місяць"
 msgstr[1] "1 рік, %d місяця"
 msgstr[2] "1 рік, %d місяців"
 
-#: src/humanize/time.py:173
+#: src/humanize/time.py:187
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
@@ -261,33 +301,33 @@ msgstr[0] "%d рік"
 msgstr[1] "%d роки"
 msgstr[2] "%d років"
 
-#: src/humanize/time.py:201
+#: src/humanize/time.py:217
 #, python-format
 msgid "%s from now"
 msgstr "через %s"
 
-#: src/humanize/time.py:201
+#: src/humanize/time.py:217
 #, python-format
 msgid "%s ago"
 msgstr "%s назад"
 
-#: src/humanize/time.py:205
+#: src/humanize/time.py:221
 msgid "now"
 msgstr "зараз"
 
-#: src/humanize/time.py:227
+#: src/humanize/time.py:244
 msgid "today"
 msgstr "сьогодні"
 
-#: src/humanize/time.py:229
+#: src/humanize/time.py:246
 msgid "tomorrow"
 msgstr "завтра"
 
-#: src/humanize/time.py:231
+#: src/humanize/time.py:248
 msgid "yesterday"
 msgstr "вчора"
 
-#: src/humanize/time.py:498
+#: src/humanize/time.py:534
 #, python-format
 msgid "%s and %s"
 msgstr ""
diff --git a/lib/humanize/locale/vi_VI/LC_MESSAGES/humanize.po b/lib/humanize/locale/vi_VI/LC_MESSAGES/humanize.po
index cb403bd..839e0bf 100644
--- a/lib/humanize/locale/vi_VI/LC_MESSAGES/humanize.po
+++ b/lib/humanize/locale/vi_VI/LC_MESSAGES/humanize.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-29 21:07+0300\n"
+"POT-Creation-Date: 2021-04-30 22:34+0200\n"
 "PO-Revision-Date: 2017-05-30 11:51+0700\n"
 "Last-Translator: Olivier Cortès <oc@1flow.io>\n"
 "Language-Team: vi_VI <sapd@vccloud.vn>\n"
@@ -19,276 +19,304 @@ msgstr ""
 "Generated-By: Babel 0.9.6\n"
 "X-Generator: Poedit 1.8.7.1\n"
 
-#: src/humanize/number.py:31
+#: src/humanize/number.py:56
 msgctxt "0"
 msgid "th"
 msgstr "."
 
-#: src/humanize/number.py:32
+#: src/humanize/number.py:57
 msgctxt "1"
 msgid "st"
 msgstr "."
 
-#: src/humanize/number.py:33
+#: src/humanize/number.py:58
 msgctxt "2"
 msgid "nd"
 msgstr "."
 
-#: src/humanize/number.py:34
+#: src/humanize/number.py:59
 msgctxt "3"
 msgid "rd"
 msgstr "."
 
-#: src/humanize/number.py:35
+#: src/humanize/number.py:60
 msgctxt "4"
 msgid "th"
 msgstr "."
 
-#: src/humanize/number.py:36
+#: src/humanize/number.py:61
 msgctxt "5"
 msgid "th"
 msgstr "."
 
-#: src/humanize/number.py:37
+#: src/humanize/number.py:62
 msgctxt "6"
 msgid "th"
 msgstr "."
 
-#: src/humanize/number.py:38
+#: src/humanize/number.py:63
 msgctxt "7"
 msgid "th"
 msgstr "."
 
-#: src/humanize/number.py:39
+#: src/humanize/number.py:64
 msgctxt "8"
 msgid "th"
 msgstr "."
 
-#: src/humanize/number.py:40
+#: src/humanize/number.py:65
 msgctxt "9"
 msgid "th"
 msgstr "."
 
-#: src/humanize/number.py:82
+#: src/humanize/number.py:126
+msgid "thousand"
+msgid_plural "thousand"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/humanize/number.py:127
 msgid "million"
-msgstr "%(value)s triệu"
+msgid_plural "million"
+msgstr[0] "%(value)s triệu"
+msgstr[1] "%(value)s triệu"
 
-#: src/humanize/number.py:83
+#: src/humanize/number.py:128
 msgid "billion"
-msgstr "tỷ"
+msgid_plural "billion"
+msgstr[0] "tỷ"
+msgstr[1] "tỷ"
 
-#: src/humanize/number.py:84
+#: src/humanize/number.py:129
 msgid "trillion"
-msgstr "%(value)s nghìn tỷ"
+msgid_plural "trillion"
+msgstr[0] "%(value)s nghìn tỷ"
+msgstr[1] "%(value)s nghìn tỷ"
 
-#: src/humanize/number.py:85
+#: src/humanize/number.py:130
 msgid "quadrillion"
-msgstr "%(value)s triệu tỷ"
+msgid_plural "quadrillion"
+msgstr[0] "%(value)s triệu tỷ"
+msgstr[1] "%(value)s triệu tỷ"
 
-#: src/humanize/number.py:86
+#: src/humanize/number.py:131
 #, fuzzy
 msgid "quintillion"
-msgstr "%(value)s quintillion"
+msgid_plural "quintillion"
+msgstr[0] "%(value)s quintillion"
+msgstr[1] "%(value)s quintillion"
 
-#: src/humanize/number.py:87
+#: src/humanize/number.py:132
 #, fuzzy
 msgid "sextillion"
-msgstr "%(value)s sextillion"
+msgid_plural "sextillion"
+msgstr[0] "%(value)s sextillion"
+msgstr[1] "%(value)s sextillion"
 
-#: src/humanize/number.py:88
+#: src/humanize/number.py:133
 #, fuzzy
 msgid "septillion"
-msgstr "%(value)s septillion"
+msgid_plural "septillion"
+msgstr[0] "%(value)s septillion"
+msgstr[1] "%(value)s septillion"
 
-#: src/humanize/number.py:89
+#: src/humanize/number.py:134
 #, fuzzy
 msgid "octillion"
-msgstr "%(value)s octillion"
+msgid_plural "octillion"
+msgstr[0] "%(value)s octillion"
+msgstr[1] "%(value)s octillion"
 
-#: src/humanize/number.py:90
+#: src/humanize/number.py:135
 #, fuzzy
 msgid "nonillion"
-msgstr "%(value)s nonillion"
+msgid_plural "nonillion"
+msgstr[0] "%(value)s nonillion"
+msgstr[1] "%(value)s nonillion"
 
-#: src/humanize/number.py:91
+#: src/humanize/number.py:136
 #, fuzzy
 msgid "decillion"
-msgstr "%(value)s décillion"
+msgid_plural "decillion"
+msgstr[0] "%(value)s décillion"
+msgstr[1] "%(value)s décillion"
 
-#: src/humanize/number.py:92
+#: src/humanize/number.py:137
 #, fuzzy
 msgid "googol"
-msgstr "%(value)s gogol"
+msgid_plural "googol"
+msgstr[0] "%(value)s gogol"
+msgstr[1] "%(value)s gogol"
 
-#: src/humanize/number.py:147
+#: src/humanize/number.py:228
 msgid "zero"
 msgstr ""
 
-#: src/humanize/number.py:148
+#: src/humanize/number.py:229
 msgid "one"
 msgstr "một"
 
-#: src/humanize/number.py:149
+#: src/humanize/number.py:230
 msgid "two"
 msgstr "hai"
 
-#: src/humanize/number.py:150
+#: src/humanize/number.py:231
 msgid "three"
 msgstr "ba"
 
-#: src/humanize/number.py:151
+#: src/humanize/number.py:232
 msgid "four"
 msgstr "bốn"
 
-#: src/humanize/number.py:152
+#: src/humanize/number.py:233
 msgid "five"
 msgstr "năm"
 
-#: src/humanize/number.py:153
+#: src/humanize/number.py:234
 msgid "six"
 msgstr "sáu"
 
-#: src/humanize/number.py:154
+#: src/humanize/number.py:235
 msgid "seven"
 msgstr "bảy"
 
-#: src/humanize/number.py:155
+#: src/humanize/number.py:236
 msgid "eight"
 msgstr "tám"
 
-#: src/humanize/number.py:156
+#: src/humanize/number.py:237
 msgid "nine"
 msgstr "chín"
 
-#: src/humanize/time.py:119
-#, fuzzy, python-format
+#: src/humanize/time.py:133
+#, python-format
 msgid "%d microsecond"
 msgid_plural "%d microseconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/humanize/time.py:128
-#, fuzzy, python-format
+#: src/humanize/time.py:142
+#, python-format
 msgid "%d millisecond"
 msgid_plural "%d milliseconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/humanize/time.py:131 src/humanize/time.py:204
+#: src/humanize/time.py:145 src/humanize/time.py:220
 msgid "a moment"
 msgstr "ngay lúc này"
 
-#: src/humanize/time.py:133
+#: src/humanize/time.py:147
 msgid "a second"
 msgstr "một giây"
 
-#: src/humanize/time.py:135
+#: src/humanize/time.py:149
 #, python-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d giây"
 msgstr[1] "%d giây"
 
-#: src/humanize/time.py:137
+#: src/humanize/time.py:151
 msgid "a minute"
 msgstr "một phút"
 
-#: src/humanize/time.py:140
+#: src/humanize/time.py:154
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d phút"
 msgstr[1] "%d phút"
 
-#: src/humanize/time.py:142
+#: src/humanize/time.py:156
 msgid "an hour"
 msgstr "một giờ"
 
-#: src/humanize/time.py:145
+#: src/humanize/time.py:159
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d giờ"
 msgstr[1] "%d giờ"
 
-#: src/humanize/time.py:148
+#: src/humanize/time.py:162
 msgid "a day"
 msgstr "một ngày"
 
-#: src/humanize/time.py:150 src/humanize/time.py:153
+#: src/humanize/time.py:164 src/humanize/time.py:167
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d ngày"
 msgstr[1] "%d ngày"
 
-#: src/humanize/time.py:155
+#: src/humanize/time.py:169
 msgid "a month"
 msgstr "một tháng"
 
-#: src/humanize/time.py:157
+#: src/humanize/time.py:171
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
 msgstr[0] "%d tháng"
 msgstr[1] "%d tháng"
 
-#: src/humanize/time.py:160
+#: src/humanize/time.py:174
 msgid "a year"
 msgstr "một năm"
 
-#: src/humanize/time.py:162 src/humanize/time.py:171
+#: src/humanize/time.py:176 src/humanize/time.py:185
 #, python-format
 msgid "1 year, %d day"
 msgid_plural "1 year, %d days"
 msgstr[0] "1 năm %d ngày"
 msgstr[1] "1 năm %d ngày"
 
-#: src/humanize/time.py:165
+#: src/humanize/time.py:179
 msgid "1 year, 1 month"
 msgstr "1 năm 1 tháng"
 
-#: src/humanize/time.py:168
+#: src/humanize/time.py:182
 #, python-format
 msgid "1 year, %d month"
 msgid_plural "1 year, %d months"
 msgstr[0] "1 năm %d tháng"
 msgstr[1] "un an et %d mois"
 
-#: src/humanize/time.py:173
+#: src/humanize/time.py:187
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
 msgstr[0] "%d năm"
 msgstr[1] "%d năm"
 
-#: src/humanize/time.py:201
+#: src/humanize/time.py:217
 #, python-format
 msgid "%s from now"
 msgstr "%s ngày tới"
 
-#: src/humanize/time.py:201
+#: src/humanize/time.py:217
 #, python-format
 msgid "%s ago"
 msgstr "%s trước"
 
-#: src/humanize/time.py:205
+#: src/humanize/time.py:221
 msgid "now"
 msgstr "ngay bây giờ"
 
-#: src/humanize/time.py:227
+#: src/humanize/time.py:244
 msgid "today"
 msgstr "hôm nay"
 
-#: src/humanize/time.py:229
+#: src/humanize/time.py:246
 msgid "tomorrow"
 msgstr "ngày mai"
 
-#: src/humanize/time.py:231
+#: src/humanize/time.py:248
 msgid "yesterday"
 msgstr "ngày hôm qua"
 
-#: src/humanize/time.py:498
+#: src/humanize/time.py:534
 #, python-format
 msgid "%s and %s"
 msgstr ""
diff --git a/lib/humanize/locale/zh_CN/LC_MESSAGES/humanize.po b/lib/humanize/locale/zh_CN/LC_MESSAGES/humanize.po
index 5433598..404f8f7 100644
--- a/lib/humanize/locale/zh_CN/LC_MESSAGES/humanize.po
+++ b/lib/humanize/locale/zh_CN/LC_MESSAGES/humanize.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-29 21:07+0300\n"
+"POT-Creation-Date: 2021-04-30 22:34+0200\n"
 "PO-Revision-Date: 2016-11-14 23:02+0000\n"
 "Last-Translator: Liwen SUN <sunliwen@gmail.com>\n"
 "Language-Team: Chinese (simplified)\n"
@@ -18,269 +18,297 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/humanize/number.py:31
+#: src/humanize/number.py:56
 msgctxt "0"
 msgid "th"
 msgstr "第"
 
-#: src/humanize/number.py:32
+#: src/humanize/number.py:57
 msgctxt "1"
 msgid "st"
 msgstr "第"
 
-#: src/humanize/number.py:33
+#: src/humanize/number.py:58
 msgctxt "2"
 msgid "nd"
 msgstr "第"
 
-#: src/humanize/number.py:34
+#: src/humanize/number.py:59
 msgctxt "3"
 msgid "rd"
 msgstr "第"
 
-#: src/humanize/number.py:35
+#: src/humanize/number.py:60
 msgctxt "4"
 msgid "th"
 msgstr "第"
 
-#: src/humanize/number.py:36
+#: src/humanize/number.py:61
 msgctxt "5"
 msgid "th"
 msgstr "第"
 
-#: src/humanize/number.py:37
+#: src/humanize/number.py:62
 msgctxt "6"
 msgid "th"
 msgstr "第"
 
-#: src/humanize/number.py:38
+#: src/humanize/number.py:63
 msgctxt "7"
 msgid "th"
 msgstr "第"
 
-#: src/humanize/number.py:39
+#: src/humanize/number.py:64
 msgctxt "8"
 msgid "th"
 msgstr "第"
 
-#: src/humanize/number.py:40
+#: src/humanize/number.py:65
 msgctxt "9"
 msgid "th"
 msgstr "第"
 
-#: src/humanize/number.py:82
+#: src/humanize/number.py:126
+msgid "thousand"
+msgid_plural "thousand"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/humanize/number.py:127
 msgid "million"
-msgstr "百万"
+msgid_plural "million"
+msgstr[0] "百万"
+msgstr[1] "百万"
 
-#: src/humanize/number.py:83
+#: src/humanize/number.py:128
 msgid "billion"
-msgstr "十亿"
+msgid_plural "billion"
+msgstr[0] "十亿"
+msgstr[1] "十亿"
 
-#: src/humanize/number.py:84
+#: src/humanize/number.py:129
 msgid "trillion"
-msgstr "兆"
+msgid_plural "trillion"
+msgstr[0] "兆"
+msgstr[1] "兆"
 
-#: src/humanize/number.py:85
+#: src/humanize/number.py:130
 msgid "quadrillion"
-msgstr "万亿"
+msgid_plural "quadrillion"
+msgstr[0] "万亿"
+msgstr[1] "万亿"
 
-#: src/humanize/number.py:86
+#: src/humanize/number.py:131
 msgid "quintillion"
-msgstr "百京"
+msgid_plural "quintillion"
+msgstr[0] "百京"
+msgstr[1] "百京"
 
-#: src/humanize/number.py:87
+#: src/humanize/number.py:132
 msgid "sextillion"
-msgstr "十垓"
+msgid_plural "sextillion"
+msgstr[0] "十垓"
+msgstr[1] "十垓"
 
-#: src/humanize/number.py:88
+#: src/humanize/number.py:133
 msgid "septillion"
-msgstr "秭"
+msgid_plural "septillion"
+msgstr[0] "秭"
+msgstr[1] "秭"
 
-#: src/humanize/number.py:89
+#: src/humanize/number.py:134
 msgid "octillion"
-msgstr "千秭"
+msgid_plural "octillion"
+msgstr[0] "千秭"
+msgstr[1] "千秭"
 
-#: src/humanize/number.py:90
+#: src/humanize/number.py:135
 msgid "nonillion"
-msgstr "百穰"
+msgid_plural "nonillion"
+msgstr[0] "百穰"
+msgstr[1] "百穰"
 
-#: src/humanize/number.py:91
+#: src/humanize/number.py:136
 msgid "decillion"
-msgstr "十沟"
+msgid_plural "decillion"
+msgstr[0] "十沟"
+msgstr[1] "十沟"
 
-#: src/humanize/number.py:92
+#: src/humanize/number.py:137
 msgid "googol"
-msgstr "古高尔"
+msgid_plural "googol"
+msgstr[0] "古高尔"
+msgstr[1] "古高尔"
 
-#: src/humanize/number.py:147
+#: src/humanize/number.py:228
 msgid "zero"
 msgstr ""
 
-#: src/humanize/number.py:148
+#: src/humanize/number.py:229
 msgid "one"
 msgstr "一"
 
-#: src/humanize/number.py:149
+#: src/humanize/number.py:230
 msgid "two"
 msgstr "二"
 
-#: src/humanize/number.py:150
+#: src/humanize/number.py:231
 msgid "three"
 msgstr "三"
 
-#: src/humanize/number.py:151
+#: src/humanize/number.py:232
 msgid "four"
 msgstr "四"
 
-#: src/humanize/number.py:152
+#: src/humanize/number.py:233
 msgid "five"
 msgstr "五"
 
-#: src/humanize/number.py:153
+#: src/humanize/number.py:234
 msgid "six"
 msgstr "六"
 
-#: src/humanize/number.py:154
+#: src/humanize/number.py:235
 msgid "seven"
 msgstr "七"
 
-#: src/humanize/number.py:155
+#: src/humanize/number.py:236
 msgid "eight"
 msgstr "八"
 
-#: src/humanize/number.py:156
+#: src/humanize/number.py:237
 msgid "nine"
 msgstr "九"
 
-#: src/humanize/time.py:119
-#, fuzzy, python-format
+#: src/humanize/time.py:133
+#, python-format
 msgid "%d microsecond"
 msgid_plural "%d microseconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/humanize/time.py:128
-#, fuzzy, python-format
+#: src/humanize/time.py:142
+#, python-format
 msgid "%d millisecond"
 msgid_plural "%d milliseconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/humanize/time.py:131 src/humanize/time.py:204
+#: src/humanize/time.py:145 src/humanize/time.py:220
 msgid "a moment"
 msgstr "一会儿"
 
-#: src/humanize/time.py:133
+#: src/humanize/time.py:147
 msgid "a second"
 msgstr "1秒"
 
-#: src/humanize/time.py:135
+#: src/humanize/time.py:149
 #, python-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d秒"
 msgstr[1] "%d秒"
 
-#: src/humanize/time.py:137
+#: src/humanize/time.py:151
 msgid "a minute"
 msgstr "1分"
 
-#: src/humanize/time.py:140
+#: src/humanize/time.py:154
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d分"
 msgstr[1] "%d分"
 
-#: src/humanize/time.py:142
+#: src/humanize/time.py:156
 msgid "an hour"
 msgstr "1小时"
 
-#: src/humanize/time.py:145
+#: src/humanize/time.py:159
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d小时"
 msgstr[1] "%d小时"
 
-#: src/humanize/time.py:148
+#: src/humanize/time.py:162
 msgid "a day"
 msgstr "1天"
 
-#: src/humanize/time.py:150 src/humanize/time.py:153
+#: src/humanize/time.py:164 src/humanize/time.py:167
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d天"
 msgstr[1] "%d天"
 
-#: src/humanize/time.py:155
+#: src/humanize/time.py:169
 msgid "a month"
 msgstr "1月"
 
-#: src/humanize/time.py:157
+#: src/humanize/time.py:171
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
 msgstr[0] "%d月"
 msgstr[1] "%d月"
 
-#: src/humanize/time.py:160
+#: src/humanize/time.py:174
 msgid "a year"
 msgstr "1年"
 
-#: src/humanize/time.py:162 src/humanize/time.py:171
+#: src/humanize/time.py:176 src/humanize/time.py:185
 #, python-format
 msgid "1 year, %d day"
 msgid_plural "1 year, %d days"
 msgstr[0] "%d年"
 msgstr[1] "%d年"
 
-#: src/humanize/time.py:165
+#: src/humanize/time.py:179
 msgid "1 year, 1 month"
 msgstr "1年又1月"
 
-#: src/humanize/time.py:168
+#: src/humanize/time.py:182
 #, python-format
 msgid "1 year, %d month"
 msgid_plural "1 year, %d months"
 msgstr[0] "1年又%d月"
 msgstr[1] "1年又%d月"
 
-#: src/humanize/time.py:173
+#: src/humanize/time.py:187
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
 msgstr[0] "%d年"
 msgstr[1] "%d年"
 
-#: src/humanize/time.py:201
+#: src/humanize/time.py:217
 #, python-format
 msgid "%s from now"
 msgstr "%s之后"
 
-#: src/humanize/time.py:201
+#: src/humanize/time.py:217
 #, python-format
 msgid "%s ago"
 msgstr "%s之前"
 
-#: src/humanize/time.py:205
+#: src/humanize/time.py:221
 msgid "now"
 msgstr "现在"
 
-#: src/humanize/time.py:227
+#: src/humanize/time.py:244
 msgid "today"
 msgstr "今天"
 
-#: src/humanize/time.py:229
+#: src/humanize/time.py:246
 msgid "tomorrow"
 msgstr "明天"
 
-#: src/humanize/time.py:231
+#: src/humanize/time.py:248
 msgid "yesterday"
 msgstr "昨天"
 
-#: src/humanize/time.py:498
+#: src/humanize/time.py:534
 #, python-format
 msgid "%s and %s"
 msgstr ""
diff --git a/lib/humanize/number.py b/lib/humanize/number.py
index b9854cd..9246474 100644
--- a/lib/humanize/number.py
+++ b/lib/humanize/number.py
@@ -3,13 +3,16 @@
 
 """Humanizing functions for numbers."""
 
+import math
 import re
 from fractions import Fraction
 
 from . import compat
 from .i18n import gettext as _
-from .i18n import gettext_noop as N_
+from .i18n import ngettext
+from .i18n import ngettext_noop as NS_
 from .i18n import pgettext as P_
+from .i18n import thousands_separator
 
 
 def ordinal(value):
@@ -75,7 +78,7 @@ def intcomma(value, ndigits=None):
     compatibility with Django's `intcomma`, this function also accepts floats.
 
     Examples:
-        ``pycon
+        ```pycon
         >>> intcomma(100)
         '100'
         >>> intcomma("1000")
@@ -99,9 +102,10 @@ def intcomma(value, ndigits=None):
     Returns:
         str: string containing commas every three digits.
     """
+    sep = thousands_separator()
     try:
         if isinstance(value, compat.string_types):
-            float(value.replace(",", ""))
+            float(value.replace(sep, ""))
         else:
             float(value)
     except (TypeError, ValueError):
@@ -112,26 +116,27 @@ def intcomma(value, ndigits=None):
     else:
         orig = str(value)
 
-    new = re.sub(r"^(-?\d+)(\d{3})", r"\g<1>,\g<2>", orig)
+    new = re.sub(r"^(-?\d+)(\d{3})", r"\g<1>%s\g<2>" % sep, orig)
     if orig == new:
         return new
     else:
         return intcomma(new)
 
 
-powers = [10 ** x for x in (6, 9, 12, 15, 18, 21, 24, 27, 30, 33, 100)]
+powers = [10 ** x for x in (3, 6, 9, 12, 15, 18, 21, 24, 27, 30, 33, 100)]
 human_powers = (
-    N_("million"),
-    N_("billion"),
-    N_("trillion"),
-    N_("quadrillion"),
-    N_("quintillion"),
-    N_("sextillion"),
-    N_("septillion"),
-    N_("octillion"),
-    N_("nonillion"),
-    N_("decillion"),
-    N_("googol"),
+    NS_("thousand", "thousand"),
+    NS_("million", "million"),
+    NS_("billion", "billion"),
+    NS_("trillion", "trillion"),
+    NS_("quadrillion", "quadrillion"),
+    NS_("quintillion", "quintillion"),
+    NS_("sextillion", "sextillion"),
+    NS_("septillion", "septillion"),
+    NS_("octillion", "octillion"),
+    NS_("nonillion", "nonillion"),
+    NS_("decillion", "decillion"),
+    NS_("googol", "googol"),
 )
 
 
@@ -146,6 +151,8 @@ def intword(value, format="%.1f"):
         ```pycon
         >>> intword("100")
         '100'
+        >>> intword("12400")
+        '12.4 thousand'
         >>> intword("1000000")
         '1.0 million'
         >>> intword(1_200_000_000)
@@ -179,9 +186,15 @@ def intword(value, format="%.1f"):
             chopped = value / float(powers[ordinal - 1])
             if float(format % chopped) == float(10 ** 3):
                 chopped = value / float(powers[ordinal])
-                return (" ".join([format, _(human_powers[ordinal])])) % chopped
+                singular, plural = human_powers[ordinal]
+                return (
+                    " ".join([format, ngettext(singular, plural, math.ceil(chopped))])
+                ) % chopped
             else:
-                return (" ".join([format, _(human_powers[ordinal - 1])])) % chopped
+                singular, plural = human_powers[ordinal - 1]
+                return (
+                    " ".join([format, ngettext(singular, plural, math.ceil(chopped))])
+                ) % chopped
     return str(value)
 
 
@@ -337,7 +350,7 @@ def scientific(value, precision=2):
             value = str(value).replace("-", "")
             negative = True
 
-        if isinstance(value, str):
+        if isinstance(value, compat.string_types):
             value = float(value)
 
         fmt = "{:.%se}" % str(int(precision))
@@ -363,3 +376,66 @@ def scientific(value, precision=2):
     final_str = part1 + " x 10" + "".join(new_part2)
 
     return final_str
+
+
+def clamp(value, format="{:}", floor=None, ceil=None, floor_token="<", ceil_token=">"):
+    """Returns number with the specified format, clamped between floor and ceil.
+
+    If the number is larger than ceil or smaller than floor, then the respective limit
+    will be returned, formatted and prepended with a token specifying as such.
+
+    Examples:
+        ```pycon
+        >>> clamp(123.456)
+        '123.456'
+        >>> clamp(0.0001, floor=0.01)
+        '<0.01'
+        >>> clamp(0.99, format="{:.0%}", ceil=0.99)
+        '99%'
+        >>> clamp(0.999, format="{:.0%}", ceil=0.99)
+        '>99%'
+        >>> clamp(1, format=intword, floor=1e6, floor_token="under ")
+        'under 1.0 million'
+        >>> clamp(None) is None
+        True
+
+        ```
+
+    Args:
+        value (int, float): Input number.
+        format (str OR callable): Can either be a formatting string, or a callable
+        function than receives value and returns a string.
+        floor (int, float): Smallest value before clamping.
+        ceil (int, float): Largest value before clamping.
+        floor_token (str): If value is smaller than floor, token will be prepended
+        to output.
+        ceil_token (str): If value is larger than ceil, token will be prepended
+        to output.
+
+    Returns:
+        str: Formatted number. The output is clamped between the indicated floor and
+        ceil. If the number if larger than ceil or smaller than floor, the output will
+        be prepended with a token indicating as such.
+
+    """
+    if value is None:
+        return None
+
+    if floor is not None and value < floor:
+        value = floor
+        token = floor_token
+    elif ceil is not None and value > ceil:
+        value = ceil
+        token = ceil_token
+    else:
+        token = ""
+
+    if isinstance(format, compat.string_types):
+        return token + format.format(value)
+    elif callable(format):
+        return token + format(value)
+    else:
+        raise ValueError(
+            "Invalid format. Must be either a valid formatting string, or a function "
+            "that accepts value and returns a string."
+        )
diff --git a/lib/humanize/time.py b/lib/humanize/time.py
index 279604d..686265b 100644
--- a/lib/humanize/time.py
+++ b/lib/humanize/time.py
@@ -366,17 +366,17 @@ def _suitable_minimum_unit(min_unit, suppress):
     If not suppressed, return the same unit:
 
     >>> from humanize.time import _suitable_minimum_unit, Unit
-    >>> _suitable_minimum_unit(Unit.HOURS, [])
-    <Unit.HOURS: 4>
+    >>> _suitable_minimum_unit(Unit.HOURS, []).name
+    'HOURS'
 
     But if suppressed, find a unit greather than the original one that is not
     suppressed:
 
-    >>> _suitable_minimum_unit(Unit.HOURS, [Unit.HOURS])
-    <Unit.DAYS: 5>
+    >>> _suitable_minimum_unit(Unit.HOURS, [Unit.HOURS]).name
+    'DAYS'
 
-    >>> _suitable_minimum_unit(Unit.HOURS, [Unit.HOURS, Unit.DAYS])
-    <Unit.MONTHS: 6>
+    >>> _suitable_minimum_unit(Unit.HOURS, [Unit.HOURS, Unit.DAYS]).name
+    'MONTHS'
     """
     if min_unit in suppress:
         for unit in Unit:
@@ -394,8 +394,8 @@ def _suppress_lower_units(min_unit, suppress):
     """Extend suppressed units (if any) with all units lower than the minimum unit.
 
     >>> from humanize.time import _suppress_lower_units, Unit
-    >>> list(sorted(_suppress_lower_units(Unit.SECONDS, [Unit.DAYS])))
-    [<Unit.MICROSECONDS: 0>, <Unit.MILLISECONDS: 1>, <Unit.DAYS: 5>]
+    >>> [x.name for x in sorted(_suppress_lower_units(Unit.SECONDS, [Unit.DAYS]))]
+    ['MICROSECONDS', 'MILLISECONDS', 'DAYS']
     """
     suppress = set(suppress)
     for u in Unit:
diff --git a/lib/rarfile/rarfile.pyi b/lib/rarfile/rarfile.pyi
index daac08d..51aaa4e 100644
--- a/lib/rarfile/rarfile.pyi
+++ b/lib/rarfile/rarfile.pyi
@@ -1,18 +1,12 @@
-from io import RawIOBase
+import io
+from datetime import datetime
 from typing import Any, Optional
 
-UNRAR_TOOL : str = "unrar"
-PATH_SEP : str = '/'
-def custom_check(cmd: Any, ignore_retcode : bool = False): ...
-
-class AES_CBC_Decrypt:
-    decrypt: Any = ...
-    def __init__(self, key: Any, iv: Any) -> None: ...
-
 class AES_CBC_Decrypt:
     decrypt: Any = ...
     def __init__(self, key: Any, iv: Any) -> None: ...
 
+def get_rar_version(xfile: Any): ...
 def is_rarfile(xfile: Any): ...
 def is_rarfile_sfx(xfile: Any): ...
 
@@ -22,7 +16,11 @@ class NotRarFile(Error): ...
 class BadRarName(Error): ...
 class NoRarEntry(Error): ...
 class PasswordRequired(Error): ...
-class NeedFirstVolume(Error): ...
+
+class NeedFirstVolume(Error):
+    current_volume: Any = ...
+    def __init__(self, msg: Any, volume: Any) -> None: ...
+
 class NoCrypto(Error): ...
 class RarExecError(Error): ...
 class RarWarning(RarExecError): ...
@@ -40,13 +38,13 @@ class RarWrongPassword(RarExecError): ...
 class RarUnknownError(RarExecError): ...
 class RarSignalExit(RarExecError): ...
 class RarCannotExec(RarExecError): ...
+class UnsupportedWarning(UserWarning): ...
 
 class RarInfo:
     filename: Any = ...
     file_size: Any = ...
     compress_size: Any = ...
     date_time: Any = ...
-    comment: Any = ...
     CRC: Any = ...
     volume: Any = ...
     orig_filename: Any = ...
@@ -57,42 +55,54 @@ class RarInfo:
     mode: Any = ...
     host_os: Any = ...
     compress_type: Any = ...
+    comment: Any = ...
     arctime: Any = ...
     blake2sp_hash: Any = ...
     file_redir: Any = ...
     flags: int = ...
     type: Any = ...
-    def isdir(self): ...
+    def is_dir(self): ...
+    def is_symlink(self): ...
+    def is_file(self): ...
     def needs_password(self): ...
+    def isdir(self): ...
 
 class RarFile:
+    filename: Any = ...
     comment: Any = ...
     _rarfile: Any = ...
     _charset: Any = ...
     _info_callback: Any = ...
     _crc_check: Any = ...
+    _part_only: Any = ...
     _password: Any = ...
     _file_parser: Any = ...
     _strict: bool = ...
-    def __init__(self, rarfile: Any, mode: str = ..., charset: Optional[Any] = ..., info_callback: Optional[Any] = ..., crc_check: bool = ..., errors: str = ...) -> None: ...
+    def __init__(self, file: Any, mode: str = ..., charset: Optional[Any] = ..., info_callback: Optional[Any] = ..., crc_check: bool = ..., errors: str = ..., part_only: bool = ...) -> None: ...
     def __enter__(self): ...
     def __exit__(self, typ: Any, value: Any, traceback: Any) -> None: ...
-    def setpassword(self, password: Any) -> None: ...
+    def __iter__(self) -> Any: ...
+    def setpassword(self, pwd: Any) -> None: ...
     def needs_password(self): ...
     def namelist(self): ...
     def infolist(self): ...
     def volumelist(self): ...
-    def getinfo(self, fname: Any): ...
-    def open(self, fname: Any, mode: str = ..., psw: Optional[Any] = ...): ...
-    def read(self, fname: Any, psw: Optional[Any] = ...): ...
+    def getinfo(self, name: Any): ...
+    def open(self, name: Any, mode: str = ..., pwd: Optional[Any] = ...): ...
+    def read(self, name: Any, pwd: Optional[Any] = ...): ...
     def close(self) -> None: ...
-    def printdir(self) -> None: ...
-    def extract(self, member: Any, path: Optional[Any] = ..., pwd: Optional[Any] = ...) -> None: ...
+    def printdir(self, file: Optional[Any] = ...) -> None: ...
+    def extract(self, member: Any, path: Optional[Any] = ..., pwd: Optional[Any] = ...): ...
     def extractall(self, path: Optional[Any] = ..., members: Optional[Any] = ..., pwd: Optional[Any] = ...) -> None: ...
-    def testrar(self) -> None: ...
+    def testrar(self, pwd: Optional[Any] = ...) -> None: ...
     def strerror(self): ...
     def _parse(self) -> None: ...
-    def _extract(self, fnlist: Any, path: Optional[Any] = ..., psw: Optional[Any] = ...) -> None: ...
+    def _extract_one(self, info: Any, path: Any, pwd: Any, set_attrs: Any): ...
+    def _create_helper(self, name: Any, flags: Any, info: Any): ...
+    def _make_file(self, info: Any, dstfn: Any, pwd: Any, set_attrs: Any): ...
+    def _make_dir(self, info: Any, dstfn: Any, pwd: Any, set_attrs: Any): ...
+    def _make_symlink(self, info: Any, dstfn: Any, pwd: Any, set_attrs: Any): ...
+    def _set_attrs(self, info: Any, dstfn: Any) -> None: ...
 
 class CommonParser:
     _main: Any = ...
@@ -112,9 +122,10 @@ class CommonParser:
     _info_map: Any = ...
     _vol_list: Any = ...
     _sfx_offset: Any = ...
-    def __init__(self, rarfile: Any, password: Any, crc_check: Any, charset: Any, strict: Any, info_cb: Any, sfx_offset: Any) -> None: ...
+    _part_only: Any = ...
+    def __init__(self, rarfile: Any, password: Any, crc_check: Any, charset: Any, strict: Any, info_cb: Any, sfx_offset: Any, part_only: Any) -> None: ...
     def has_header_encryption(self): ...
-    def setpassword(self, psw: Any) -> None: ...
+    def setpassword(self, pwd: Any) -> None: ...
     def volumelist(self): ...
     def needs_password(self): ...
     def strerror(self): ...
@@ -125,15 +136,15 @@ class CommonParser:
     def process_entry(self, fd: Any, item: Any) -> None: ...
     def _decrypt_header(self, fd: Any) -> None: ...
     def _parse_block_header(self, fd: Any) -> None: ...
-    def _open_hack(self, inf: Any, psw: Any) -> None: ...
+    def _open_hack(self, inf: Any, pwd: Any) -> None: ...
     def _parse_header(self, fd: Any): ...
     def _next_volname(self, volfile: Any): ...
     def _set_error(self, msg: Any, *args: Any) -> None: ...
-    def open(self, inf: Any, psw: Any): ...
+    def open(self, inf: Any, pwd: Any): ...
     def _open_clear(self, inf: Any): ...
-    def _open_hack_core(self, inf: Any, psw: Any, prefix: Any, suffix: Any): ...
-    def _open_unrar_membuf(self, memfile: Any, inf: Any, psw: Any): ...
-    def _open_unrar(self, rarfile: Any, inf: Any, psw: Optional[Any] = ..., tmpfile: Optional[Any] = ..., force_file: bool = ...): ...
+    def _open_hack_core(self, inf: Any, pwd: Any, prefix: Any, suffix: Any): ...
+    def _open_unrar_membuf(self, memfile: Any, inf: Any, pwd: Any): ...
+    def _open_unrar(self, rarfile: Any, inf: Any, pwd: Optional[Any] = ..., tmpfile: Optional[Any] = ..., force_file: bool = ...): ...
 
 class Rar3Info(RarInfo):
     extract_version: int = ...
@@ -145,9 +156,15 @@ class Rar3Info(RarInfo):
     data_offset: Any = ...
     _md_class: Any = ...
     _md_expect: Any = ...
+    _name_size: Any = ...
     file_redir: Any = ...
     blake2sp_hash: Any = ...
+    endarc_datacrc: Any = ...
+    endarc_volnr: Any = ...
     def _must_disable_hack(self): ...
+    def is_dir(self): ...
+    def is_symlink(self): ...
+    def is_file(self): ...
 
 class RAR3Parser(CommonParser):
     _expect_sig: Any = ...
@@ -156,13 +173,13 @@ class RAR3Parser(CommonParser):
     def _parse_block_header(self, fd: Any): ...
     def _parse_file_header(self, h: Any, hdata: Any, pos: Any): ...
     def _parse_subblocks(self, h: Any, hdata: Any, pos: Any): ...
-    def _read_comment_v3(self, inf: Any, psw: Optional[Any] = ...): ...
+    def _read_comment_v3(self, inf: Any, pwd: Optional[Any] = ...): ...
     def _decode(self, val: Any): ...
     def _decode_comment(self, val: Any): ...
     comment: Any = ...
     _needs_password: bool = ...
     def process_entry(self, fd: Any, item: Any) -> None: ...
-    def _open_hack(self, inf: Any, psw: Any): ...
+    def _open_hack(self, inf: Any, pwd: Any): ...
 
 class Rar5Info(RarInfo):
     extract_version: int = ...
@@ -192,6 +209,9 @@ class Rar5BaseFile(Rar5Info):
 
 class Rar5FileInfo(Rar5BaseFile):
     type: Any = ...
+    def is_symlink(self): ...
+    def is_file(self): ...
+    def is_dir(self): ...
 
 class Rar5ServiceInfo(Rar5BaseFile):
     type: Any = ...
@@ -237,7 +257,7 @@ class RAR5Parser(CommonParser):
     def process_entry(self, fd: Any, item: Any) -> None: ...
     comment: Any = ...
     def _load_comment(self, fd: Any, item: Any) -> None: ...
-    def _open_hack(self, inf: Any, psw: Any): ...
+    def _open_hack(self, inf: Any, pwd: Any): ...
 
 class UnicodeFilename:
     std_name: Any = ...
@@ -251,7 +271,7 @@ class UnicodeFilename:
     def put(self, lo: Any, hi: Any) -> None: ...
     def decode(self): ...
 
-class RarExtFile(RawIOBase):
+class RarExtFile(io.RawIOBase):
     name: Any = ...
     mode: str = ...
     _parser: Any = ...
@@ -260,16 +280,15 @@ class RarExtFile(RawIOBase):
     _remain: int = ...
     _returncode: int = ...
     _md_context: Any = ...
-    def __init__(self, parser: Any, inf: Any) -> None: ...
-    def _open(self) -> None: ...
-    def read(self, cnt: Optional[Any] = ...): ...
+    def _open_extfile(self, parser: Any, inf: Any) -> None: ...
+    def read(self, n: int = ...): ...
     def _check(self) -> None: ...
     def _read(self, cnt: Any) -> None: ...
     def close(self) -> None: ...
     def __del__(self) -> None: ...
     def readinto(self, buf: Any) -> None: ...
     def tell(self): ...
-    def seek(self, ofs: Any, whence: int = ...): ...
+    def seek(self, offset: Any, whence: int = ...): ...
     def _skip(self, cnt: Any) -> None: ...
     def readable(self): ...
     def writable(self): ...
@@ -280,11 +299,11 @@ class PipeReader(RarExtFile):
     _cmd: Any = ...
     _proc: Any = ...
     _tempfile: Any = ...
-    def __init__(self, rf: Any, inf: Any, cmd: Any, tempfile: Optional[Any] = ...) -> None: ...
+    def __init__(self, parser: Any, inf: Any, cmd: Any, tempfile: Optional[Any] = ...) -> None: ...
     _returncode: Any = ...
     def _close_proc(self) -> None: ...
     _fd: Any = ...
-    def _open(self) -> None: ...
+    def _open_extfile(self, parser: Any, inf: Any) -> None: ...
     def _read(self, cnt: Any): ...
     def close(self) -> None: ...
     def readinto(self, buf: Any): ...
@@ -293,8 +312,9 @@ class DirectReader(RarExtFile):
     _cur: Any = ...
     _cur_avail: Any = ...
     _volfile: Any = ...
+    def __init__(self, parser: Any, inf: Any) -> None: ...
     _fd: Any = ...
-    def _open(self) -> None: ...
+    def _open_extfile(self, parser: Any, inf: Any) -> None: ...
     def _skip(self, cnt: Any) -> None: ...
     def _read(self, cnt: Any): ...
     def _open_next(self): ...
@@ -303,7 +323,7 @@ class DirectReader(RarExtFile):
 class HeaderDecrypt:
     f: Any = ...
     ciph: Any = ...
-    buf: Any = ...
+    buf: bytes = ...
     def __init__(self, f: Any, key: Any, iv: Any) -> None: ...
     def tell(self): ...
     def read(self, cnt: Optional[Any] = ...): ...
@@ -316,7 +336,7 @@ class XFile:
     def read(self, n: Optional[Any] = ...): ...
     def tell(self): ...
     def seek(self, ofs: Any, whence: int = ...): ...
-    def readinto(self, dst: Any): ...
+    def readinto(self, buf: Any): ...
     def close(self) -> None: ...
     def __enter__(self): ...
     def __exit__(self, typ: Any, val: Any, tb: Any) -> None: ...
@@ -366,21 +386,27 @@ class Rar3Sha1:
     def hexdigest(self): ...
     def _corrupt(self, data: Any, dpos: Any) -> None: ...
 
-class XTempFile:
+class nsdatetime(datetime):
     __slots__: Any = ...
-    _tmpfile: Any = ...
-    _filename: Any = ...
-    def __init__(self, rarfile: Any) -> None: ...
-    def __enter__(self): ...
-    def __exit__(self, exc_type: Any, exc_value: Any, tb: Any) -> None: ...
+    nanosecond: int
+    def __new__(cls, year: Any, month: Any, day: Any, hour: int = ..., minute: int = ..., second: int = ..., microsecond: int = ..., tzinfo: Optional[Any] = ..., *, fold: int = ..., nanosecond: int = ...): ...
+    def isoformat(self, sep: str = ..., timespec: str = ...): ...
+    def astimezone(self, tz: Optional[Any] = ...): ...
+    def replace(self, year: Optional[Any] = ..., month: Optional[Any] = ..., day: Optional[Any] = ..., hour: Optional[Any] = ..., minute: Optional[Any] = ..., second: Optional[Any] = ..., microsecond: Optional[Any] = ..., tzinfo: Optional[Any] = ..., *, fold: Optional[Any] = ..., nanosecond: Optional[Any] = ...): ...
+    def __hash__(self) -> Any: ...
+    def __eq__(self, other: Any) -> Any: ...
+    def __gt__(self, other: Any) -> Any: ...
+    def __lt__(self, other: Any) -> Any: ...
+    def __ge__(self, other: Any) -> Any: ...
+    def __le__(self, other: Any) -> Any: ...
+    def __ne__(self, other: Any) -> Any: ...
 
 class ToolSetup:
     setup: Any = ...
     def __init__(self, setup: Any) -> None: ...
     def check(self): ...
-    def open_cmdline(self, psw: Any, rarfn: Any, filefn: Optional[Any] = ...): ...
-    def test_cmdline(self, psw: Any, rarfn: Any): ...
-    def extract_cmdline(self, psw: Any, rarfn: Any, fnlist: Any, path: Any): ...
+    def open_cmdline(self, pwd: Any, rarfn: Any, filefn: Optional[Any] = ...): ...
     def get_errmap(self): ...
-    def get_cmdline(self, key: Any, psw: Any, nodash: bool = ...): ...
-    def add_password_arg(self, cmdline: Any, psw: Any) -> None: ...
+    def get_cmdline(self, key: Any, pwd: Any, nodash: bool = ...): ...
+    def add_file_arg(self, cmdline: Any, filename: Any) -> None: ...
+    def add_password_arg(self, cmdline: Any, pwd: Any) -> None: ...
diff --git a/lib/rarfile_py2/rarfile.py b/lib/rarfile_py2/rarfile.py
index 7754a59..0b041b7 100644
--- a/lib/rarfile_py2/rarfile.py
+++ b/lib/rarfile_py2/rarfile.py
@@ -1,6 +1,6 @@
 # rarfile.py
 #
-# Copyright (c) 2005-2019  Marko Kreen <markokr@gmail.com>
+# Copyright (c) 2005-2020  Marko Kreen <markokr@gmail.com>
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -14,7 +14,7 @@
 # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-r"""RAR archive reader.
+"""RAR archive reader.
 
 This is Python module for Rar archive reading.  The interface
 is made as :mod:`zipfile`-like as possible.
@@ -30,10 +30,10 @@ Example::
 
     import rarfile
 
-    rf = rarfile.RarFile('myarchive.rar')
+    rf = rarfile.RarFile("myarchive.rar")
     for f in rf.infolist():
-        print f.filename, f.file_size
-        if f.filename == 'README':
+        print(f.filename, f.file_size)
+        if f.filename == "README":
             print(rf.read(f))
 
 Archive files can also be accessed via file-like object returned
@@ -41,23 +41,12 @@ by :meth:`RarFile.open`::
 
     import rarfile
 
-    with rarfile.RarFile('archive.rar') as rf:
-        with rf.open('README') as f:
+    with rarfile.RarFile("archive.rar") as rf:
+        with rf.open("README") as f:
             for ln in f:
                 print(ln.strip())
 
-There are few module-level parameters to tune behaviour,
-here they are with defaults, and reason to change it::
-
-    import rarfile
-
-    # Set to full path of unrar.exe if it is not in PATH
-    rarfile.UNRAR_TOOL = "unrar"
-
-    # Set to '\\' to be more compatible with old rarfile
-    rarfile.PATH_SEP = '/'
-
-For more details, refer to source.
+For decompression to work, either ``unrar`` or ``unar`` tool must be in PATH.
 
 """
 
@@ -67,19 +56,20 @@ from __future__ import division, print_function
 ## Imports and compat - support both Python 2.x and 3.x
 ##
 
-import sys
-import os
 import errno
+import io
+import os
+import re
+import shutil
 import struct
-
-from struct import pack, unpack, Struct
+import sys
+import warnings
 from binascii import crc32, hexlify
-from tempfile import mkstemp
-from subprocess import Popen, PIPE, STDOUT
-from io import RawIOBase
-from hashlib import sha1, sha256
-from hmac import HMAC
 from datetime import datetime, timedelta, tzinfo
+from hashlib import pbkdf2_hmac, sha1
+from struct import Struct, pack, unpack
+from subprocess import PIPE, STDOUT, Popen
+from tempfile import mkstemp
 
 # fixed offset timezone, for UTC
 try:
@@ -103,41 +93,30 @@ except ImportError:
         def dst(self, dt):
             return self._DST
 
-# only needed for encryped headers
+# only needed for encrypted headers
 try:
     try:
-        from cryptography.hazmat.primitives.ciphers import algorithms, modes, Cipher
         from cryptography.hazmat.backends import default_backend
-        from cryptography.hazmat.primitives import hashes
-        from cryptography.hazmat.primitives.kdf import pbkdf2
-
-        class AES_CBC_Decrypt(object):
-            """Decrypt API"""
-            def __init__(self, key, iv):
-                ciph = Cipher(algorithms.AES(key), modes.CBC(iv), default_backend())
-                self.decrypt = ciph.decryptor().update
-
-        def pbkdf2_sha256(password, salt, iters):
-            """PBKDF2 with HMAC-SHA256"""
-            ctx = pbkdf2.PBKDF2HMAC(hashes.SHA256(), 32, salt, iters, default_backend())
-            return ctx.derive(password)
-
+        from cryptography.hazmat.primitives.ciphers import (
+            Cipher, algorithms, modes,
+        )
+        _have_crypto = 1
     except ImportError:
         from Crypto.Cipher import AES
-        from Crypto.Protocol import KDF
+        _have_crypto = 2
+except ImportError:
+    _have_crypto = 0
 
-        class AES_CBC_Decrypt(object):
-            """Decrypt API"""
-            def __init__(self, key, iv):
-                self.decrypt = AES.new(key, AES.MODE_CBC, iv).decrypt
 
-        def pbkdf2_sha256(password, salt, iters):
-            """PBKDF2 with HMAC-SHA256"""
-            return KDF.PBKDF2(password, salt, 32, iters, hmac_sha256)
+class AES_CBC_Decrypt(object):
+    """Decrypt API"""
+    def __init__(self, key, iv):
+        if _have_crypto == 2:
+            self.decrypt = AES.new(key, AES.MODE_CBC, iv).decrypt
+        else:
+            ciph = Cipher(algorithms.AES(key), modes.CBC(iv), default_backend())
+            self.decrypt = ciph.decryptor().update
 
-    _have_crypto = 1
-except ImportError:
-    _have_crypto = 0
 
 try:
     try:
@@ -175,60 +154,38 @@ if sys.hexversion < 0x2070000:
     memoryview = lambda x: x  # noqa
 
 try:
+    # noinspection PyCompatibility
     from pathlib import Path
     _have_pathlib = True
 except ImportError:
     _have_pathlib = False
 
-__version__ = '3.1'
+from _23 import native_timestamp
+from six import string_types
+
+__version__ = "4.1a1"
 
 # export only interesting items
-__all__ = ['is_rarfile', 'RarInfo', 'RarFile', 'RarExtFile']
+__all__ = ["get_rar_version", "is_rarfile", "is_rarfile_sfx", "RarInfo", "RarFile", "RarExtFile"]
 
 ##
 ## Module configuration.  Can be tuned after importing.
 ##
 
-#: default fallback charset
-DEFAULT_CHARSET = "windows-1252"
-
-#: list of encodings to try, with fallback to DEFAULT_CHARSET if none succeed
-TRY_ENCODINGS = ('utf8', 'utf-16le')
-
-#: 'unrar', 'rar' or full path to either one
+#: executable for unrar tool
 UNRAR_TOOL = "unrar"
 
-#: Command line args to use for opening file for reading.
-OPEN_ARGS = ('p', '-inul')
-
-#: Command line args to use for extracting file to disk.
-EXTRACT_ARGS = ('x', '-y', '-idq')
+#: executable for unar tool
+UNAR_TOOL = "unar"
 
-#: args for testrar()
-TEST_ARGS = ('t', '-idq')
+#: executable for bsdtar tool
+BSDTAR_TOOL = "bsdtar"
 
-#
-# Allow use of tool that is not compatible with unrar.
-#
-# By default use 'bsdtar' which is 'tar' program that
-# sits on top of libarchive.
-#
-# Problems with libarchive RAR backend:
-# - Does not support solid archives.
-# - Does not support password-protected archives.
-#
-
-ALT_TOOL = 'bsdtar'
-ALT_OPEN_ARGS = ('-x', '--to-stdout', '-f')
-ALT_EXTRACT_ARGS = ('-x', '-f')
-ALT_TEST_ARGS = ('-t', '-f')
-ALT_CHECK_ARGS = ('--help',)
+#: default fallback charset
+DEFAULT_CHARSET = "windows-1252"
 
-#ALT_TOOL = 'unar'
-#ALT_OPEN_ARGS = ('-o', '-')
-#ALT_EXTRACT_ARGS = ()
-#ALT_TEST_ARGS = ('-test',) # does not work
-#ALT_CHECK_ARGS = ('-v',)
+#: list of encodings to try, with fallback to DEFAULT_CHARSET if none succeed
+TRY_ENCODINGS = ("utf8", "utf-16le")
 
 #: whether to speed up decompression by using tmp archive
 USE_EXTRACT_HACK = 1
@@ -236,85 +193,87 @@ USE_EXTRACT_HACK = 1
 #: limit the filesize for tmp archive usage
 HACK_SIZE_LIMIT = 20 * 1024 * 1024
 
-#: Separator for path name components.  RAR internally uses '\\'.
-#: Use '/' to be similar with zipfile.
-PATH_SEP = '/'
+#: set specific directory for mkstemp() used by hack dir usage
+HACK_TMP_DIR = None
+
+#: Separator for path name components.  Always "/".
+PATH_SEP = "/"
 
 ##
 ## rar constants
 ##
 
 # block types
-RAR_BLOCK_MARK          = 0x72  # r
-RAR_BLOCK_MAIN          = 0x73  # s
-RAR_BLOCK_FILE          = 0x74  # t
-RAR_BLOCK_OLD_COMMENT   = 0x75  # u
-RAR_BLOCK_OLD_EXTRA     = 0x76  # v
-RAR_BLOCK_OLD_SUB       = 0x77  # w
-RAR_BLOCK_OLD_RECOVERY  = 0x78  # x
-RAR_BLOCK_OLD_AUTH      = 0x79  # y
-RAR_BLOCK_SUB           = 0x7a  # z
-RAR_BLOCK_ENDARC        = 0x7b  # {
+RAR_BLOCK_MARK = 0x72           # r
+RAR_BLOCK_MAIN = 0x73           # s
+RAR_BLOCK_FILE = 0x74           # t
+RAR_BLOCK_OLD_COMMENT = 0x75    # u
+RAR_BLOCK_OLD_EXTRA = 0x76      # v
+RAR_BLOCK_OLD_SUB = 0x77        # w
+RAR_BLOCK_OLD_RECOVERY = 0x78   # x
+RAR_BLOCK_OLD_AUTH = 0x79       # y
+RAR_BLOCK_SUB = 0x7a            # z
+RAR_BLOCK_ENDARC = 0x7b         # {
 
 # flags for RAR_BLOCK_MAIN
-RAR_MAIN_VOLUME         = 0x0001
-RAR_MAIN_COMMENT        = 0x0002
-RAR_MAIN_LOCK           = 0x0004
-RAR_MAIN_SOLID          = 0x0008
-RAR_MAIN_NEWNUMBERING   = 0x0010
-RAR_MAIN_AUTH           = 0x0020
-RAR_MAIN_RECOVERY       = 0x0040
-RAR_MAIN_PASSWORD       = 0x0080
-RAR_MAIN_FIRSTVOLUME    = 0x0100
-RAR_MAIN_ENCRYPTVER     = 0x0200
+RAR_MAIN_VOLUME = 0x0001
+RAR_MAIN_COMMENT = 0x0002
+RAR_MAIN_LOCK = 0x0004
+RAR_MAIN_SOLID = 0x0008
+RAR_MAIN_NEWNUMBERING = 0x0010
+RAR_MAIN_AUTH = 0x0020
+RAR_MAIN_RECOVERY = 0x0040
+RAR_MAIN_PASSWORD = 0x0080
+RAR_MAIN_FIRSTVOLUME = 0x0100
+RAR_MAIN_ENCRYPTVER = 0x0200
 
 # flags for RAR_BLOCK_FILE
-RAR_FILE_SPLIT_BEFORE   = 0x0001
-RAR_FILE_SPLIT_AFTER    = 0x0002
-RAR_FILE_PASSWORD       = 0x0004
-RAR_FILE_COMMENT        = 0x0008
-RAR_FILE_SOLID          = 0x0010
-RAR_FILE_DICTMASK       = 0x00e0
-RAR_FILE_DICT64         = 0x0000
-RAR_FILE_DICT128        = 0x0020
-RAR_FILE_DICT256        = 0x0040
-RAR_FILE_DICT512        = 0x0060
-RAR_FILE_DICT1024       = 0x0080
-RAR_FILE_DICT2048       = 0x00a0
-RAR_FILE_DICT4096       = 0x00c0
-RAR_FILE_DIRECTORY      = 0x00e0
-RAR_FILE_LARGE          = 0x0100
-RAR_FILE_UNICODE        = 0x0200
-RAR_FILE_SALT           = 0x0400
-RAR_FILE_VERSION        = 0x0800
-RAR_FILE_EXTTIME        = 0x1000
-RAR_FILE_EXTFLAGS       = 0x2000
+RAR_FILE_SPLIT_BEFORE = 0x0001
+RAR_FILE_SPLIT_AFTER = 0x0002
+RAR_FILE_PASSWORD = 0x0004
+RAR_FILE_COMMENT = 0x0008
+RAR_FILE_SOLID = 0x0010
+RAR_FILE_DICTMASK = 0x00e0
+RAR_FILE_DICT64 = 0x0000
+RAR_FILE_DICT128 = 0x0020
+RAR_FILE_DICT256 = 0x0040
+RAR_FILE_DICT512 = 0x0060
+RAR_FILE_DICT1024 = 0x0080
+RAR_FILE_DICT2048 = 0x00a0
+RAR_FILE_DICT4096 = 0x00c0
+RAR_FILE_DIRECTORY = 0x00e0
+RAR_FILE_LARGE = 0x0100
+RAR_FILE_UNICODE = 0x0200
+RAR_FILE_SALT = 0x0400
+RAR_FILE_VERSION = 0x0800
+RAR_FILE_EXTTIME = 0x1000
+RAR_FILE_EXTFLAGS = 0x2000
 
 # flags for RAR_BLOCK_ENDARC
-RAR_ENDARC_NEXT_VOLUME  = 0x0001
-RAR_ENDARC_DATACRC      = 0x0002
-RAR_ENDARC_REVSPACE     = 0x0004
-RAR_ENDARC_VOLNR        = 0x0008
+RAR_ENDARC_NEXT_VOLUME = 0x0001
+RAR_ENDARC_DATACRC = 0x0002
+RAR_ENDARC_REVSPACE = 0x0004
+RAR_ENDARC_VOLNR = 0x0008
 
 # flags common to all blocks
-RAR_SKIP_IF_UNKNOWN     = 0x4000
-RAR_LONG_BLOCK          = 0x8000
+RAR_SKIP_IF_UNKNOWN = 0x4000
+RAR_LONG_BLOCK = 0x8000
 
 # Host OS types
-RAR_OS_MSDOS = 0
-RAR_OS_OS2   = 1
-RAR_OS_WIN32 = 2
-RAR_OS_UNIX  = 3
-RAR_OS_MACOS = 4
-RAR_OS_BEOS  = 5
-
-# Compression methods - '0'..'5'
-RAR_M0 = 0x30
-RAR_M1 = 0x31
-RAR_M2 = 0x32
-RAR_M3 = 0x33
-RAR_M4 = 0x34
-RAR_M5 = 0x35
+RAR_OS_MSDOS = 0    #: MSDOS (only in RAR3)
+RAR_OS_OS2 = 1      #: OS2 (only in RAR3)
+RAR_OS_WIN32 = 2    #: Windows
+RAR_OS_UNIX = 3     #: UNIX
+RAR_OS_MACOS = 4    #: MacOS (only in RAR3)
+RAR_OS_BEOS = 5     #: BeOS (only in RAR3)
+
+# Compression methods - "0".."5"
+RAR_M0 = 0x30   #: No compression.
+RAR_M1 = 0x31   #: Compression level `-m1` - Fastest compression.
+RAR_M2 = 0x32   #: Compression level `-m2`.
+RAR_M3 = 0x33   #: Compression level `-m3`.
+RAR_M4 = 0x34   #: Compression level `-m4`.
+RAR_M5 = 0x35   #: Compression level `-m5` - Maximum compression.
 
 #
 # RAR5 constants
@@ -363,6 +322,7 @@ RAR5_XTIME_UNIXTIME = 0x01
 RAR5_XTIME_HAS_MTIME = 0x02
 RAR5_XTIME_HAS_CTIME = 0x04
 RAR5_XTIME_HAS_ATIME = 0x08
+RAR5_XTIME_UNIXTIME_NS = 0x10
 
 RAR5_XENC_CIPHER_AES256 = 0
 
@@ -387,126 +347,225 @@ RAR5_XOWNER_GID = 0x08
 RAR5_OS_WINDOWS = 0
 RAR5_OS_UNIX = 1
 
+DOS_MODE_ARCHIVE = 0x20
+DOS_MODE_DIR = 0x10
+DOS_MODE_SYSTEM = 0x04
+DOS_MODE_HIDDEN = 0x02
+DOS_MODE_READONLY = 0x01
+
 ##
 ## internal constants
 ##
 
 RAR_ID = b"Rar!\x1a\x07\x00"
 RAR5_ID = b"Rar!\x1a\x07\x01\x00"
-ZERO = b'\0'
-EMPTY = b''
-UTC = timezone(timedelta(0), 'UTC')
-BSIZE = 32 * 1024
 
-def _get_rar_version(xfile):
+WIN32 = sys.platform == "win32"
+BSIZE = 512 * 1024 if WIN32 else 64 * 1024
+
+SFX_MAX_SIZE = 2 * 1024 * 1024
+RAR_V3 = 3
+RAR_V5 = 5
+
+_BAD_CHARS = r"""\x00-\x1F<>|"?*"""
+RC_BAD_CHARS_UNIX = re.compile(r"[%s]" % _BAD_CHARS)
+RC_BAD_CHARS_WIN32 = re.compile(r"[%s:^\\]" % _BAD_CHARS)
+
+# ... py2 constants
+UTC = timezone(timedelta(0), "UTC")
+
+
+def _find_sfx_header(xfile):
+    sig = RAR_ID[:-1]
+    buf = io.BytesIO()
+    steps = (64, SFX_MAX_SIZE)
+
+    with XFile(xfile) as fd:
+        for step in steps:
+            data = fd.read(step)
+            if not data:
+                break
+            buf.write(data)
+            curdata = buf.getvalue()
+            findpos = 0
+            while True:
+                pos = curdata.find(sig, findpos)
+                if pos < 0:
+                    break
+                if curdata[pos:pos + len(RAR_ID)] == RAR_ID:
+                    return RAR_V3, pos
+                if curdata[pos:pos + len(RAR5_ID)] == RAR5_ID:
+                    return RAR_V5, pos
+                findpos = pos + len(sig)
+    return 0, 0
+
+
+##
+## Public interface
+##
+
+
+def get_rar_version(xfile):
     """Check quickly whether file is rar archive.
     """
     with XFile(xfile) as fd:
         buf = fd.read(len(RAR5_ID))
     if buf.startswith(RAR_ID):
-        return 3
+        return RAR_V3
     elif buf.startswith(RAR5_ID):
-        return 5
+        return RAR_V5
     return 0
 
-##
-## Public interface
-##
 
 def is_rarfile(xfile):
     """Check quickly whether file is rar archive.
     """
-    return _get_rar_version(xfile) > 0
+    try:
+        return get_rar_version(xfile) > 0
+    except OSError:
+        # File not found or not accessible, ignore
+        return False
+
+
+def is_rarfile_sfx(xfile):
+    """Check whether file is rar archive with support for SFX.
+
+    It will read 2M from file.
+    """
+    return _find_sfx_header(xfile)[0] > 0
+
 
 class Error(Exception):
     """Base class for rarfile errors."""
 
+
 class BadRarFile(Error):
     """Incorrect data in archive."""
 
+
 class NotRarFile(Error):
     """The file is not RAR archive."""
 
+
 class BadRarName(Error):
     """Cannot guess multipart name components."""
 
+
 class NoRarEntry(Error):
     """File not found in RAR"""
 
+
 class PasswordRequired(Error):
     """File requires password"""
 
+
 class NeedFirstVolume(Error):
-    """Need to start from first volume."""
+    """Need to start from first volume.
+
+    Attributes:
+
+        current_volume
+            Volume number of current file or None if not known
+    """
+    def __init__(self, msg, volume):
+        super(NeedFirstVolume, self).__init__(msg)
+        self.current_volume = volume
+
 
 class NoCrypto(Error):
     """Cannot parse encrypted headers - no crypto available."""
 
+
 class RarExecError(Error):
     """Problem reported by unrar/rar."""
 
+
 class RarWarning(RarExecError):
     """Non-fatal error"""
 
+
 class RarFatalError(RarExecError):
     """Fatal error"""
 
+
 class RarCRCError(RarExecError):
     """CRC error during unpacking"""
 
+
 class RarLockedArchiveError(RarExecError):
     """Must not modify locked archive"""
 
+
 class RarWriteError(RarExecError):
     """Write error"""
 
+
 class RarOpenError(RarExecError):
     """Open error"""
 
+
 class RarUserError(RarExecError):
     """User error"""
 
+
 class RarMemoryError(RarExecError):
     """Memory error"""
 
+
 class RarCreateError(RarExecError):
     """Create error"""
 
+
 class RarNoFilesError(RarExecError):
     """No files that match pattern were found"""
 
+
 class RarUserBreak(RarExecError):
     """User stop"""
 
+
 class RarWrongPassword(RarExecError):
     """Incorrect password"""
 
+
 class RarUnknownError(RarExecError):
     """Unknown exit code"""
 
+
 class RarSignalExit(RarExecError):
     """Unrar exited with signal"""
 
+
 class RarCannotExec(RarExecError):
     """Executable not found."""
 
 
+class UnsupportedWarning(UserWarning):
+    """Archive uses feature that are unsupported by rarfile.
+
+    .. versionadded:: 4.0
+    """
+
+
 class RarInfo(object):
     r"""An entry in rar archive.
 
-    RAR3 extended timestamps are :class:`datetime.datetime` objects without timezone.
-    RAR5 extended timestamps are :class:`datetime.datetime` objects with UTC timezone.
+    Timestamps as :class:`~datetime.datetime` are without timezone in RAR3,
+    with UTC timezone in RAR5 archives.
 
     Attributes:
 
         filename
             File name with relative path.
-            Path separator is '/'.  Always unicode string.
+            Path separator is "/".  Always unicode string.
 
         date_time
             File modification timestamp.   As tuple of (year, month, day, hour, minute, second).
             RAR5 allows archives where it is missing, it's None then.
 
+        comment
+            Optional file comment field.  Unicode string.  (RAR3-only)
+
         file_size
             Uncompressed size.
 
@@ -537,16 +596,16 @@ class RarInfo(object):
 
         mtime
             File modification time.  Same value as :attr:`date_time`
-            but as :class:`datetime.datetime` object with extended precision.
+            but as :class:`~datetime.datetime` object with extended precision.
 
         ctime
-            Optional time field: creation time.  As :class:`datetime.datetime` object.
+            Optional time field: creation time.  As :class:`~datetime.datetime` object.
 
         atime
-            Optional time field: last access time.  As :class:`datetime.datetime` object.
+            Optional time field: last access time.  As :class:`~datetime.datetime` object.
 
         arctime
-            Optional time field: archival time.  As :class:`datetime.datetime` object.
+            Optional time field: archival time.  As :class:`~datetime.datetime` object.
             (RAR3-only)
 
         CRC
@@ -557,8 +616,11 @@ class RarInfo(object):
         blake2sp_hash
             Blake2SP hash over decompressed data.  (RAR5-only)
 
-        comment
-            Optional file comment field.  Unicode string.  (RAR3-only)
+        volume
+            Volume nr, starting from 0.
+
+        volume_file
+            Volume file name, where file starts.
 
         file_redir
             If not None, file is link of some sort.  Contains tuple of (type, flags, target).
@@ -567,24 +629,20 @@ class RarInfo(object):
             Type is one of constants:
 
                 :data:`RAR5_XREDIR_UNIX_SYMLINK`
-                    unix symlink to target.
+                    Unix symlink.
                 :data:`RAR5_XREDIR_WINDOWS_SYMLINK`
-                    windows symlink to target.
+                    Windows symlink.
                 :data:`RAR5_XREDIR_WINDOWS_JUNCTION`
-                    windows junction.
+                    Windows junction.
                 :data:`RAR5_XREDIR_HARD_LINK`
-                    hard link to target.
+                    Hard link to target.
                 :data:`RAR5_XREDIR_FILE_COPY`
-                    current file is copy of another archive entry.
+                    Current file is copy of another archive entry.
 
-            Flags may contain :data:`RAR5_XREDIR_ISDIR` bit.
-
-        volume
-            Volume nr, starting from 0.
-
-        volume_file
-            Volume file name, where file starts.
+            Flags may contain bits:
 
+                :data:`RAR5_XREDIR_ISDIR`
+                    Symlink points to directory.
     """
 
     # zipfile-compatible fields
@@ -592,7 +650,6 @@ class RarInfo(object):
     file_size = None
     compress_size = None
     date_time = None
-    comment = None
     CRC = None
     volume = None
     orig_filename = None
@@ -619,11 +676,26 @@ class RarInfo(object):
     flags = 0
     type = None
 
-    def isdir(self):
+    # zipfile compat
+    def is_dir(self):
         """Returns True if entry is a directory.
+
+        .. versionadded:: 4.0
+        """
+        return False
+
+    def is_symlink(self):
+        """Returns True if entry is a symlink.
+
+        .. versionadded:: 4.0
+        """
+        return False
+
+    def is_file(self):
+        """Returns True if entry is a normal file.
+
+        .. versionadded:: 4.0
         """
-        if self.type == RAR_BLOCK_FILE:
-            return (self.flags & RAR_FILE_DIRECTORY) == RAR_FILE_DIRECTORY
         return False
 
     def needs_password(self):
@@ -633,24 +705,34 @@ class RarInfo(object):
             return (self.flags & RAR_FILE_PASSWORD) > 0
         return False
 
+    def isdir(self):
+        """Returns True if entry is a directory.
+
+        .. deprecated:: 4.0
+        """
+        return self.is_dir()
+
 
 class RarFile(object):
     """Parse RAR structure, provide access to files in archive.
     """
 
+    #: File name, if available.  Unicode string or None.
+    filename = None
+
     #: Archive comment.  Unicode string or None.
     comment = None
 
-    def __init__(self, rarfile, mode="r", charset=None, info_callback=None,
-                 crc_check=True, errors="stop"):
+    def __init__(self, file, mode="r", charset=None, info_callback=None,
+                 crc_check=True, errors="stop", part_only=False):
         """Open and parse a RAR archive.
 
         Parameters:
 
-            rarfile
-                archive file name
+            file
+                archive file name or file-like object.
             mode
-                only 'r' is supported.
+                only "r" is supported.
             charset
                 fallback charset to use, if filenames are not already Unicode-enabled.
             info_callback
@@ -660,15 +742,22 @@ class RarFile(object):
             errors
                 Either "stop" to quietly stop parsing on errors,
                 or "strict" to raise errors.  Default is "stop".
+            part_only
+                If True, read only single file and allow it to be middle-part
+                of multi-volume archive.
         """
-        if _have_pathlib and isinstance(rarfile, Path):
-            self._rarfile = str(rarfile)
+        if is_filelike(file):
+            self.filename = getattr(file, "name", None)
         else:
-            self._rarfile = rarfile
+            if _have_pathlib and isinstance(file, Path):
+                file = str(file)
+            self.filename = file
+        self._rarfile = file
 
         self._charset = charset or DEFAULT_CHARSET
         self._info_callback = info_callback
         self._crc_check = crc_check
+        self._part_only = part_only
         self._password = None
         self._file_parser = None
 
@@ -677,7 +766,7 @@ class RarFile(object):
         elif errors == "strict":
             self._strict = True
         else:
-            raise ValueError("Invalid value for 'errors' parameter.")
+            raise ValueError("Invalid value for errors= parameter.")
 
         if mode != "r":
             raise NotImplementedError("RarFile supports only mode=r")
@@ -689,13 +778,17 @@ class RarFile(object):
         return self
 
     def __exit__(self, typ, value, traceback):
-        """Exit context"""
+        """Exit context."""
         self.close()
 
-    def setpassword(self, password):
+    def __iter__(self):
+        """Iterate over members."""
+        return iter(self.infolist())
+
+    def setpassword(self, pwd):
         """Sets the password to use when extracting.
         """
-        self._password = password
+        self._password = pwd
         if self._file_parser:
             if self._file_parser.has_header_encryption():
                 self._file_parser = None
@@ -727,12 +820,12 @@ class RarFile(object):
         """
         return self._file_parser.volumelist()
 
-    def getinfo(self, fname):
+    def getinfo(self, name):
         """Return RarInfo for file.
         """
-        return self._file_parser.getinfo(fname)
+        return self._file_parser.getinfo(name)
 
-    def open(self, fname, mode='r', psw=None):
+    def open(self, name, mode="r", pwd=None):
         """Returns file-like object (:class:`RarExtFile`) from where the data can be read.
 
         The object implements :class:`io.RawIOBase` interface, so it can
@@ -748,56 +841,59 @@ class RarFile(object):
 
         Parameters:
 
-            fname
+            name
                 file name or RarInfo instance.
             mode
-                must be 'r'
-            psw
+                must be "r"
+            pwd
                 password to use for extracting.
         """
 
-        if mode != 'r':
+        if mode != "r":
             raise NotImplementedError("RarFile.open() supports only mode=r")
 
         # entry lookup
-        inf = self.getinfo(fname)
-        if inf.isdir():
-            raise TypeError("Directory does not have any data: " + inf.filename)
+        inf = self.getinfo(name)
+        if inf.is_dir():
+            raise io.UnsupportedOperation("Directory does not have any data: " + inf.filename)
 
         # check password
         if inf.needs_password():
-            psw = psw or self._password
-            if psw is None:
+            pwd = pwd or self._password
+            if pwd is None:
                 raise PasswordRequired("File %s requires password" % inf.filename)
         else:
-            psw = None
+            pwd = None
 
-        return self._file_parser.open(inf, psw)
+        return self._file_parser.open(inf, pwd)
 
-    def read(self, fname, psw=None):
+    def read(self, name, pwd=None):
         """Return uncompressed data for archive entry.
 
-        For longer files using :meth:`RarFile.open` may be better idea.
+        For longer files using :meth:`~RarFile.open` may be better idea.
 
         Parameters:
 
-            fname
+            name
                 filename or RarInfo instance
-            psw
+            pwd
                 password to use for extracting.
         """
 
-        with self.open(fname, 'r', psw) as f:
+        with self.open(name, "r", pwd) as f:
             return f.read()
 
     def close(self):
         """Release open resources."""
         pass
 
-    def printdir(self):
-        """Print archive file list to stdout."""
+    def printdir(self, file=None):
+        """Print archive file list to stdout or given file.
+        """
+        if file is None:
+            file = sys.stdout
         for f in self.infolist():
-            print(f.filename)
+            print(f.filename, file=file)
 
     def extract(self, member, path=None, pwd=None):
         """Extract single file into current directory.
@@ -811,13 +907,8 @@ class RarFile(object):
             pwd
                 optional password to use
         """
-        if isinstance(member, RarInfo):
-            fname = member.filename
-        elif _have_pathlib and isinstance(member, Path):
-            fname = str(member)
-        else:
-            fname = member
-        self._extract([fname], path, pwd)
+        inf = self.getinfo(member)
+        return self._extract_one(inf, path, pwd, True)
 
     def extractall(self, path=None, members=None, pwd=None):
         """Extract all files into current directory.
@@ -831,26 +922,30 @@ class RarFile(object):
             pwd
                 optional password to use
         """
-        fnlist = []
-        if members is not None:
-            for m in members:
-                if isinstance(m, RarInfo):
-                    fnlist.append(m.filename)
-                else:
-                    fnlist.append(m)
-        self._extract(fnlist, path, pwd)
-
-    def testrar(self):
-        """Let 'unrar' test the archive.
+        if members is None:
+            members = self.namelist()
+
+        done = set()
+        dirs = []
+        for m in members:
+            inf = self.getinfo(m)
+            dst = self._extract_one(inf, path, pwd, not inf.is_dir())
+            if inf.is_dir():
+                if dst not in done:
+                    dirs.append((dst, inf))
+                    done.add(dst)
+        if dirs:
+            dirs.sort(reverse=True)
+            for dst, inf in dirs:
+                self._set_attrs(inf, dst)
+
+    def testrar(self, pwd=None):
+        """Read all files and test CRC.
         """
-        cmd = [UNRAR_TOOL] + list(TEST_ARGS)
-        add_password_arg(cmd, self._password)
-        cmd.append('--')
-        with XTempFile(self._rarfile) as rarfile:
-            cmd.append(rarfile)
-            p = custom_popen(cmd)
-            output = p.communicate()[0]
-            check_returncode(p, output)
+        for member in self.infolist():
+            if member.is_file():
+                with self.open(member, 'r', pwd) as f:
+                    empty_read(f, member.file_size, BSIZE)
 
     def strerror(self):
         """Return error string if parsing failed or None if no problems.
@@ -864,50 +959,107 @@ class RarFile(object):
     ##
 
     def _parse(self):
-        ver = _get_rar_version(self._rarfile)
-        if ver == 3:
+        """Run parser for file type
+        """
+        ver, sfx_ofs = _find_sfx_header(self._rarfile)
+        if ver == RAR_V3:
             p3 = RAR3Parser(self._rarfile, self._password, self._crc_check,
-                            self._charset, self._strict, self._info_callback)
+                            self._charset, self._strict, self._info_callback,
+                            sfx_ofs, self._part_only)
             self._file_parser = p3  # noqa
-        elif ver == 5:
+        elif ver == RAR_V5:
             p5 = RAR5Parser(self._rarfile, self._password, self._crc_check,
-                            self._charset, self._strict, self._info_callback)
+                            self._charset, self._strict, self._info_callback,
+                            sfx_ofs, self._part_only)
             self._file_parser = p5  # noqa
         else:
-            raise BadRarFile("Not a RAR file")
+            raise NotRarFile("Not a RAR file")
 
         self._file_parser.parse()
         self.comment = self._file_parser.comment
 
-    # call unrar to extract a file
-    def _extract(self, fnlist, path=None, psw=None):
-        cmd = [UNRAR_TOOL] + list(EXTRACT_ARGS)
+    def _extract_one(self, info, path, pwd, set_attrs):
+        fname = sanitize_filename(
+            info.filename, os.path.sep, WIN32
+        )
 
-        # pasoword
-        psw = psw or self._password
-        add_password_arg(cmd, psw)
-        cmd.append('--')
-
-        # rar file
-        with XTempFile(self._rarfile) as rarfn:
-            cmd.append(rarfn)
+        if path is None:
+            path = os.getcwd()
+        else:
+            if not isinstance(path, (string_types, bytes)):
+                return None
+        dstfn = os.path.join(path, fname)
+
+        dirname = os.path.dirname(dstfn)
+        if dirname and dirname != ".":
+            self._makedirs(dirname)
+
+        if info.is_file():
+            return self._make_file(info, dstfn, pwd, set_attrs)
+        if info.is_dir():
+            return self._make_dir(info, dstfn, pwd, set_attrs)
+        if info.is_symlink():
+            return self._make_symlink(info, dstfn, pwd, set_attrs)
+        return None
 
-            # file list
-            for fn in fnlist:
-                if os.sep != PATH_SEP:
-                    fn = fn.replace(PATH_SEP, os.sep)
-                cmd.append(fn)
+    def _make_file(self, info, dstfn, pwd, set_attrs):
+        with self.open(info, "r", pwd) as src:
+            with open(dstfn, "wb") as dst:
+                shutil.copyfileobj(src, dst)
+        if set_attrs:
+            self._set_attrs(info, dstfn)
+        return dstfn
+
+    def _make_dir(self, info, dstfn, pwd, set_attrs):
+        self._makedirs(dstfn)
+        if set_attrs:
+            self._set_attrs(info, dstfn)
+        return dstfn
+
+    def _make_symlink(self, info, dstfn, pwd, set_attrs):
+        if info.host_os == RAR_OS_UNIX:
+            link_name = self.read(info, pwd)
+        elif info.file_redir:
+            redir_type, redir_flags, link_name = info.file_redir
+            if redir_type == RAR5_XREDIR_WINDOWS_JUNCTION:
+                warnings.warn("Windows junction not supported - %s" % info.filename, UnsupportedWarning)
+                return None
+        else:
+            warnings.warn("Unsupported link type - %s" % info.filename, UnsupportedWarning)
+            return None
 
-            # destination path
-            if path is not None:
-                if _have_pathlib and isinstance(path, Path):
-                    path = str(path)
-                cmd.append(path + os.sep)
+        os.symlink(link_name, dstfn)
+        return dstfn
+
+    def _set_attrs(self, info, dstfn):
+        if info.host_os == RAR_OS_UNIX:
+            os.chmod(dstfn, info.mode & 0o777)
+        elif info.host_os in (RAR_OS_WIN32, RAR_OS_MSDOS):
+            # only keep R/O attr, except for dirs on win32
+            if info.mode & DOS_MODE_READONLY and (info.is_file() or not WIN32):
+                st = os.stat(dstfn)
+                new_mode = st.st_mode & ~0o222
+                os.chmod(dstfn, new_mode)
+
+        if info.mtime:
+            mtime_ns = to_nsecs(info.mtime)
+            atime_ns = to_nsecs(info.atime) if info.atime else mtime_ns
+            os.utime(dstfn, (atime_ns, mtime_ns))
+
+    def _makedirs(self, name):
+        if not name:
+            return
+        head, tail = os.path.split(name)
+        if not tail:
+            head, tail = os.path.split(head)
+        if head and tail and not os.path.isdir(head):
+            self._makedirs(head)
+        try:
+            os.mkdir(name)
+        except OSError:
+            if not os.path.isdir(name):
+                raise
 
-            # call
-            p = custom_popen(cmd)
-            output = p.communicate()[0]
-            check_returncode(p, output)
 
 #
 # File format parsing
@@ -924,7 +1076,8 @@ class CommonParser(object):
     _password = None
     comment = None
 
-    def __init__(self, rarfile, password, crc_check, charset, strict, info_cb):
+    def __init__(self, rarfile, password, crc_check, charset, strict,
+                 info_cb, sfx_offset, part_only):
         self._rarfile = rarfile
         self._password = password
         self._crc_check = crc_check
@@ -934,6 +1087,8 @@ class CommonParser(object):
         self._info_list = []
         self._info_map = {}
         self._vol_list = []
+        self._sfx_offset = sfx_offset
+        self._part_only = part_only
 
     def has_header_encryption(self):
         """Returns True if headers are encrypted
@@ -945,9 +1100,9 @@ class CommonParser(object):
                 return True
         return False
 
-    def setpassword(self, psw):
+    def setpassword(self, pwd):
         """Set cached password."""
-        self._password = psw
+        self._password = pwd
 
     def volumelist(self):
         """Volume files"""
@@ -976,21 +1131,14 @@ class CommonParser(object):
         else:
             fname = member
 
-        # accept both ways here
-        if PATH_SEP == '/':
-            fname2 = fname.replace("\\", "/")
-        else:
-            fname2 = fname.replace("/", "\\")
+        if fname.endswith("/"):
+            fname = fname.rstrip("/")
 
         try:
             return self._info_map[fname]
         except KeyError:
-            try:
-                return self._info_map[fname2]
-            except KeyError:
-                raise NoRarEntry("No such file: %s" % fname)
+            raise NoRarEntry("No such file: %s" % fname)
 
-    # read rar
     def parse(self):
         """Process file."""
         self._fd = None
@@ -1002,12 +1150,13 @@ class CommonParser(object):
                 self._fd = None
 
     def _parse_real(self):
+        """Actually read file.
+        """
         fd = XFile(self._rarfile)
         self._fd = fd
+        fd.seek(self._sfx_offset, 0)
         sig = fd.read(len(self._expect_sig))
         if sig != self._expect_sig:
-            if isinstance(self._rarfile, (str, unicode)):
-                raise NotRarFile("Not a Rar archive: {}".format(self._rarfile))
             raise NotRarFile("Not a Rar archive")
 
         volume = 0  # first vol (.rar) is 0
@@ -1015,13 +1164,17 @@ class CommonParser(object):
         endarc = False
         volfile = self._rarfile
         self._vol_list = [self._rarfile]
-        while 1:
+        raise_need_first_vol = False
+        while True:
             if endarc:
-                h = None    # don't read past ENDARC
+                h = None    # don"t read past ENDARC
             else:
                 h = self._parse_header(fd)
             if not h:
-                if more_vols:
+                if raise_need_first_vol:
+                    # did not find ENDARC with VOLNR
+                    raise NeedFirstVolume("Need to start from first volume", None)
+                if more_vols and not self._part_only:
                     volume += 1
                     fd.close()
                     try:
@@ -1046,17 +1199,19 @@ class CommonParser(object):
 
             if h.type == RAR_BLOCK_MAIN and not self._main:
                 self._main = h
-                if volume == 0 and (h.flags & RAR_MAIN_NEWNUMBERING):
+                if volume == 0 and (h.flags & RAR_MAIN_NEWNUMBERING) and not self._part_only:
                     # RAR 2.x does not set FIRSTVOLUME,
                     # so check it only if NEWNUMBERING is used
                     if (h.flags & RAR_MAIN_FIRSTVOLUME) == 0:
-                        if getattr(h, 'main_volume_number', None) is not None:
+                        if getattr(h, "main_volume_number", None) is not None:
                             # rar5 may have more info
                             raise NeedFirstVolume(
                                 "Need to start from first volume (current: %r)"
-                                % (h.main_volume_number,)
+                                % (h.main_volume_number,),
+                                h.main_volume_number
                             )
-                        raise NeedFirstVolume("Need to start from first volume")
+                        # delay raise until we have volnr from ENDARC
+                        raise_need_first_vol = True
                 if h.flags & RAR_MAIN_PASSWORD:
                     self._needs_password = True
                     if not self._password:
@@ -1064,13 +1219,20 @@ class CommonParser(object):
             elif h.type == RAR_BLOCK_ENDARC:
                 more_vols = (h.flags & RAR_ENDARC_NEXT_VOLUME) > 0
                 endarc = True
+                if raise_need_first_vol and (h.flags & RAR_ENDARC_VOLNR) > 0:
+                    raise NeedFirstVolume(
+                        "Need to start from first volume (current: %r)"
+                        % (h.endarc_volnr,),
+                        h.endarc_volnr
+                    )
             elif h.type == RAR_BLOCK_FILE:
                 # RAR 2.x does not write RAR_BLOCK_ENDARC
                 if h.flags & RAR_FILE_SPLIT_AFTER:
                     more_vols = True
                 # RAR 2.x does not set RAR_MAIN_FIRSTVOLUME
                 if volume == 0 and h.flags & RAR_FILE_SPLIT_BEFORE:
-                    raise NeedFirstVolume("Need to start from first volume")
+                    if not self._part_only:
+                        raise_need_first_vol = True
 
             if h.needs_password():
                 self._needs_password = True
@@ -1090,16 +1252,17 @@ class CommonParser(object):
         raise NotImplementedError()
 
     def _decrypt_header(self, fd):
-        raise NotImplementedError('_decrypt_header')
+        raise NotImplementedError("_decrypt_header")
 
     def _parse_block_header(self, fd):
-        raise NotImplementedError('_parse_block_header')
+        raise NotImplementedError("_parse_block_header")
 
-    def _open_hack(self, inf, psw):
-        raise NotImplementedError('_open_hack')
+    def _open_hack(self, inf, pwd):
+        raise NotImplementedError("_open_hack")
 
-    # read single header
     def _parse_header(self, fd):
+        """Read single header
+        """
         try:
             # handle encrypted headers
             if (self._main and self._main.flags & RAR_MAIN_PASSWORD) or self._hdrenc_main:
@@ -1110,11 +1273,12 @@ class CommonParser(object):
             # now read actual header
             return self._parse_block_header(fd)
         except struct.error:
-            self._set_error('Broken header in RAR file')
+            self._set_error("Broken header in RAR file")
             return None
 
-    # given current vol name, construct next one
     def _next_volname(self, volfile):
+        """Given current vol name, construct next one
+        """
         if is_filelike(volfile):
             raise IOError("Working on single FD")
         if self._main.flags & RAR_MAIN_NEWNUMBERING:
@@ -1128,18 +1292,23 @@ class CommonParser(object):
         if self._strict:
             raise BadRarFile(msg)
 
-    def open(self, inf, psw):
+    def open(self, inf, pwd):
         """Return stream object for file data."""
 
         if inf.file_redir:
+            redir_type, redir_flags, redir_name = inf.file_redir
             # cannot leave to unrar as it expects copied file to exist
-            if inf.file_redir[0] in (RAR5_XREDIR_FILE_COPY, RAR5_XREDIR_HARD_LINK):
-                inf = self.getinfo(inf.file_redir[2])
+            if redir_type in (RAR5_XREDIR_FILE_COPY, RAR5_XREDIR_HARD_LINK):
+                inf = self.getinfo(redir_name)
                 if not inf:
-                    raise BadRarFile('cannot find copied file')
-
+                    raise BadRarFile("cannot find copied file")
+            elif redir_type in (
+                RAR5_XREDIR_UNIX_SYMLINK, RAR5_XREDIR_WINDOWS_SYMLINK,
+                RAR5_XREDIR_WINDOWS_JUNCTION,
+            ):
+                return io.BytesIO(redir_name.encode("utf8"))
         if inf.flags & RAR_FILE_SPLIT_BEFORE:
-            raise NeedFirstVolume("Partial file, please start from first volume: " + inf.filename)
+            raise NeedFirstVolume("Partial file, please start from first volume: " + inf.filename, None)
 
         # is temp write usable?
         use_hack = 1
@@ -1160,22 +1329,22 @@ class CommonParser(object):
         if inf.compress_type == RAR_M0 and (inf.flags & RAR_FILE_PASSWORD) == 0 and inf.file_redir is None:
             return self._open_clear(inf)
         elif use_hack:
-            return self._open_hack(inf, psw)
+            return self._open_hack(inf, pwd)
         elif is_filelike(self._rarfile):
-            return self._open_unrar_membuf(self._rarfile, inf, psw)
+            return self._open_unrar_membuf(self._rarfile, inf, pwd)
         else:
-            return self._open_unrar(self._rarfile, inf, psw)
+            return self._open_unrar(self._rarfile, inf, pwd)
 
     def _open_clear(self, inf):
         return DirectReader(self, inf)
 
-    def _open_hack_core(self, inf, psw, prefix, suffix):
+    def _open_hack_core(self, inf, pwd, prefix, suffix):
 
         size = inf.compress_size + inf.header_size
         rf = XFile(inf.volume_file, 0)
         rf.seek(inf.header_offset)
 
-        tmpfd, tmpname = mkstemp(suffix='.rar')
+        tmpfd, tmpname = mkstemp(suffix=".rar", dir=HACK_TMP_DIR)
         tmpf = os.fdopen(tmpfd, "wb")
 
         try:
@@ -1186,42 +1355,41 @@ class CommonParser(object):
                 else:
                     buf = rf.read(size)
                 if not buf:
-                    raise BadRarFile('read failed: ' + inf.filename)
+                    raise BadRarFile("read failed: " + inf.filename)
                 tmpf.write(buf)
                 size -= len(buf)
             tmpf.write(suffix)
             tmpf.close()
             rf.close()
-        except:
+        except BaseException:
             rf.close()
             tmpf.close()
             os.unlink(tmpname)
             raise
 
-        return self._open_unrar(tmpname, inf, psw, tmpname)
+        return self._open_unrar(tmpname, inf, pwd, tmpname)
 
-    # write in-memory archive to temp file - needed for solid archives
-    def _open_unrar_membuf(self, memfile, inf, psw):
+    def _open_unrar_membuf(self, memfile, inf, pwd):
+        """Write in-memory archive to temp file, needed for solid archives.
+        """
         tmpname = membuf_tempfile(memfile)
-        return self._open_unrar(tmpname, inf, psw, tmpname, force_file=True)
+        return self._open_unrar(tmpname, inf, pwd, tmpname, force_file=True)
 
-    # extract using unrar
-    def _open_unrar(self, rarfile, inf, psw=None, tmpfile=None, force_file=False):
-        cmd = [UNRAR_TOOL] + list(OPEN_ARGS)
-        add_password_arg(cmd, psw)
-        cmd.append("--")
-        cmd.append(rarfile)
+    def _open_unrar(self, rarfile, inf, pwd=None, tmpfile=None, force_file=False):
+        """Extract using unrar
+        """
+        setup = tool_setup()
 
         # not giving filename avoids encoding related problems
+        fn = None
         if not tmpfile or force_file:
             fn = inf.filename
-            if PATH_SEP != os.sep:
-                fn = fn.replace(PATH_SEP, os.sep)
-            cmd.append(fn)
 
         # read from unrar pipe
+        cmd = setup.open_cmdline(pwd, rarfile, fn)
         return PipeReader(self, inf, cmd, tmpfile)
 
+
 #
 # RAR3 format
 #
@@ -1237,11 +1405,15 @@ class Rar3Info(RarInfo):
     data_offset = None
     _md_class = None
     _md_expect = None
+    _name_size = None
 
     # make sure some rar5 fields are always present
     file_redir = None
     blake2sp_hash = None
 
+    endarc_datacrc = None
+    endarc_volnr = None
+
     def _must_disable_hack(self):
         if self.type == RAR_BLOCK_FILE:
             if self.flags & RAR_FILE_PASSWORD:
@@ -1253,6 +1425,27 @@ class Rar3Info(RarInfo):
                 return True
         return False
 
+    def is_dir(self):
+        """Returns True if entry is a directory."""
+        if self.type == RAR_BLOCK_FILE and not self.is_symlink():
+            return (self.flags & RAR_FILE_DIRECTORY) == RAR_FILE_DIRECTORY
+        return False
+
+    def is_symlink(self):
+        """Returns True if entry is a symlink."""
+        return (
+            self.type == RAR_BLOCK_FILE and
+            self.host_os == RAR_OS_UNIX and
+            self.mode & 0xF000 == 0xA000
+        )
+
+    def is_file(self):
+        """Returns True if entry is a normal file."""
+        return (
+            self.type == RAR_BLOCK_FILE and
+            not (self.is_dir() or self.is_symlink())
+        )
+
 
 class RAR3Parser(CommonParser):
     """Parse RAR3 file format.
@@ -1262,7 +1455,7 @@ class RAR3Parser(CommonParser):
 
     def _decrypt_header(self, fd):
         if not _have_crypto:
-            raise NoCrypto('Cannot parse encrypted headers - no crypto')
+            raise NoCrypto("Cannot parse encrypted headers - no crypto")
         salt = fd.read(8)
         if self._last_aes_key[0] == salt:
             key, iv = self._last_aes_key[1:]
@@ -1271,8 +1464,9 @@ class RAR3Parser(CommonParser):
             self._last_aes_key = (salt, key, iv)
         return HeaderDecrypt(fd, key, iv)
 
-    # common header
     def _parse_block_header(self, fd):
+        """Parse common block header
+        """
         h = Rar3Info()
         h.header_offset = fd.tell()
 
@@ -1280,6 +1474,9 @@ class RAR3Parser(CommonParser):
         buf = fd.read(S_BLK_HDR.size)
         if not buf:
             return None
+        if len(buf) < S_BLK_HDR.size:
+            self._set_error("Unexpected EOF when reading header")
+            return None
         t = S_BLK_HDR.unpack_from(buf)
         h.header_crc, h.type, h.flags, h.header_size = t
 
@@ -1292,7 +1489,7 @@ class RAR3Parser(CommonParser):
 
         # unexpected EOF?
         if len(hdata) != h.header_size:
-            self._set_error('Unexpected EOF when reading header')
+            self._set_error("Unexpected EOF when reading header")
             return None
 
         pos = S_BLK_HDR.size
@@ -1327,6 +1524,13 @@ class RAR3Parser(CommonParser):
         elif h.type == RAR_BLOCK_OLD_EXTRA:
             pos += 7
             crc_pos = pos
+        elif h.type == RAR_BLOCK_ENDARC:
+            if h.flags & RAR_ENDARC_DATACRC:
+                h.endarc_datacrc, pos = load_le32(hdata, pos)
+            if h.flags & RAR_ENDARC_VOLNR:
+                h.endarc_volnr = S_SHORT.unpack_from(hdata, pos)[0]
+                pos += 2
+            crc_pos = h.header_size
         else:
             crc_pos = h.header_size
 
@@ -1343,14 +1547,15 @@ class RAR3Parser(CommonParser):
             return h
 
         # header parsing failed.
-        self._set_error('Header CRC error (%02x): exp=%x got=%x (xlen = %d)',
+        self._set_error("Header CRC error (%02x): exp=%x got=%x (xlen = %d)",
                         h.type, h.header_crc, calc_crc, len(crcdat))
 
         # instead panicing, send eof
         return None
 
-    # read file-specific header
     def _parse_file_header(self, h, hdata, pos):
+        """Read file-specific header
+        """
         fld = S_FILE_HDR.unpack_from(hdata, pos)
         pos += S_FILE_HDR.size
 
@@ -1362,7 +1567,7 @@ class RAR3Parser(CommonParser):
         h.mtime = to_datetime(h.date_time)
         h.extract_version = fld[5]
         h.compress_type = fld[6]
-        name_size = fld[7]
+        h._name_size = name_size = fld[7]
         h.mode = fld[8]
 
         h._md_class = CRC32Context
@@ -1376,8 +1581,9 @@ class RAR3Parser(CommonParser):
             h.add_size = h.compress_size
 
         name, pos = load_bytes(hdata, name_size, pos)
-        if h.flags & RAR_FILE_UNICODE:
-            nul = name.find(ZERO)
+        if h.flags & RAR_FILE_UNICODE and b"\0" in name:
+            # stored in custom encoding
+            nul = name.find(b"\0")
             h.orig_filename = name[:nul]
             u = UnicodeFilename(h.orig_filename, name[nul + 1:])
             h.filename = u.decode()
@@ -1385,13 +1591,19 @@ class RAR3Parser(CommonParser):
             # if parsing failed fall back to simple name
             if u.failed:
                 h.filename = self._decode(h.orig_filename)
+        elif h.flags & RAR_FILE_UNICODE:
+            # stored in UTF8
+            h.orig_filename = name
+            h.filename = name.decode("utf8", "replace")
         else:
+            # stored in random encoding
             h.orig_filename = name
             h.filename = self._decode(name)
 
-        # change separator, if requested
-        if PATH_SEP != '\\':
-            h.filename = h.filename.replace('\\', PATH_SEP)
+        # change separator, set dir suffix
+        h.filename = h.filename.replace("\\", "/").rstrip("/")
+        if h.is_dir():
+            h.filename = h.filename + "/"
 
         if h.flags & RAR_FILE_SALT:
             h.salt, pos = load_bytes(hdata, 8, pos)
@@ -1406,8 +1618,9 @@ class RAR3Parser(CommonParser):
 
         return pos
 
-    # find old-style comment subblock
     def _parse_subblocks(self, h, hdata, pos):
+        """Find old-style comment subblock
+        """
         while pos < len(hdata):
             # ordinary block header
             t = S_BLK_HDR.unpack_from(hdata, pos)
@@ -1423,18 +1636,16 @@ class RAR3Parser(CommonParser):
             if stype == RAR_BLOCK_OLD_COMMENT and pos + S_COMMENT_HDR.size <= pos_next:
                 declen, ver, meth, crc = S_COMMENT_HDR.unpack_from(hdata, pos)
                 pos += S_COMMENT_HDR.size
-                data = hdata[pos : pos_next]
+                data = hdata[pos: pos_next]
                 cmt = rar3_decompress(ver, meth, data, declen, sflags,
                                       crc, self._password)
-                if not self._crc_check:
-                    h.comment = self._decode_comment(cmt)
-                elif rar_crc32(cmt) & 0xFFFF == crc:
+                if not self._crc_check or (rar_crc32(cmt) & 0xFFFF == crc):
                     h.comment = self._decode_comment(cmt)
 
             pos = pos_next
         return pos
 
-    def _read_comment_v3(self, inf, psw=None):
+    def _read_comment_v3(self, inf, pwd=None):
 
         # read data
         with XFile(inf.volume_file) as rf:
@@ -1443,7 +1654,7 @@ class RAR3Parser(CommonParser):
 
         # decompress
         cmt = rar3_decompress(inf.extract_version, inf.compress_type, data,
-                              inf.file_size, inf.flags, inf.CRC, psw, inf.salt)
+                              inf.file_size, inf.flags, inf.CRC, pwd, inf.salt)
 
         # check crc
         if self._crc_check:
@@ -1459,7 +1670,7 @@ class RAR3Parser(CommonParser):
                 return val.decode(c)
             except UnicodeError:
                 pass
-        return val.decode(self._charset, 'replace')
+        return val.decode(self._charset, "replace")
 
     def _decode_comment(self, val):
         return self._decode(val)
@@ -1467,8 +1678,10 @@ class RAR3Parser(CommonParser):
     def process_entry(self, fd, item):
         if item.type == RAR_BLOCK_FILE:
             # use only first part
-            if (item.flags & RAR_FILE_SPLIT_BEFORE) == 0:
-                self._info_map[item.filename] = item
+            if item.flags & RAR_FILE_VERSION:
+                pass    # skip old versions
+            elif (item.flags & RAR_FILE_SPLIT_BEFORE) == 0:
+                self._info_map[item.filename.rstrip("/")] = item
                 self._info_list.append(item)
             elif len(self._info_list) > 0:
                 # final crc is in last block
@@ -1478,7 +1691,7 @@ class RAR3Parser(CommonParser):
                 old.compress_size += item.compress_size
 
         # parse new-style comment
-        if item.type == RAR_BLOCK_SUB and item.filename == 'CMT':
+        if item.type == RAR_BLOCK_SUB and item.filename == "CMT":
             if item.flags & (RAR_FILE_SPLIT_BEFORE | RAR_FILE_SPLIT_AFTER):
                 pass
             elif item.flags & RAR_FILE_SOLID:
@@ -1500,10 +1713,11 @@ class RAR3Parser(CommonParser):
 
     # put file compressed data into temporary .rar archive, and run
     # unrar on that, thus avoiding unrar going over whole archive
-    def _open_hack(self, inf, psw):
+    def _open_hack(self, inf, pwd):
         # create main header: crc, type, flags, size, res1, res2
-        prefix = RAR_ID + S_BLK_HDR.pack(0x90CF, 0x73, 0, 13) + ZERO * (2 + 4)
-        return self._open_hack_core(inf, psw, prefix, EMPTY)
+        prefix = RAR_ID + S_BLK_HDR.pack(0x90CF, 0x73, 0, 13) + b"\0" * (2 + 4)
+        return self._open_hack_core(inf, pwd, prefix, b"")
+
 
 #
 # RAR5 format
@@ -1538,7 +1752,7 @@ class Rar5BaseFile(Rar5Info):
     """
     type = -1
     file_flags = None
-    file_encryption = (0, 0, 0, EMPTY, EMPTY, EMPTY)
+    file_encryption = (0, 0, 0, b"", b"", b"")
     file_compress_flags = None
     file_redir = None
     file_owner = None
@@ -1562,6 +1776,29 @@ class Rar5FileInfo(Rar5BaseFile):
     """
     type = RAR_BLOCK_FILE
 
+    def is_symlink(self):
+        """Returns True if entry is a symlink."""
+        # pylint: disable=unsubscriptable-object
+        return (
+            self.file_redir is not None and
+            self.file_redir[0] in (
+                RAR5_XREDIR_UNIX_SYMLINK,
+                RAR5_XREDIR_WINDOWS_SYMLINK,
+                RAR5_XREDIR_WINDOWS_JUNCTION,
+            )
+        )
+
+    def is_file(self):
+        """Returns True if entry is a normal file."""
+        return not (self.is_dir() or self.is_symlink())
+
+    def is_dir(self):
+        """Returns True if entry is a directory."""
+        if not self.file_redir:
+            if self.file_flags & RAR5_FILE_FLAG_ISDIR:
+                return True
+        return False
+
 
 class Rar5ServiceInfo(Rar5BaseFile):
     """RAR5 service record.
@@ -1616,28 +1853,38 @@ class RAR5Parser(CommonParser):
         if self._last_aes256_key[:2] == (kdf_count, salt):
             return self._last_aes256_key[2]
         if kdf_count > 24:
-            raise BadRarFile('Too large kdf_count')
-        psw = self._password
-        if isinstance(psw, unicode):
-            psw = psw.encode('utf8')
-        key = pbkdf2_sha256(psw, salt, 1 << kdf_count)
+            raise BadRarFile("Too large kdf_count")
+        pwd = self._password
+        if isinstance(pwd, unicode):
+            pwd = pwd.encode("utf8")
+        key = pbkdf2_hmac("sha256", pwd, salt, 1 << kdf_count)
         self._last_aes256_key = (kdf_count, salt, key)
         return key
 
     def _decrypt_header(self, fd):
         if not _have_crypto:
-            raise NoCrypto('Cannot parse encrypted headers - no crypto')
+            raise NoCrypto("Cannot parse encrypted headers - no crypto")
         h = self._hdrenc_main
         key = self._gen_key(h.encryption_kdf_count, h.encryption_salt)
         iv = fd.read(16)
         return HeaderDecrypt(fd, key, iv)
 
-    # common header
     def _parse_block_header(self, fd):
+        """Parse common block header
+        """
         header_offset = fd.tell()
 
-        preload = 4 + 3
+        preload = 4 + 1
         start_bytes = fd.read(preload)
+        if len(start_bytes) < preload:
+            self._set_error("Unexpected EOF when reading header")
+            return None
+        while bytearray(start_bytes)[-1] & 0x80:
+            b = fd.read(1)
+            if not b:
+                self._set_error("Unexpected EOF when reading header")
+                return None
+            start_bytes += b
         header_crc, pos = load_le32(start_bytes, 0)
         hdrlen, pos = load_vint(start_bytes, pos)
         if hdrlen > 2 * 1024 * 1024:
@@ -1647,14 +1894,14 @@ class RAR5Parser(CommonParser):
         # read full header, check for EOF
         hdata = start_bytes + fd.read(header_size - len(start_bytes))
         if len(hdata) != header_size:
-            self._set_error('Unexpected EOF when reading header')
+            self._set_error("Unexpected EOF when reading header")
             return None
         data_offset = fd.tell()
 
         calc_crc = rar_crc32(memoryview(hdata)[4:])
         if header_crc != calc_crc:
             # header parsing failed.
-            self._set_error('Header CRC error: exp=%x got=%x (xlen = %d)',
+            self._set_error("Header CRC error: exp=%x got=%x (xlen = %d)",
                             header_crc, calc_crc, len(hdata))
             return None
 
@@ -1737,7 +1984,7 @@ class RAR5Parser(CommonParser):
         h.file_compress_flags, pos = load_vint(hdata, pos)
         h.file_host_os, pos = load_vint(hdata, pos)
         h.orig_filename, pos = load_vstr(hdata, pos)
-        h.filename = h.orig_filename.decode('utf8', 'replace')
+        h.filename = h.orig_filename.decode("utf8", "replace").rstrip("/")
 
         # use compatible values
         if h.file_host_os == RAR5_OS_WINDOWS:
@@ -1762,6 +2009,8 @@ class RAR5Parser(CommonParser):
         if h.file_compress_flags & RAR5_COMPR_SOLID:
             h.flags |= RAR_FILE_SOLID
 
+        if h.is_dir():
+            h.filename = h.filename + "/"
         return h
 
     def _parse_endarc_block(self, h, hdata, pos):
@@ -1778,11 +2027,10 @@ class RAR5Parser(CommonParser):
         if h.encryption_flags & RAR5_ENC_FLAG_HAS_CHECKVAL:
             h.encryption_check_value = load_bytes(hdata, 12, pos)
         if h.encryption_algo != RAR5_XENC_CIPHER_AES256:
-            raise BadRarFile('Unsupported header encryption cipher')
+            raise BadRarFile("Unsupported header encryption cipher")
         self._hdrenc_main = h
         return h
 
-    # file extra record
     def _process_file_extra(self, h, xdata):
         xtype, pos = load_vint(xdata, 0)
         if xtype == RAR5_XFILE_TIME:
@@ -1805,9 +2053,11 @@ class RAR5Parser(CommonParser):
     # extra block for file time record
     def _parse_file_xtime(self, h, xdata, pos):
         tflags, pos = load_vint(xdata, pos)
+
         ldr = load_windowstime
         if tflags & RAR5_XTIME_UNIXTIME:
             ldr = load_unixtime
+
         if tflags & RAR5_XTIME_HAS_MTIME:
             h.mtime, pos = ldr(xdata, pos)
             h.date_time = h.mtime.timetuple()[:6]
@@ -1816,6 +2066,17 @@ class RAR5Parser(CommonParser):
         if tflags & RAR5_XTIME_HAS_ATIME:
             h.atime, pos = ldr(xdata, pos)
 
+        if tflags & RAR5_XTIME_UNIXTIME_NS:
+            if tflags & RAR5_XTIME_HAS_MTIME:
+                nsec, pos = load_le32(xdata, pos)
+                h.mtime = to_nsdatetime(h.mtime, nsec)
+            if tflags & RAR5_XTIME_HAS_CTIME:
+                nsec, pos = load_le32(xdata, pos)
+                h.ctime = to_nsdatetime(h.ctime, nsec)
+            if tflags & RAR5_XTIME_HAS_ATIME:
+                nsec, pos = load_le32(xdata, pos)
+                h.atime = to_nsdatetime(h.atime, nsec)
+
     # just remember encryption info
     def _parse_file_encryption(self, h, xdata, pos):
         algo, pos = load_vint(xdata, pos)
@@ -1850,7 +2111,7 @@ class RAR5Parser(CommonParser):
         redir_type, pos = load_vint(xdata, pos)
         redir_flags, pos = load_vint(xdata, pos)
         redir_name, pos = load_vstr(xdata, pos)
-        redir_name = redir_name.decode('utf8', 'replace')
+        redir_name = redir_name.decode("utf8", "replace")
         h.file_redir = (redir_type, redir_flags, redir_name)
 
     def _parse_file_owner(self, h, xdata, pos):
@@ -1870,9 +2131,11 @@ class RAR5Parser(CommonParser):
 
     def process_entry(self, fd, item):
         if item.block_type == RAR5_BLOCK_FILE:
-            # use only first part
-            if (item.block_flags & RAR5_BLOCK_FLAG_SPLIT_BEFORE) == 0:
-                self._info_map[item.filename] = item
+            if item.file_version:
+                pass    # skip old versions
+            elif (item.block_flags & RAR5_BLOCK_FLAG_SPLIT_BEFORE) == 0:
+                # use only first part
+                self._info_map[item.filename.rstrip("/")] = item
                 self._info_list.append(item)
             elif len(self._info_list) > 0:
                 # final crc is in last block
@@ -1882,7 +2145,7 @@ class RAR5Parser(CommonParser):
                 old.blake2sp_hash = item.blake2sp_hash
                 old.compress_size += item.compress_size
         elif item.block_type == RAR5_BLOCK_SERVICE:
-            if item.filename == 'CMT':
+            if item.filename == "CMT":
                 self._load_comment(fd, item)
 
     def _load_comment(self, fd, item):
@@ -1904,17 +2167,18 @@ class RAR5Parser(CommonParser):
                 cmt = cmtstream.read()
 
         # rar bug? - appends zero to comment
-        cmt = cmt.split(ZERO, 1)[0]
-        self.comment = cmt.decode('utf8')
+        cmt = cmt.split(b"\0", 1)[0]
+        self.comment = cmt.decode("utf8")
         return None
 
-    def _open_hack(self, inf, psw):
+    def _open_hack(self, inf, pwd):
         # len, type, blk_flags, flags
-        main_hdr = b'\x03\x01\x00\x00'
-        endarc_hdr = b'\x03\x05\x00\x00'
+        main_hdr = b"\x03\x01\x00\x00"
+        endarc_hdr = b"\x03\x05\x00\x00"
         main_hdr = S_LONG.pack(rar_crc32(main_hdr)) + main_hdr
         endarc_hdr = S_LONG.pack(rar_crc32(endarc_hdr)) + endarc_hdr
-        return self._open_hack_core(inf, psw, RAR5_ID + main_hdr, endarc_hdr)
+        return self._open_hack_core(inf, pwd, RAR5_ID + main_hdr, endarc_hdr)
+
 
 ##
 ## Utility classes
@@ -1946,7 +2210,7 @@ class UnicodeFilename(object):
             return self.std_name[self.pos]
         except IndexError:
             self.failed = 1
-            return ord('?')
+            return ord("?")
 
     def put(self, lo, hi):
         """Copy 16-bit value to result."""
@@ -1983,7 +2247,7 @@ class UnicodeFilename(object):
         return self.buf.decode("utf-16le", "replace")
 
 
-class RarExtFile(RawIOBase):
+class RarExtFile(io.RawIOBase):
     """Base class for file-like object that :meth:`RarFile.open` returns.
 
     Provides public methods and common crc checking.
@@ -1992,30 +2256,20 @@ class RarExtFile(RawIOBase):
      - no short reads - .read() and .readinfo() read as much as requested.
      - no internal buffer, use io.BufferedReader for that.
     """
+    name = None     #: Filename of the archive entry
+    mode = "rb"
+    _parser = None
+    _inf = None
+    _fd = None
+    _remain = 0
+    _returncode = 0
+    _md_context = None
 
-    #: Filename of the archive entry
-    name = None
-
-    def __init__(self, parser, inf):
-        """Open archive entry.
-        """
-        super(RarExtFile, self).__init__()
-
-        # standard io.* properties
+    def _open_extfile(self, parser, inf):
         self.name = inf.filename
-        self.mode = 'rb'
-
         self._parser = parser
         self._inf = inf
-        self._fd = None
-        self._remain = 0
-        self._returncode = 0
-
-        self._md_context = None
-
-        self._open()
 
-    def _open(self):
         if self._fd:
             self._fd.close()
         md_class = self._inf._md_class or NoHashContext
@@ -2023,24 +2277,31 @@ class RarExtFile(RawIOBase):
         self._fd = None
         self._remain = self._inf.file_size
 
-    def read(self, cnt=None):
+    def read(self, n=-1):
         """Read all or specified amount of data from archive entry."""
 
-        # sanitize cnt
-        if cnt is None or cnt < 0:
-            cnt = self._remain
-        elif cnt > self._remain:
-            cnt = self._remain
-        if cnt == 0:
-            return EMPTY
+        # sanitize count
+        if n is None or n < 0:
+            n = self._remain
+        elif n > self._remain:
+            n = self._remain
+        if n == 0:
+            return b""
 
-        # actual read
-        data = self._read(cnt)
-        if data:
+        buf = []
+        orig = n
+        while n > 0:
+            # actual read
+            data = self._read(n)
+            if not data:
+                break
+            buf.append(data)
             self._md_context.update(data)
             self._remain -= len(data)
-        if len(data) != cnt:
-            raise BadRarFile("Failed the read enough data")
+            n -= len(data)
+        data = b"".join(buf)
+        if n > 0:
+            raise BadRarFile("Failed the read enough data: req=%d got=%d" % (orig, len(data)))
 
         # done?
         if not data or self._remain == 0:
@@ -2057,7 +2318,7 @@ class RarExtFile(RawIOBase):
         if final is None:
             return
         if self._returncode:
-            check_returncode(self, '')
+            check_returncode(self._returncode, "", tool_setup().get_errmap())
         if self._remain != 0:
             raise BadRarFile("Failed the read enough data")
         if final != exp:
@@ -2086,13 +2347,13 @@ class RarExtFile(RawIOBase):
 
         Returns bytes read.
         """
-        raise NotImplementedError('readinto')
+        raise NotImplementedError("readinto")
 
     def tell(self):
         """Return current reading position in uncompressed data."""
         return self._inf.file_size - self._remain
 
-    def seek(self, ofs, whence=0):
+    def seek(self, offset, whence=0):
         """Seek in data.
 
         On uncompressed files, the seeking works by actual
@@ -2108,13 +2369,13 @@ class RarExtFile(RawIOBase):
         cur_ofs = self.tell()
 
         if whence == 0:     # seek from beginning of file
-            new_ofs = ofs
+            new_ofs = offset
         elif whence == 1:   # seek from current position
-            new_ofs = cur_ofs + ofs
+            new_ofs = cur_ofs + offset
         elif whence == 2:   # seek from end of file
-            new_ofs = fsize + ofs
+            new_ofs = fsize + offset
         else:
-            raise ValueError('Invalid value for whence')
+            raise ValueError("Invalid value for whence")
 
         # sanity check
         if new_ofs < 0:
@@ -2127,20 +2388,13 @@ class RarExtFile(RawIOBase):
             self._skip(new_ofs - cur_ofs)
         else:
             # reopen and seek
-            self._open()
+            self._open_extfile(self._parser, self._inf)
             self._skip(new_ofs)
         return self.tell()
 
     def _skip(self, cnt):
         """Read and discard data"""
-        while cnt > 0:
-            if cnt > 8192:
-                buf = self.read(8192)
-            else:
-                buf = self.read(cnt)
-            if not buf:
-                break
-            cnt -= len(buf)
+        empty_read(self, cnt, BSIZE)
 
     def readable(self):
         """Returns True"""
@@ -2169,27 +2423,25 @@ class RarExtFile(RawIOBase):
 class PipeReader(RarExtFile):
     """Read data from pipe, handle tempfile cleanup."""
 
-    def __init__(self, rf, inf, cmd, tempfile=None):
+    def __init__(self, parser, inf, cmd, tempfile=None):
+        super(PipeReader, self).__init__()
         self._cmd = cmd
         self._proc = None
         self._tempfile = tempfile
-        super(PipeReader, self).__init__(rf, inf)
+        self._open_extfile(parser, inf)
 
     def _close_proc(self):
         if not self._proc:
             return
-        if self._proc.stdout:
-            self._proc.stdout.close()
-        if self._proc.stdin:
-            self._proc.stdin.close()
-        if self._proc.stderr:
-            self._proc.stderr.close()
+        for f in (self._proc.stdout, self._proc.stderr, self._proc.stdin):
+            if f:
+                f.close()
         self._proc.wait()
         self._returncode = self._proc.returncode
         self._proc = None
 
-    def _open(self):
-        super(PipeReader, self)._open()
+    def _open_extfile(self, parser, inf):
+        super(PipeReader, self)._open_extfile(parser, inf)
 
         # stop old process
         self._close_proc()
@@ -2199,10 +2451,6 @@ class PipeReader(RarExtFile):
         self._proc = custom_popen(self._cmd)
         self._fd = self._proc.stdout
 
-        # avoid situation where unrar waits on stdin
-        if self._proc.stdin:
-            self._proc.stdin.close()
-
     def _read(self, cnt):
         """Read from pipe."""
 
@@ -2220,7 +2468,7 @@ class PipeReader(RarExtFile):
                 break
             cnt -= len(data)
             buf.append(data)
-        return EMPTY.join(buf)
+        return b"".join(buf)
 
     def close(self):
         """Close open resources."""
@@ -2243,10 +2491,10 @@ class PipeReader(RarExtFile):
         vbuf = memoryview(buf)
         res = got = 0
         while got < cnt:
-            res = self._fd.readinto(vbuf[got : cnt])
+            res = self._fd.readinto(vbuf[got: cnt])
             if not res:
                 break
-            self._md_context.update(vbuf[got : got + res])
+            self._md_context.update(vbuf[got: got + res])
             self._remain -= res
             got += res
         return got
@@ -2259,8 +2507,12 @@ class DirectReader(RarExtFile):
     _cur_avail = None
     _volfile = None
 
-    def _open(self):
-        super(DirectReader, self)._open()
+    def __init__(self, parser, inf):
+        super(DirectReader, self).__init__()
+        self._open_extfile(parser, inf)
+
+    def _open_extfile(self, parser, inf):
+        super(DirectReader, self)._open_extfile(parser, inf)
 
         self._volfile = self._inf.volume_file
         self._fd = XFile(self._volfile, 0)
@@ -2314,7 +2566,7 @@ class DirectReader(RarExtFile):
 
         if len(buf) == 1:
             return buf[0]
-        return EMPTY.join(buf)
+        return b"".join(buf)
 
     def _open_next(self):
         """Proceed to next volume."""
@@ -2336,7 +2588,7 @@ class DirectReader(RarExtFile):
             raise BadRarFile("Invalid signature")
 
         # loop until first file header
-        while 1:
+        while True:
             cur = self._parser._parse_header(fd)
             if not cur:
                 raise BadRarFile("Unexpected EOF")
@@ -2366,10 +2618,10 @@ class DirectReader(RarExtFile):
                 cnt = self._cur_avail
 
             # read into temp view
-            res = self._fd.readinto(vbuf[got : got + cnt])
+            res = self._fd.readinto(vbuf[got: got + cnt])
             if not res:
                 break
-            self._md_context.update(vbuf[got : got + res])
+            self._md_context.update(vbuf[got: got + res])
             self._cur_avail -= res
             self._remain -= res
             got += res
@@ -2381,7 +2633,7 @@ class HeaderDecrypt(object):
     def __init__(self, f, key, iv):
         self.f = f
         self.ciph = AES_CBC_Decrypt(key, iv)
-        self.buf = EMPTY
+        self.buf = b""
 
     def tell(self):
         """Current file pos - works only on block boundaries."""
@@ -2390,7 +2642,7 @@ class HeaderDecrypt(object):
     def read(self, cnt=None):
         """Read and decrypt."""
         if cnt > 8 * 1024:
-            raise BadRarFile('Bad count to header decrypt - wrong password?')
+            raise BadRarFile("Bad count to header decrypt - wrong password?")
 
         # consume old data
         if cnt <= len(self.buf):
@@ -2398,7 +2650,7 @@ class HeaderDecrypt(object):
             self.buf = self.buf[cnt:]
             return res
         res = self.buf
-        self.buf = EMPTY
+        self.buf = b""
         cnt -= len(res)
 
         # decrypt new data
@@ -2419,11 +2671,10 @@ class HeaderDecrypt(object):
         return res
 
 
-# handle (filename|filelike) object
 class XFile(object):
     """Input may be filename or file object.
     """
-    __slots__ = ('_fd', '_need_close')
+    __slots__ = ("_fd", "_need_close")
 
     def __init__(self, xfile, bufsize=1024):
         if is_filelike(xfile):
@@ -2432,7 +2683,7 @@ class XFile(object):
             self._fd.seek(0)
         else:
             self._need_close = True
-            self._fd = open(xfile, 'rb', bufsize)
+            self._fd = open(xfile, "rb", bufsize)
 
     def read(self, n=None):
         """Read from file."""
@@ -2446,9 +2697,9 @@ class XFile(object):
         """Move file pos."""
         return self._fd.seek(ofs, whence)
 
-    def readinto(self, dst):
+    def readinto(self, buf):
         """Read into buffer."""
-        return self._fd.readinto(dst)
+        return self._fd.readinto(buf)
 
     def close(self):
         """Close file object."""
@@ -2476,7 +2727,7 @@ class NoHashContext(object):
 
 class CRC32Context(object):
     """Hash context that uses CRC32."""
-    __slots__ = ['_crc']
+    __slots__ = ["_crc"]
 
     def __init__(self, data=None):
         self._crc = 0
@@ -2493,19 +2744,19 @@ class CRC32Context(object):
 
     def hexdigest(self):
         """Hexadecimal digest."""
-        return '%08x' % self.digest()
+        return "%08x" % self.digest()
 
 
 class Blake2SP(object):
     """Blake2sp hash context.
     """
-    __slots__ = ['_thread', '_buf', '_cur', '_digest']
+    __slots__ = ["_thread", "_buf", "_cur", "_digest"]
     digest_size = 32
     block_size = 64
     parallelism = 8
 
     def __init__(self, data=None):
-        self._buf = b''
+        self._buf = b""
         self._cur = 0
         self._digest = None
         self._thread = []
@@ -2548,7 +2799,7 @@ class Blake2SP(object):
         if self._digest is None:
             if self._buf:
                 self._add_block(self._buf)
-                self._buf = EMPTY
+                self._buf = b""
             ctx = self._blake2s(0, 1, True)
             for t in self._thread:
                 ctx.update(t.digest())
@@ -2561,17 +2812,17 @@ class Blake2SP(object):
 
 
 class Rar3Sha1(object):
-    """Bug-compat for SHA1
+    """Emulate buggy SHA1 from RAR3.
     """
     digest_size = 20
     block_size = 64
 
-    _BLK_BE = struct.Struct(b'>16L')
-    _BLK_LE = struct.Struct(b'<16L')
+    _BLK_BE = struct.Struct(b">16L")
+    _BLK_LE = struct.Struct(b"<16L")
 
-    __slots__ = ('_nbytes', '_md', '_rarbug')
+    __slots__ = ("_nbytes", "_md", "_rarbug")
 
-    def __init__(self, data=b'', rarbug=False):
+    def __init__(self, data=b"", rarbug=False):
         self._md = sha1()
         self._nbytes = 0
         self._rarbug = rarbug
@@ -2610,16 +2861,17 @@ class Rar3Sha1(object):
 ## Utility functions
 ##
 
-S_LONG = Struct('<L')
-S_SHORT = Struct('<H')
-S_BYTE = Struct('<B')
+S_LONG = Struct("<L")
+S_SHORT = Struct("<H")
+S_BYTE = Struct("<B")
+
+S_BLK_HDR = Struct("<HBHH")
+S_FILE_HDR = Struct("<LLBLLBBHL")
+S_COMMENT_HDR = Struct("<HBBH")
 
-S_BLK_HDR = Struct('<HBHH')
-S_FILE_HDR = Struct('<LLBLLBBHL')
-S_COMMENT_HDR = Struct('<HBBH')
 
 def load_vint(buf, pos):
-    """Load variable-size int."""
+    """Load RAR5 variable-size int."""
     limit = min(pos + 11, len(buf))
     res = ofs = 0
     while pos < limit:
@@ -2629,46 +2881,53 @@ def load_vint(buf, pos):
         ofs += 7
         if b < 0x80:
             return res, pos
-    raise BadRarFile('cannot load vint')
+    raise BadRarFile("cannot load vint")
+
 
 def load_byte(buf, pos):
     """Load single byte"""
     end = pos + 1
     if end > len(buf):
-        raise BadRarFile('cannot load byte')
+        raise BadRarFile("cannot load byte")
     return S_BYTE.unpack_from(buf, pos)[0], end
 
+
 def load_le32(buf, pos):
     """Load little-endian 32-bit integer"""
     end = pos + 4
     if end > len(buf):
-        raise BadRarFile('cannot load le32')
-    return S_LONG.unpack_from(buf, pos)[0], pos + 4
+        raise BadRarFile("cannot load le32")
+    return S_LONG.unpack_from(buf, pos)[0], end
+
 
 def load_bytes(buf, num, pos):
     """Load sequence of bytes"""
     end = pos + num
     if end > len(buf):
-        raise BadRarFile('cannot load bytes')
-    return buf[pos : end], end
+        raise BadRarFile("cannot load bytes")
+    return buf[pos: end], end
+
 
 def load_vstr(buf, pos):
     """Load bytes prefixed by vint length"""
     slen, pos = load_vint(buf, pos)
     return load_bytes(buf, slen, pos)
 
+
 def load_dostime(buf, pos):
     """Load LE32 dos timestamp"""
     stamp, pos = load_le32(buf, pos)
     tup = parse_dos_time(stamp)
     return to_datetime(tup), pos
 
+
 def load_unixtime(buf, pos):
     """Load LE32 unix timestamp"""
     secs, pos = load_le32(buf, pos)
     dt = datetime.fromtimestamp(secs, UTC)
     return dt, pos
 
+
 def load_windowstime(buf, pos):
     """Load LE64 windows timestamp"""
     # unix epoch (1970) in seconds from windows epoch (1601)
@@ -2677,38 +2936,70 @@ def load_windowstime(buf, pos):
     val2, pos = load_le32(buf, pos)
     secs, n1secs = divmod((val2 << 32) | val1, 10000000)
     dt = datetime.fromtimestamp(secs - unix_epoch, UTC)
-    dt = dt.replace(microsecond=n1secs // 10)
+    dt = to_nsdatetime(dt, n1secs * 100)
     return dt, pos
 
-# new-style next volume
+
+#
+# volume numbering
+#
+
+_rc_num = re.compile('^[0-9]+$')
+
+
 def _next_newvol(volfile):
+    """New-style next volume
+    """
+    name, ext = os.path.splitext(volfile)
+    if ext.lower() in ("", ".exe", ".sfx"):
+        volfile = name + ".rar"
     i = len(volfile) - 1
     while i >= 0:
-        if volfile[i] >= '0' and volfile[i] <= '9':
-            return _inc_volname(volfile, i)
+        if "0" <= volfile[i] <= "9":
+            return _inc_volname(volfile, i, False)
+        if volfile[i] in ("/", os.sep):
+            break
         i -= 1
     raise BadRarName("Cannot construct volume name: " + volfile)
 
-# old-style next volume
+
 def _next_oldvol(volfile):
-    # rar -> r00
-    if volfile[-4:].lower() == '.rar':
-        return volfile[:-2] + '00'
-    return _inc_volname(volfile, len(volfile) - 1)
+    """Old-style next volume
+    """
+    name, ext = os.path.splitext(volfile)
+    if ext.lower() in ("", ".exe", ".sfx"):
+        ext = ".rar"
+    sfx = ext[2:]
+    if _rc_num.match(sfx):
+        ext = _inc_volname(ext, len(ext) - 1, True)
+    else:
+        # .rar -> .r00
+        ext = ext[:2] + "00"
+    return name + ext
+
 
-# increase digits with carry, otherwise just increment char
-def _inc_volname(volfile, i):
+def _inc_volname(volfile, i, inc_chars):
+    """increase digits with carry, otherwise just increment char
+    """
     fn = list(volfile)
     while i >= 0:
-        if fn[i] != '9':
+        if fn[i] == "9":
+            fn[i] = "0"
+            i -= 1
+            if i < 0:
+                fn.insert(0, "1")
+        elif "0" <= fn[i] < "9" or inc_chars:
             fn[i] = chr(ord(fn[i]) + 1)
             break
-        fn[i] = '0'
-        i -= 1
-    return ''.join(fn)
+        else:
+            fn.insert(i + 1, "1")
+            break
+    return "".join(fn)
+
 
-# rar3 extended time fields
 def _parse_ext_time(h, data, pos):
+    """Parse all RAR3 extended time fields
+    """
     # flags and rest of data can be missing
     flags = 0
     if pos + 2 <= len(data):
@@ -2724,32 +3015,30 @@ def _parse_ext_time(h, data, pos):
         h.date_time = mtime.timetuple()[:6]
     return pos
 
-# rar3 one extended time field
+
 def _parse_xtime(flag, data, pos, basetime=None):
+    """Parse one RAR3 extended time field
+    """
     res = None
     if flag & 8:
         if not basetime:
             basetime, pos = load_dostime(data, pos)
 
-        # load second fractions
+        # load second fractions of 100ns units
         rem = 0
         cnt = flag & 3
         for _ in range(cnt):
             b, pos = load_byte(data, pos)
             rem = (b << 16) | (rem >> 8)
 
-        # convert 100ns units to microseconds
-        usec = rem // 10
-        if usec > 1000000:
-            usec = 999999
-
         # dostime has room for 30 seconds only, correct if needed
         if flag & 4 and basetime.second < 59:
-            res = basetime.replace(microsecond=usec, second=basetime.second + 1)
-        else:
-            res = basetime.replace(microsecond=usec)
+            basetime = basetime.replace(second=basetime.second + 1)
+
+        res = to_nsdatetime(basetime, rem * 100)
     return res, pos
 
+
 def is_filelike(obj):
     """Filename or file object?
     """
@@ -2761,20 +3050,21 @@ def is_filelike(obj):
     if isinstance(obj, filename_types):
         return False
     res = True
-    for a in ('read', 'tell', 'seek'):
+    for a in ("read", "tell", "seek"):
         res = res and hasattr(obj, a)
     if not res:
         raise ValueError("Invalid object passed as file")
     return True
 
-def rar3_s2k(psw, salt):
+
+def rar3_s2k(pwd, salt):
     """String-to-key hash for RAR3.
     """
-    if not isinstance(psw, unicode):
-        psw = psw.decode('utf8')
-    seed = bytearray(psw.encode('utf-16le') + salt)
+    if not isinstance(pwd, unicode):
+        pwd = pwd.decode("utf8")
+    seed = bytearray(pwd.encode("utf-16le") + salt)
     h = Rar3Sha1(rarbug=True)
-    iv = EMPTY
+    iv = b""
     for i in range(16):
         for j in range(0x4000):
             cnt = S_LONG.pack(i * 0x4000 + j)
@@ -2786,7 +3076,8 @@ def rar3_s2k(psw, salt):
     key_le = pack("<LLLL", *unpack(">LLLL", key_be))
     return key_le, iv
 
-def rar3_decompress(vers, meth, data, declen=0, flags=0, crc=0, psw=None, salt=None):
+
+def rar3_decompress(vers, meth, data, declen=0, flags=0, crc=0, pwd=None, salt=None):
     """Decompress blob of compressed data.
 
     Used for data with non-standard header - eg. comments.
@@ -2800,15 +3091,13 @@ def rar3_decompress(vers, meth, data, declen=0, flags=0, crc=0, psw=None, salt=N
     flags |= RAR_LONG_BLOCK
 
     # file header
-    fname = b'data'
-    date = 0
-    mode = 0x20
+    fname = b"data"
+    date = ((2010 - 1980) << 25) + (12 << 21) + (31 << 16)
+    mode = DOS_MODE_ARCHIVE
     fhdr = S_FILE_HDR.pack(len(data), declen, RAR_OS_MSDOS, crc,
                            date, vers, meth, len(fname), mode)
     fhdr += fname
-    if flags & RAR_FILE_SALT:
-        if not salt:
-            return EMPTY
+    if salt:
         fhdr += salt
 
     # full header
@@ -2818,31 +3107,63 @@ def rar3_decompress(vers, meth, data, declen=0, flags=0, crc=0, psw=None, salt=N
     hdr = S_BLK_HDR.pack(hcrc, RAR_BLOCK_FILE, flags, hlen) + fhdr
 
     # archive main header
-    mh = S_BLK_HDR.pack(0x90CF, RAR_BLOCK_MAIN, 0, 13) + ZERO * (2 + 4)
+    mh = S_BLK_HDR.pack(0x90CF, RAR_BLOCK_MAIN, 0, 13) + b"\0" * (2 + 4)
 
     # decompress via temp rar
-    tmpfd, tmpname = mkstemp(suffix='.rar')
+    setup = tool_setup()
+    tmpfd, tmpname = mkstemp(suffix=".rar", dir=HACK_TMP_DIR)
     tmpf = os.fdopen(tmpfd, "wb")
     try:
         tmpf.write(RAR_ID + mh + hdr + data)
         tmpf.close()
 
-        cmd = [UNRAR_TOOL] + list(OPEN_ARGS)
-        add_password_arg(cmd, psw, (flags & RAR_FILE_PASSWORD))
-        cmd.append(tmpname)
-
+        curpwd = (flags & RAR_FILE_PASSWORD) and pwd or None
+        cmd = setup.open_cmdline(curpwd, tmpname)
         p = custom_popen(cmd)
         return p.communicate()[0]
     finally:
         tmpf.close()
         os.unlink(tmpname)
 
+
+def sanitize_filename(fname, pathsep, is_win32):
+    """Simulate unrar sanitization.
+    """
+    if is_win32:
+        if len(fname) > 1 and fname[1] == ":":
+            fname = fname[2:]
+        rc = RC_BAD_CHARS_WIN32
+    else:
+        rc = RC_BAD_CHARS_UNIX
+    if rc.search(fname):
+        fname = rc.sub("_", fname)
+
+    parts = []
+    for seg in fname.split("/"):
+        if seg in ("", ".", ".."):
+            continue
+        if is_win32 and seg[-1] in (" ", "."):
+            seg = seg[:-1] + "_"
+        parts.append(seg)
+    return pathsep.join(parts)
+
+
+def empty_read(src, size, blklen):
+    """Read and drop fixed amount of data.
+    """
+    while size > 0:
+        if size > blklen:
+            res = src.read(blklen)
+        else:
+            res = src.read(size)
+        if not res:
+            raise BadRarFile("cannot load data")
+        size -= len(res)
+
+
 def to_datetime(t):
     """Convert 6-part time tuple into datetime object.
     """
-    if t is None:
-        return None
-
     # extract values
     year, mon, day, h, m, s = t
 
@@ -2853,92 +3174,133 @@ def to_datetime(t):
         pass
 
     # sanitize invalid values
-    mday = (0, 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31)
-    if mon < 1:
-        mon = 1
-    if mon > 12:
-        mon = 12
-    if day < 1:
-        day = 1
-    if day > mday[mon]:
-        day = mday[mon]
-    if h > 23:
-        h = 23
-    if m > 59:
-        m = 59
-    if s > 59:
-        s = 59
-    if mon == 2 and day == 29:
-        try:
-            return datetime(year, mon, day, h, m, s)
-        except ValueError:
-            day = 28
+    mday = (0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31)
+    mon = max(1, min(mon, 12))
+    day = max(1, min(day, mday[mon]))
+    h = min(h, 23)
+    m = min(m, 59)
+    s = min(s, 59)
     return datetime(year, mon, day, h, m, s)
 
+
 def parse_dos_time(stamp):
     """Parse standard 32-bit DOS timestamp.
     """
     sec, stamp = stamp & 0x1F, stamp >> 5
-    mn,  stamp = stamp & 0x3F, stamp >> 6
-    hr,  stamp = stamp & 0x1F, stamp >> 5
+    mn, stamp = stamp & 0x3F, stamp >> 6
+    hr, stamp = stamp & 0x1F, stamp >> 5
     day, stamp = stamp & 0x1F, stamp >> 5
     mon, stamp = stamp & 0x0F, stamp >> 4
     yr = (stamp & 0x7F) + 1980
     return (yr, mon, day, hr, mn, sec * 2)
 
+
+# pylint: disable=arguments-differ,signature-differs
+class nsdatetime(datetime):
+    """Datetime that carries nanoseconds.
+
+    Arithmetic not supported, will lose nanoseconds.
+
+    .. versionadded:: 4.0
+    """
+    __slots__ = ("nanosecond",)
+
+    def __new__(cls, year, month, day, hour=0, minute=0, second=0,
+                microsecond=0, tzinfo=None, fold=0, nanosecond=0):
+        usec, mod = divmod(nanosecond, 1000) if nanosecond else (microsecond, 0)
+        if mod == 0:
+            return datetime(year, month, day, hour, minute, second, usec, tzinfo)
+        self = super(nsdatetime, cls).__new__(cls, year, month, day, hour, minute, second, usec, tzinfo)
+        self.nanosecond = nanosecond
+        return self
+
+    def isoformat(self, sep="T", timespec="auto"):
+        """Formats with nanosecond precision by default.
+        """
+        if timespec == "auto":
+            pre, post = super(nsdatetime, self).isoformat(sep, "microseconds").split(".", 1)
+            return "{}.{:09d}{}".format(pre, self.nanosecond, post[6:])
+        return super(nsdatetime, self).isoformat(sep, timespec)
+
+    def astimezone(self, tz=None):
+        """Convert to new timezone.
+        """
+        tmp = super(nsdatetime, self).astimezone(tz)
+        return self.__class__(tmp.year, tmp.month, tmp.day, tmp.hour, tmp.minute, tmp.second,
+                              tzinfo=tmp.tzinfo)
+
+    def replace(self, year=None, month=None, day=None, hour=None, minute=None, second=None,
+                microsecond=None, tzinfo=None, fold=None, nanosecond=None):
+        """Return new timestamp with specified fields replaced.
+        """
+        return self.__class__(
+            self.year if year is None else year,
+            self.month if month is None else month,
+            self.day if day is None else day,
+            self.hour if hour is None else hour,
+            self.minute if minute is None else minute,
+            self.second if second is None else second,
+            tzinfo=self.tzinfo if tzinfo is None else tzinfo)
+
+    def __hash__(self):
+        return super(nsdatetime, self).__hash__()
+
+    def __eq__(self, other):
+        return super(nsdatetime, self).__eq__(other)
+
+    def __gt__(self, other):
+        return super(nsdatetime, self).__gt__(other) or (super(nsdatetime, self).__eq__(other))
+
+    def __lt__(self, other):
+        return not (self > other or self == other)
+
+    def __ge__(self, other):
+        return not self < other
+
+    def __le__(self, other):
+        return not self > other
+
+    def __ne__(self, other):
+        return not self == other
+
+
+def to_nsdatetime(dt, nsec):
+    """Apply nanoseconds to datetime.
+    """
+    return dt
+
+
+def to_nsecs(dt):
+    """Convert datatime instance to nanoseconds.
+    """
+    secs = int(native_timestamp(dt))
+    return secs
+
+
 def custom_popen(cmd):
     """Disconnect cmd from parent fds, read only from stdout.
     """
     # needed for py2exe
-    creationflags = 0
-    if sys.platform == 'win32':
-        creationflags = 0x08000000   # CREATE_NO_WINDOW
-
+    creationflags = 0x08000000 if WIN32 else 0  # CREATE_NO_WINDOW
     # run command
     try:
-        p = Popen(cmd, bufsize=0, stdout=PIPE, stdin=PIPE, stderr=STDOUT,
+        p = Popen(cmd, bufsize=0, stdout=PIPE, stderr=STDOUT, stdin=open(os.devnull, 'w'),
                   creationflags=creationflags)
     except OSError as ex:
         if ex.errno == errno.ENOENT:
-            raise RarCannotExec("Unrar not installed? (rarfile.UNRAR_TOOL=%r)" % UNRAR_TOOL)
+            raise RarCannotExec("Unrar not installed?")
         if ex.errno == errno.EACCES or ex.errno == errno.EPERM:
-            raise RarCannotExec("Cannot execute unrar (rarfile.UNRAR_TOOL=%r)" % UNRAR_TOOL)
+            raise RarCannotExec("Cannot execute unrar")
         raise
     return p
 
-def custom_check(cmd, ignore_retcode=False):
-    """Run command, collect output, raise error if needed.
-    """
-    p = custom_popen(cmd)
-    out, _ = p.communicate()
-    if p.returncode and not ignore_retcode:
-        raise RarExecError("Check-run failed")
-    return out
-
-def add_password_arg(cmd, psw, ___required=False):
-    """Append password switch to commandline.
-    """
-    if UNRAR_TOOL == ALT_TOOL:
-        return
-    if psw is not None:
-        cmd.append('-p' + psw)
-    else:
-        cmd.append('-p-')
 
-def check_returncode(p, out):
+def check_returncode(code, out, errmap):
     """Raise exception according to unrar exit code.
     """
-    code = p.returncode
     if code == 0:
         return
 
-    # map return code to exception class, codes from rar.txt
-    errmap = [None,
-              RarWarning, RarFatalError, RarCRCError, RarLockedArchiveError,    # 1..4
-              RarWriteError, RarOpenError, RarUserError, RarMemoryError,        # 5..8
-              RarCreateError, RarNoFilesError, RarWrongPassword]                # 9..11
-    if UNRAR_TOOL == ALT_TOOL:
-        errmap = [None]
     if code > 0 and code < len(errmap):
         exc = errmap[code]
     elif code == 255:
@@ -2950,92 +3312,175 @@ def check_returncode(p, out):
 
     # format message
     if out:
-        msg = "%s [%d]: %s" % (exc.__doc__, p.returncode, out)
+        msg = "%s [%d]: %s" % (exc.__doc__, code, out)
     else:
-        msg = "%s [%d]" % (exc.__doc__, p.returncode)
+        msg = "%s [%d]" % (exc.__doc__, code)
 
     raise exc(msg)
 
-def hmac_sha256(key, data):
-    """HMAC-SHA256"""
-    return HMAC(key, data, sha256).digest()
 
 def membuf_tempfile(memfile):
-    """Write in-memory file object to real file."""
+    """Write in-memory file object to real file.
+    """
     memfile.seek(0, 0)
 
-    tmpfd, tmpname = mkstemp(suffix='.rar')
+    tmpfd, tmpname = mkstemp(suffix=".rar", dir=HACK_TMP_DIR)
     tmpf = os.fdopen(tmpfd, "wb")
 
     try:
-        while True:
-            buf = memfile.read(BSIZE)
-            if not buf:
-                break
-            tmpf.write(buf)
+        shutil.copyfileobj(memfile, tmpf, BSIZE)
         tmpf.close()
-    except:
+    except BaseException:
         tmpf.close()
         os.unlink(tmpname)
         raise
     return tmpname
 
-class XTempFile(object):
-    """Real file for archive.
-    """
-    __slots__ = ('_tmpfile', '_filename')
-
-    def __init__(self, rarfile):
-        if is_filelike(rarfile):
-            self._tmpfile = membuf_tempfile(rarfile)
-            self._filename = self._tmpfile
-        else:
-            self._tmpfile = None
-            self._filename = rarfile
-
-    def __enter__(self):
-        return self._filename
-
-    def __exit__(self, exc_type, exc_value, tb):
-        if self._tmpfile:
-            try:
-                os.unlink(self._tmpfile)
-            except OSError:
-                pass
-            self._tmpfile = None
 
 #
-# Check if unrar works
+# Find working command-line tool
 #
 
-ORIG_UNRAR_TOOL = UNRAR_TOOL
-ORIG_OPEN_ARGS = OPEN_ARGS
-ORIG_EXTRACT_ARGS = EXTRACT_ARGS
-ORIG_TEST_ARGS = TEST_ARGS
+class ToolSetup(object):
+    def __init__(self, setup):
+        self.setup = setup
 
-def _check_unrar_tool():
-    global UNRAR_TOOL, OPEN_ARGS, EXTRACT_ARGS, TEST_ARGS
-    try:
-        # does UNRAR_TOOL work?
-        custom_check([ORIG_UNRAR_TOOL], True)
-
-        UNRAR_TOOL = ORIG_UNRAR_TOOL
-        OPEN_ARGS = ORIG_OPEN_ARGS
-        EXTRACT_ARGS = ORIG_EXTRACT_ARGS
-        TEST_ARGS = ORIG_TEST_ARGS
-    except RarCannotExec:
+    def check(self):
+        cmdline = self.get_cmdline("check_cmd", None)
         try:
-            # does ALT_TOOL work?
-            custom_check([ALT_TOOL] + list(ALT_CHECK_ARGS), True)
-            # replace config
-            UNRAR_TOOL = ALT_TOOL
-            OPEN_ARGS = ALT_OPEN_ARGS
-            EXTRACT_ARGS = ALT_EXTRACT_ARGS
-            TEST_ARGS = ALT_TEST_ARGS
+            p = custom_popen(cmdline)
+            out, _ = p.communicate()
+            return p.returncode == 0
         except RarCannotExec:
-            # no usable tool, only uncompressed archives work
             return False
-    return True
 
-_check_unrar_tool()
+    def open_cmdline(self, pwd, rarfn, filefn=None):
+        cmdline = self.get_cmdline("open_cmd", pwd)
+        cmdline.append(rarfn)
+        if filefn:
+            self.add_file_arg(cmdline, filefn)
+        return cmdline
+
+    def get_errmap(self):
+        return self.setup["errmap"]
+
+    def get_cmdline(self, key, pwd, nodash=False):
+        cmdline = list(self.setup[key])
+        cmdline[0] = globals()[cmdline[0]]
+        self.add_password_arg(cmdline, pwd)
+        if not nodash:
+            cmdline.append("--")
+        return cmdline
+
+    def add_file_arg(self, cmdline, filename):
+        cmdline.append(filename)
+
+    def add_password_arg(self, cmdline, pwd):
+        """Append password switch to commandline.
+        """
+        if pwd is not None:
+            if not isinstance(pwd, str):
+                pwd = pwd.decode("utf8")
+            args = self.setup["password"]
+            if isinstance(args, str):
+                cmdline.append(args + pwd)
+            else:
+                cmdline.extend(args)
+                cmdline.append(pwd)
+        else:
+            cmdline.extend(self.setup["no_password"])
+
+
+UNRAR_CONFIG = {
+    "open_cmd": ("UNRAR_TOOL", "p", "-inul"),
+    "check_cmd": ("UNRAR_TOOL", "-inul"),
+    "password": "-p",
+    "no_password": ("-p-",),
+    # map return code to exception class, codes from rar.txt
+    "errmap": [None,
+               RarWarning, RarFatalError, RarCRCError, RarLockedArchiveError,    # 1..4
+               RarWriteError, RarOpenError, RarUserError, RarMemoryError,        # 5..8
+               RarCreateError, RarNoFilesError, RarWrongPassword]                # 9..11
+}
+
+# Problems with unar RAR backend:
+# - Does not support RAR2 locked files [fails to read]
+# - Does not support RAR5 Blake2sp hash [reading works]
+UNAR_CONFIG = {
+    "open_cmd": ("UNAR_TOOL", "-q", "-o", "-"),
+    "check_cmd": ("UNAR_TOOL", "-version"),
+    "password": ("-p",),
+    "no_password": ("-p", ""),
+    "errmap": [None],
+}
+
+# Problems with libarchive RAR backend:
+# - Does not support solid archives.
+# - Does not support password-protected archives.
+# - Does not support RARVM-based compression filters.
+BSDTAR_CONFIG = {
+    "open_cmd": ("BSDTAR_TOOL", "-x", "--to-stdout", "-f"),
+    "check_cmd": ("BSDTAR_TOOL", "--version"),
+    "password": None,
+    "no_password": (),
+    "errmap": [None],
+}
+
+CURRENT_SETUP = None
+
+
+def tool_setup(unrar=True, unar=True, bsdtar=True, force=False):
+    """Pick a tool, return cached ToolSetup.
+    """
+    global CURRENT_SETUP
+    if force:
+        CURRENT_SETUP = None
+    if CURRENT_SETUP is not None:
+        return CURRENT_SETUP
+    lst = []
+    if unrar:
+        lst.append(UNRAR_CONFIG)
+    if unar:
+        lst.append(UNAR_CONFIG)
+    if bsdtar:
+        lst.append(BSDTAR_CONFIG)
+
+    for conf in lst:
+        setup = ToolSetup(conf)
+        if setup.check():
+            CURRENT_SETUP = setup
+            break
+    if CURRENT_SETUP is None:
+        raise RarCannotExec("Cannot find working tool")
+    return CURRENT_SETUP
+
+
+def main(args):
+    """Minimal command-line interface for rarfile module.
+    """
+    import argparse
+    p = argparse.ArgumentParser(description=main.__doc__)
+    g = p.add_mutually_exclusive_group(required=True)
+    g.add_argument("-l", "--list", metavar="<rarfile>",
+                   help="Show archive listing")
+    g.add_argument("-e", "--extract", nargs=2,
+                   metavar=("<rarfile>", "<output_dir>"),
+                   help="Extract archive into target dir")
+    g.add_argument("-t", "--test", metavar="<rarfile>",
+                   help="Test if a archive is valid")
+    cmd = p.parse_args(args)
+
+    if cmd.list:
+        with RarFile(cmd.list) as rf:
+            rf.printdir()
+    elif cmd.test:
+        with RarFile(cmd.test) as rf:
+            rf.testrar()
+    elif cmd.extract:
+        with RarFile(cmd.extract[0]) as rf:
+            rf.extractall(cmd.extract[1])
+
+
+if __name__ == "__main__":
+    main(sys.argv[1:])
 
diff --git a/lib/rarfile_py3/rarfile.py b/lib/rarfile_py3/rarfile.py
index a4d7725..13166ca 100644
--- a/lib/rarfile_py3/rarfile.py
+++ b/lib/rarfile_py3/rarfile.py
@@ -1,6 +1,6 @@
 # rarfile.py
 #
-# Copyright (c) 2005-2019  Marko Kreen <markokr@gmail.com>
+# Copyright (c) 2005-2020  Marko Kreen <markokr@gmail.com>
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -14,7 +14,7 @@
 # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-r"""RAR archive reader.
+"""RAR archive reader.
 
 This is Python module for Rar archive reading.  The interface
 is made as :mod:`zipfile`-like as possible.
@@ -47,86 +47,63 @@ by :meth:`RarFile.open`::
                 print(ln.strip())
 
 For decompression to work, either ``unrar`` or ``unar`` tool must be in PATH.
-
 """
 
-##
-## Imports and compat - support various crypto options
-##
-
-import sys
-import os
 import errno
+import io
+import os
+import re
+import shutil
 import struct
-
-from struct import pack, unpack, Struct
-from binascii import crc32 as rar_crc32, hexlify
-from tempfile import mkstemp
-from subprocess import Popen, PIPE, STDOUT
-from io import RawIOBase, BytesIO
-from hashlib import sha1, sha256, blake2s
-from hmac import HMAC
-from datetime import datetime, timedelta, timezone
+import sys
+import warnings
+from binascii import crc32, hexlify
+from datetime import datetime, timezone
+from hashlib import blake2s, pbkdf2_hmac, sha1
 from pathlib import Path
+from struct import Struct, pack, unpack
+from subprocess import DEVNULL, PIPE, STDOUT, Popen
+from tempfile import mkstemp
 
-# only needed for encryped headers
+# only needed for encrypted headers
 try:
     try:
-        from cryptography.hazmat.primitives.ciphers import algorithms, modes, Cipher
         from cryptography.hazmat.backends import default_backend
-        from cryptography.hazmat.primitives import hashes
-        from cryptography.hazmat.primitives.kdf import pbkdf2
-
-        class AES_CBC_Decrypt(object):
-            """Decrypt API"""
-            def __init__(self, key, iv):
-                ciph = Cipher(algorithms.AES(key), modes.CBC(iv), default_backend())
-                self.decrypt = ciph.decryptor().update
-
-        def pbkdf2_sha256(password, salt, iters):
-            """PBKDF2 with HMAC-SHA256"""
-            ctx = pbkdf2.PBKDF2HMAC(hashes.SHA256(), 32, salt, iters, default_backend())
-            return ctx.derive(password)
-
+        from cryptography.hazmat.primitives.ciphers import (
+            Cipher, algorithms, modes,
+        )
+        _have_crypto = 1
     except ImportError:
         from Crypto.Cipher import AES
-        from Crypto.Protocol import KDF
-
-        class AES_CBC_Decrypt(object):
-            """Decrypt API"""
-            def __init__(self, key, iv):
-                self.decrypt = AES.new(key, AES.MODE_CBC, iv).decrypt
-
-        def pbkdf2_sha256(password, salt, iters):
-            """PBKDF2 with HMAC-SHA256"""
-            return KDF.PBKDF2(password, salt, 32, iters, hmac_sha256)
-
-    _have_crypto = 1
+        _have_crypto = 2
 except ImportError:
     _have_crypto = 0
 
 
-def tohex(data):
-    """Return hex string."""
-    return hexlify(data).decode("ascii")
+class AES_CBC_Decrypt:
+    """Decrypt API"""
+    def __init__(self, key, iv):
+        if _have_crypto == 2:
+            self.decrypt = AES.new(key, AES.MODE_CBC, iv).decrypt
+        else:
+            ciph = Cipher(algorithms.AES(key), modes.CBC(iv), default_backend())
+            self.decrypt = ciph.decryptor().update
 
 
-__version__ = "3.1"
+__version__ = "4.1a1"
 
 # export only interesting items
-__all__ = ["is_rarfile", "is_rarfile_sfx", "RarInfo", "RarFile", "RarExtFile"]
+__all__ = ["get_rar_version", "is_rarfile", "is_rarfile_sfx", "RarInfo", "RarFile", "RarExtFile"]
 
 ##
 ## Module configuration.  Can be tuned after importing.
 ##
 
-
 #: executable for unrar tool
 UNRAR_TOOL = "unrar"
 
 #: executable for unar tool
 UNAR_TOOL = "unar"
-LSAR_TOOL = "lsar"
 
 #: executable for bsdtar tool
 BSDTAR_TOOL = "bsdtar"
@@ -146,8 +123,7 @@ HACK_SIZE_LIMIT = 20 * 1024 * 1024
 #: set specific directory for mkstemp() used by hack dir usage
 HACK_TMP_DIR = None
 
-#: Separator for path name components.  RAR internally uses "\\".
-#: Use "/" to be similar with zipfile.
+#: Separator for path name components.  Always "/".
 PATH_SEP = "/"
 
 ##
@@ -155,76 +131,76 @@ PATH_SEP = "/"
 ##
 
 # block types
-RAR_BLOCK_MARK          = 0x72  # r
-RAR_BLOCK_MAIN          = 0x73  # s
-RAR_BLOCK_FILE          = 0x74  # t
-RAR_BLOCK_OLD_COMMENT   = 0x75  # u
-RAR_BLOCK_OLD_EXTRA     = 0x76  # v
-RAR_BLOCK_OLD_SUB       = 0x77  # w
-RAR_BLOCK_OLD_RECOVERY  = 0x78  # x
-RAR_BLOCK_OLD_AUTH      = 0x79  # y
-RAR_BLOCK_SUB           = 0x7a  # z
-RAR_BLOCK_ENDARC        = 0x7b  # {
+RAR_BLOCK_MARK = 0x72           # r
+RAR_BLOCK_MAIN = 0x73           # s
+RAR_BLOCK_FILE = 0x74           # t
+RAR_BLOCK_OLD_COMMENT = 0x75    # u
+RAR_BLOCK_OLD_EXTRA = 0x76      # v
+RAR_BLOCK_OLD_SUB = 0x77        # w
+RAR_BLOCK_OLD_RECOVERY = 0x78   # x
+RAR_BLOCK_OLD_AUTH = 0x79       # y
+RAR_BLOCK_SUB = 0x7a            # z
+RAR_BLOCK_ENDARC = 0x7b         # {
 
 # flags for RAR_BLOCK_MAIN
-RAR_MAIN_VOLUME         = 0x0001
-RAR_MAIN_COMMENT        = 0x0002
-RAR_MAIN_LOCK           = 0x0004
-RAR_MAIN_SOLID          = 0x0008
-RAR_MAIN_NEWNUMBERING   = 0x0010
-RAR_MAIN_AUTH           = 0x0020
-RAR_MAIN_RECOVERY       = 0x0040
-RAR_MAIN_PASSWORD       = 0x0080
-RAR_MAIN_FIRSTVOLUME    = 0x0100
-RAR_MAIN_ENCRYPTVER     = 0x0200
+RAR_MAIN_VOLUME = 0x0001
+RAR_MAIN_COMMENT = 0x0002
+RAR_MAIN_LOCK = 0x0004
+RAR_MAIN_SOLID = 0x0008
+RAR_MAIN_NEWNUMBERING = 0x0010
+RAR_MAIN_AUTH = 0x0020
+RAR_MAIN_RECOVERY = 0x0040
+RAR_MAIN_PASSWORD = 0x0080
+RAR_MAIN_FIRSTVOLUME = 0x0100
+RAR_MAIN_ENCRYPTVER = 0x0200
 
 # flags for RAR_BLOCK_FILE
-RAR_FILE_SPLIT_BEFORE   = 0x0001
-RAR_FILE_SPLIT_AFTER    = 0x0002
-RAR_FILE_PASSWORD       = 0x0004
-RAR_FILE_COMMENT        = 0x0008
-RAR_FILE_SOLID          = 0x0010
-RAR_FILE_DICTMASK       = 0x00e0
-RAR_FILE_DICT64         = 0x0000
-RAR_FILE_DICT128        = 0x0020
-RAR_FILE_DICT256        = 0x0040
-RAR_FILE_DICT512        = 0x0060
-RAR_FILE_DICT1024       = 0x0080
-RAR_FILE_DICT2048       = 0x00a0
-RAR_FILE_DICT4096       = 0x00c0
-RAR_FILE_DIRECTORY      = 0x00e0
-RAR_FILE_LARGE          = 0x0100
-RAR_FILE_UNICODE        = 0x0200
-RAR_FILE_SALT           = 0x0400
-RAR_FILE_VERSION        = 0x0800
-RAR_FILE_EXTTIME        = 0x1000
-RAR_FILE_EXTFLAGS       = 0x2000
+RAR_FILE_SPLIT_BEFORE = 0x0001
+RAR_FILE_SPLIT_AFTER = 0x0002
+RAR_FILE_PASSWORD = 0x0004
+RAR_FILE_COMMENT = 0x0008
+RAR_FILE_SOLID = 0x0010
+RAR_FILE_DICTMASK = 0x00e0
+RAR_FILE_DICT64 = 0x0000
+RAR_FILE_DICT128 = 0x0020
+RAR_FILE_DICT256 = 0x0040
+RAR_FILE_DICT512 = 0x0060
+RAR_FILE_DICT1024 = 0x0080
+RAR_FILE_DICT2048 = 0x00a0
+RAR_FILE_DICT4096 = 0x00c0
+RAR_FILE_DIRECTORY = 0x00e0
+RAR_FILE_LARGE = 0x0100
+RAR_FILE_UNICODE = 0x0200
+RAR_FILE_SALT = 0x0400
+RAR_FILE_VERSION = 0x0800
+RAR_FILE_EXTTIME = 0x1000
+RAR_FILE_EXTFLAGS = 0x2000
 
 # flags for RAR_BLOCK_ENDARC
-RAR_ENDARC_NEXT_VOLUME  = 0x0001
-RAR_ENDARC_DATACRC      = 0x0002
-RAR_ENDARC_REVSPACE     = 0x0004
-RAR_ENDARC_VOLNR        = 0x0008
+RAR_ENDARC_NEXT_VOLUME = 0x0001
+RAR_ENDARC_DATACRC = 0x0002
+RAR_ENDARC_REVSPACE = 0x0004
+RAR_ENDARC_VOLNR = 0x0008
 
 # flags common to all blocks
-RAR_SKIP_IF_UNKNOWN     = 0x4000
-RAR_LONG_BLOCK          = 0x8000
+RAR_SKIP_IF_UNKNOWN = 0x4000
+RAR_LONG_BLOCK = 0x8000
 
 # Host OS types
-RAR_OS_MSDOS = 0
-RAR_OS_OS2   = 1
-RAR_OS_WIN32 = 2
-RAR_OS_UNIX  = 3
-RAR_OS_MACOS = 4
-RAR_OS_BEOS  = 5
+RAR_OS_MSDOS = 0    #: MSDOS (only in RAR3)
+RAR_OS_OS2 = 1      #: OS2 (only in RAR3)
+RAR_OS_WIN32 = 2    #: Windows
+RAR_OS_UNIX = 3     #: UNIX
+RAR_OS_MACOS = 4    #: MacOS (only in RAR3)
+RAR_OS_BEOS = 5     #: BeOS (only in RAR3)
 
 # Compression methods - "0".."5"
-RAR_M0 = 0x30
-RAR_M1 = 0x31
-RAR_M2 = 0x32
-RAR_M3 = 0x33
-RAR_M4 = 0x34
-RAR_M5 = 0x35
+RAR_M0 = 0x30   #: No compression.
+RAR_M1 = 0x31   #: Compression level `-m1` - Fastest compression.
+RAR_M2 = 0x32   #: Compression level `-m2`.
+RAR_M3 = 0x33   #: Compression level `-m3`.
+RAR_M4 = 0x34   #: Compression level `-m4`.
+RAR_M5 = 0x35   #: Compression level `-m5` - Maximum compression.
 
 #
 # RAR5 constants
@@ -273,6 +249,7 @@ RAR5_XTIME_UNIXTIME = 0x01
 RAR5_XTIME_HAS_MTIME = 0x02
 RAR5_XTIME_HAS_CTIME = 0x04
 RAR5_XTIME_HAS_ATIME = 0x08
+RAR5_XTIME_UNIXTIME_NS = 0x10
 
 RAR5_XENC_CIPHER_AES256 = 0
 
@@ -297,35 +274,34 @@ RAR5_XOWNER_GID = 0x08
 RAR5_OS_WINDOWS = 0
 RAR5_OS_UNIX = 1
 
+DOS_MODE_ARCHIVE = 0x20
+DOS_MODE_DIR = 0x10
+DOS_MODE_SYSTEM = 0x04
+DOS_MODE_HIDDEN = 0x02
+DOS_MODE_READONLY = 0x01
+
 ##
 ## internal constants
 ##
 
 RAR_ID = b"Rar!\x1a\x07\x00"
 RAR5_ID = b"Rar!\x1a\x07\x01\x00"
-ZERO = b"\0"
-EMPTY = b""
-UTC = timezone(timedelta(0), "UTC")
-BSIZE = 32 * 1024
+
+WIN32 = sys.platform == "win32"
+BSIZE = 512 * 1024 if WIN32 else 64 * 1024
 
 SFX_MAX_SIZE = 2 * 1024 * 1024
 RAR_V3 = 3
 RAR_V5 = 5
 
-def _get_rar_version(xfile):
-    """Check quickly whether file is rar archive.
-    """
-    with XFile(xfile) as fd:
-        buf = fd.read(len(RAR5_ID))
-    if buf.startswith(RAR_ID):
-        return RAR_V3
-    elif buf.startswith(RAR5_ID):
-        return RAR_V5
-    return 0
+_BAD_CHARS = r"""\x00-\x1F<>|"?*"""
+RC_BAD_CHARS_UNIX = re.compile(r"[%s]" % _BAD_CHARS)
+RC_BAD_CHARS_WIN32 = re.compile(r"[%s:^\\]" % _BAD_CHARS)
+
 
 def _find_sfx_header(xfile):
     sig = RAR_ID[:-1]
-    buf = BytesIO()
+    buf = io.BytesIO()
     steps = (64, SFX_MAX_SIZE)
 
     with XFile(xfile) as fd:
@@ -340,21 +316,40 @@ def _find_sfx_header(xfile):
                 pos = curdata.find(sig, findpos)
                 if pos < 0:
                     break
-                if curdata[pos:pos+len(RAR_ID)] == RAR_ID:
+                if curdata[pos:pos + len(RAR_ID)] == RAR_ID:
                     return RAR_V3, pos
-                if curdata[pos:pos+len(RAR5_ID)] == RAR5_ID:
+                if curdata[pos:pos + len(RAR5_ID)] == RAR5_ID:
                     return RAR_V5, pos
                 findpos = pos + len(sig)
     return 0, 0
 
+
 ##
 ## Public interface
 ##
 
+
+def get_rar_version(xfile):
+    """Check quickly whether file is rar archive.
+    """
+    with XFile(xfile) as fd:
+        buf = fd.read(len(RAR5_ID))
+    if buf.startswith(RAR_ID):
+        return RAR_V3
+    elif buf.startswith(RAR5_ID):
+        return RAR_V5
+    return 0
+
+
 def is_rarfile(xfile):
     """Check quickly whether file is rar archive.
     """
-    return _get_rar_version(xfile) > 0
+    try:
+        return get_rar_version(xfile) > 0
+    except OSError:
+        # File not found or not accessible, ignore
+        return False
+
 
 def is_rarfile_sfx(xfile):
     """Check whether file is rar archive with support for SFX.
@@ -363,84 +358,124 @@ def is_rarfile_sfx(xfile):
     """
     return _find_sfx_header(xfile)[0] > 0
 
+
 class Error(Exception):
     """Base class for rarfile errors."""
 
+
 class BadRarFile(Error):
     """Incorrect data in archive."""
 
+
 class NotRarFile(Error):
     """The file is not RAR archive."""
 
+
 class BadRarName(Error):
     """Cannot guess multipart name components."""
 
+
 class NoRarEntry(Error):
     """File not found in RAR"""
 
+
 class PasswordRequired(Error):
     """File requires password"""
 
+
 class NeedFirstVolume(Error):
-    """Need to start from first volume."""
+    """Need to start from first volume.
+
+    Attributes:
+
+        current_volume
+            Volume number of current file or None if not known
+    """
+    def __init__(self, msg, volume):
+        super().__init__(msg)
+        self.current_volume = volume
+
 
 class NoCrypto(Error):
     """Cannot parse encrypted headers - no crypto available."""
 
+
 class RarExecError(Error):
     """Problem reported by unrar/rar."""
 
+
 class RarWarning(RarExecError):
     """Non-fatal error"""
 
+
 class RarFatalError(RarExecError):
     """Fatal error"""
 
+
 class RarCRCError(RarExecError):
     """CRC error during unpacking"""
 
+
 class RarLockedArchiveError(RarExecError):
     """Must not modify locked archive"""
 
+
 class RarWriteError(RarExecError):
     """Write error"""
 
+
 class RarOpenError(RarExecError):
     """Open error"""
 
+
 class RarUserError(RarExecError):
     """User error"""
 
+
 class RarMemoryError(RarExecError):
     """Memory error"""
 
+
 class RarCreateError(RarExecError):
     """Create error"""
 
+
 class RarNoFilesError(RarExecError):
     """No files that match pattern were found"""
 
+
 class RarUserBreak(RarExecError):
     """User stop"""
 
+
 class RarWrongPassword(RarExecError):
     """Incorrect password"""
 
+
 class RarUnknownError(RarExecError):
     """Unknown exit code"""
 
+
 class RarSignalExit(RarExecError):
     """Unrar exited with signal"""
 
+
 class RarCannotExec(RarExecError):
     """Executable not found."""
 
 
-class RarInfo(object):
+class UnsupportedWarning(UserWarning):
+    """Archive uses feature that are unsupported by rarfile.
+
+    .. versionadded:: 4.0
+    """
+
+
+class RarInfo:
     r"""An entry in rar archive.
 
-    RAR3 extended timestamps are :class:`datetime.datetime` objects without timezone.
-    RAR5 extended timestamps are :class:`datetime.datetime` objects with UTC timezone.
+    Timestamps as :class:`~datetime.datetime` are without timezone in RAR3,
+    with UTC timezone in RAR5 archives.
 
     Attributes:
 
@@ -452,6 +487,9 @@ class RarInfo(object):
             File modification timestamp.   As tuple of (year, month, day, hour, minute, second).
             RAR5 allows archives where it is missing, it's None then.
 
+        comment
+            Optional file comment field.  Unicode string.  (RAR3-only)
+
         file_size
             Uncompressed size.
 
@@ -482,16 +520,16 @@ class RarInfo(object):
 
         mtime
             File modification time.  Same value as :attr:`date_time`
-            but as :class:`datetime.datetime` object with extended precision.
+            but as :class:`~datetime.datetime` object with extended precision.
 
         ctime
-            Optional time field: creation time.  As :class:`datetime.datetime` object.
+            Optional time field: creation time.  As :class:`~datetime.datetime` object.
 
         atime
-            Optional time field: last access time.  As :class:`datetime.datetime` object.
+            Optional time field: last access time.  As :class:`~datetime.datetime` object.
 
         arctime
-            Optional time field: archival time.  As :class:`datetime.datetime` object.
+            Optional time field: archival time.  As :class:`~datetime.datetime` object.
             (RAR3-only)
 
         CRC
@@ -502,8 +540,11 @@ class RarInfo(object):
         blake2sp_hash
             Blake2SP hash over decompressed data.  (RAR5-only)
 
-        comment
-            Optional file comment field.  Unicode string.  (RAR3-only)
+        volume
+            Volume nr, starting from 0.
+
+        volume_file
+            Volume file name, where file starts.
 
         file_redir
             If not None, file is link of some sort.  Contains tuple of (type, flags, target).
@@ -512,24 +553,20 @@ class RarInfo(object):
             Type is one of constants:
 
                 :data:`RAR5_XREDIR_UNIX_SYMLINK`
-                    unix symlink to target.
+                    Unix symlink.
                 :data:`RAR5_XREDIR_WINDOWS_SYMLINK`
-                    windows symlink to target.
+                    Windows symlink.
                 :data:`RAR5_XREDIR_WINDOWS_JUNCTION`
-                    windows junction.
+                    Windows junction.
                 :data:`RAR5_XREDIR_HARD_LINK`
-                    hard link to target.
+                    Hard link to target.
                 :data:`RAR5_XREDIR_FILE_COPY`
-                    current file is copy of another archive entry.
+                    Current file is copy of another archive entry.
 
-            Flags may contain :data:`RAR5_XREDIR_ISDIR` bit.
-
-        volume
-            Volume nr, starting from 0.
-
-        volume_file
-            Volume file name, where file starts.
+            Flags may contain bits:
 
+                :data:`RAR5_XREDIR_ISDIR`
+                    Symlink points to directory.
     """
 
     # zipfile-compatible fields
@@ -537,7 +574,6 @@ class RarInfo(object):
     file_size = None
     compress_size = None
     date_time = None
-    comment = None
     CRC = None
     volume = None
     orig_filename = None
@@ -564,11 +600,26 @@ class RarInfo(object):
     flags = 0
     type = None
 
-    def isdir(self):
+    # zipfile compat
+    def is_dir(self):
         """Returns True if entry is a directory.
+
+        .. versionadded:: 4.0
+        """
+        return False
+
+    def is_symlink(self):
+        """Returns True if entry is a symlink.
+
+        .. versionadded:: 4.0
+        """
+        return False
+
+    def is_file(self):
+        """Returns True if entry is a normal file.
+
+        .. versionadded:: 4.0
         """
-        if self.type == RAR_BLOCK_FILE:
-            return (self.flags & RAR_FILE_DIRECTORY) == RAR_FILE_DIRECTORY
         return False
 
     def needs_password(self):
@@ -578,22 +629,32 @@ class RarInfo(object):
             return (self.flags & RAR_FILE_PASSWORD) > 0
         return False
 
+    def isdir(self):
+        """Returns True if entry is a directory.
 
-class RarFile(object):
+        .. deprecated:: 4.0
+        """
+        return self.is_dir()
+
+
+class RarFile:
     """Parse RAR structure, provide access to files in archive.
     """
 
+    #: File name, if available.  Unicode string or None.
+    filename = None
+
     #: Archive comment.  Unicode string or None.
     comment = None
 
-    def __init__(self, rarfile, mode="r", charset=None, info_callback=None,
-                 crc_check=True, errors="stop"):
+    def __init__(self, file, mode="r", charset=None, info_callback=None,
+                 crc_check=True, errors="stop", part_only=False):
         """Open and parse a RAR archive.
 
         Parameters:
 
-            rarfile
-                archive file name
+            file
+                archive file name or file-like object.
             mode
                 only "r" is supported.
             charset
@@ -605,15 +666,22 @@ class RarFile(object):
             errors
                 Either "stop" to quietly stop parsing on errors,
                 or "strict" to raise errors.  Default is "stop".
+            part_only
+                If True, read only single file and allow it to be middle-part
+                of multi-volume archive.
         """
-        if isinstance(rarfile, Path):
-            self._rarfile = str(rarfile)
+        if is_filelike(file):
+            self.filename = getattr(file, "name", None)
         else:
-            self._rarfile = rarfile
+            if isinstance(file, Path):
+                file = str(file)
+            self.filename = file
+        self._rarfile = file
 
         self._charset = charset or DEFAULT_CHARSET
         self._info_callback = info_callback
         self._crc_check = crc_check
+        self._part_only = part_only
         self._password = None
         self._file_parser = None
 
@@ -634,13 +702,17 @@ class RarFile(object):
         return self
 
     def __exit__(self, typ, value, traceback):
-        """Exit context"""
+        """Exit context."""
         self.close()
 
-    def setpassword(self, password):
+    def __iter__(self):
+        """Iterate over members."""
+        return iter(self.infolist())
+
+    def setpassword(self, pwd):
         """Sets the password to use when extracting.
         """
-        self._password = password
+        self._password = pwd
         if self._file_parser:
             if self._file_parser.has_header_encryption():
                 self._file_parser = None
@@ -672,12 +744,12 @@ class RarFile(object):
         """
         return self._file_parser.volumelist()
 
-    def getinfo(self, fname):
+    def getinfo(self, name):
         """Return RarInfo for file.
         """
-        return self._file_parser.getinfo(fname)
+        return self._file_parser.getinfo(name)
 
-    def open(self, fname, mode="r", psw=None):
+    def open(self, name, mode="r", pwd=None):
         """Returns file-like object (:class:`RarExtFile`) from where the data can be read.
 
         The object implements :class:`io.RawIOBase` interface, so it can
@@ -693,11 +765,11 @@ class RarFile(object):
 
         Parameters:
 
-            fname
+            name
                 file name or RarInfo instance.
             mode
                 must be "r"
-            psw
+            pwd
                 password to use for extracting.
         """
 
@@ -705,44 +777,47 @@ class RarFile(object):
             raise NotImplementedError("RarFile.open() supports only mode=r")
 
         # entry lookup
-        inf = self.getinfo(fname)
-        if inf.isdir():
-            raise TypeError("Directory does not have any data: " + inf.filename)
+        inf = self.getinfo(name)
+        if inf.is_dir():
+            raise io.UnsupportedOperation("Directory does not have any data: " + inf.filename)
 
         # check password
         if inf.needs_password():
-            psw = psw or self._password
-            if psw is None:
+            pwd = pwd or self._password
+            if pwd is None:
                 raise PasswordRequired("File %s requires password" % inf.filename)
         else:
-            psw = None
+            pwd = None
 
-        return self._file_parser.open(inf, psw)
+        return self._file_parser.open(inf, pwd)
 
-    def read(self, fname, psw=None):
+    def read(self, name, pwd=None):
         """Return uncompressed data for archive entry.
 
-        For longer files using :meth:`RarFile.open` may be better idea.
+        For longer files using :meth:`~RarFile.open` may be better idea.
 
         Parameters:
 
-            fname
+            name
                 filename or RarInfo instance
-            psw
+            pwd
                 password to use for extracting.
         """
 
-        with self.open(fname, "r", psw) as f:
+        with self.open(name, "r", pwd) as f:
             return f.read()
 
     def close(self):
         """Release open resources."""
         pass
 
-    def printdir(self):
-        """Print archive file list to stdout."""
+    def printdir(self, file=None):
+        """Print archive file list to stdout or given file.
+        """
+        if file is None:
+            file = sys.stdout
         for f in self.infolist():
-            print(f.filename)
+            print(f.filename, file=file)
 
     def extract(self, member, path=None, pwd=None):
         """Extract single file into current directory.
@@ -756,13 +831,8 @@ class RarFile(object):
             pwd
                 optional password to use
         """
-        if isinstance(member, RarInfo):
-            fname = member.filename
-        elif isinstance(member, Path):
-            fname = str(member)
-        else:
-            fname = member
-        self._extract([fname], path, pwd)
+        inf = self.getinfo(member)
+        return self._extract_one(inf, path, pwd, True)
 
     def extractall(self, path=None, members=None, pwd=None):
         """Extract all files into current directory.
@@ -776,24 +846,30 @@ class RarFile(object):
             pwd
                 optional password to use
         """
-        fnlist = []
-        if members is not None:
-            for m in members:
-                if isinstance(m, RarInfo):
-                    fnlist.append(m.filename)
-                else:
-                    fnlist.append(m)
-        self._extract(fnlist, path, pwd)
-
-    def testrar(self):
-        """Let "unrar" test the archive.
+        if members is None:
+            members = self.namelist()
+
+        done = set()
+        dirs = []
+        for m in members:
+            inf = self.getinfo(m)
+            dst = self._extract_one(inf, path, pwd, not inf.is_dir())
+            if inf.is_dir():
+                if dst not in done:
+                    dirs.append((dst, inf))
+                    done.add(dst)
+        if dirs:
+            dirs.sort(reverse=True)
+            for dst, inf in dirs:
+                self._set_attrs(inf, dst)
+
+    def testrar(self, pwd=None):
+        """Read all files and test CRC.
         """
-        setup = tool_setup()
-        with XTempFile(self._rarfile) as rarfile:
-            cmd = setup.test_cmdline(self._password, rarfile)
-            p = custom_popen(cmd)
-            output = p.communicate()[0]
-            check_returncode(p, output)
+        for member in self.infolist():
+            if member.is_file():
+                with self.open(member, 'r', pwd) as f:
+                    empty_read(f, member.file_size, BSIZE)
 
     def strerror(self):
         """Return error string if parsing failed or None if no problems.
@@ -807,49 +883,106 @@ class RarFile(object):
     ##
 
     def _parse(self):
+        """Run parser for file type
+        """
         ver, sfx_ofs = _find_sfx_header(self._rarfile)
         if ver == RAR_V3:
             p3 = RAR3Parser(self._rarfile, self._password, self._crc_check,
                             self._charset, self._strict, self._info_callback,
-                            sfx_ofs)
+                            sfx_ofs, self._part_only)
             self._file_parser = p3  # noqa
         elif ver == RAR_V5:
             p5 = RAR5Parser(self._rarfile, self._password, self._crc_check,
                             self._charset, self._strict, self._info_callback,
-                            sfx_ofs)
+                            sfx_ofs, self._part_only)
             self._file_parser = p5  # noqa
         else:
-            raise BadRarFile("Not a RAR file")
+            raise NotRarFile("Not a RAR file")
 
         self._file_parser.parse()
         self.comment = self._file_parser.comment
 
-    # call unrar to extract a file
-    def _extract(self, fnlist, path=None, psw=None):
-        setup = tool_setup()
+    def _extract_one(self, info, path, pwd, set_attrs):
+        fname = sanitize_filename(
+            info.filename, os.path.sep, WIN32
+        )
+
+        if path is None:
+            path = os.getcwd()
+        else:
+            path = os.fspath(path)
+        dstfn = os.path.join(path, fname)
+
+        dirname = os.path.dirname(dstfn)
+        if dirname and dirname != ".":
+            os.makedirs(dirname, exist_ok=True)
+
+        if info.is_file():
+            return self._make_file(info, dstfn, pwd, set_attrs)
+        if info.is_dir():
+            return self._make_dir(info, dstfn, pwd, set_attrs)
+        if info.is_symlink():
+            return self._make_symlink(info, dstfn, pwd, set_attrs)
+        return None
 
-        if os.sep != PATH_SEP:
-            fnlist = [fn.replace(PATH_SEP, os.sep) for fn in fnlist]
+    def _create_helper(self, name, flags, info):
+        return os.open(name, flags)
+
+    def _make_file(self, info, dstfn, pwd, set_attrs):
+        def helper(name, flags):
+            return self._create_helper(name, flags, info)
+        with self.open(info, "r", pwd) as src:
+            with open(dstfn, "wb", opener=helper) as dst:
+                shutil.copyfileobj(src, dst)
+        if set_attrs:
+            self._set_attrs(info, dstfn)
+        return dstfn
+
+    def _make_dir(self, info, dstfn, pwd, set_attrs):
+        os.makedirs(dstfn, exist_ok=True)
+        if set_attrs:
+            self._set_attrs(info, dstfn)
+        return dstfn
+
+    def _make_symlink(self, info, dstfn, pwd, set_attrs):
+        target_is_directory = False
+        if info.host_os == RAR_OS_UNIX:
+            link_name = self.read(info, pwd)
+            target_is_directory = (info.flags & RAR_FILE_DIRECTORY) == RAR_FILE_DIRECTORY
+        elif info.file_redir:
+            redir_type, redir_flags, link_name = info.file_redir
+            if redir_type == RAR5_XREDIR_WINDOWS_JUNCTION:
+                warnings.warn(f"Windows junction not supported - {info.filename}", UnsupportedWarning)
+                return None
+            target_is_directory = (redir_type & RAR5_XREDIR_ISDIR) > 0
+        else:
+            warnings.warn(f"Unsupported link type - {info.filename}", UnsupportedWarning)
+            return None
 
-        if path and isinstance(path, Path):
-            path = str(path)
+        os.symlink(link_name, dstfn, target_is_directory=target_is_directory)
+        return dstfn
 
-        psw = psw or self._password
+    def _set_attrs(self, info, dstfn):
+        if info.host_os == RAR_OS_UNIX:
+            os.chmod(dstfn, info.mode & 0o777)
+        elif info.host_os in (RAR_OS_WIN32, RAR_OS_MSDOS):
+            # only keep R/O attr, except for dirs on win32
+            if info.mode & DOS_MODE_READONLY and (info.is_file() or not WIN32):
+                st = os.stat(dstfn)
+                new_mode = st.st_mode & ~0o222
+                os.chmod(dstfn, new_mode)
 
-        # rar file
-        with XTempFile(self._rarfile) as rarfn:
-            cmd = setup.extract_cmdline(psw, rarfn, fnlist, path)
+        if info.mtime:
+            mtime_ns = to_nsecs(info.mtime)
+            atime_ns = to_nsecs(info.atime) if info.atime else mtime_ns
+            os.utime(dstfn, ns=(atime_ns, mtime_ns))
 
-            # call
-            p = custom_popen(cmd)
-            output = p.communicate()[0]
-            check_returncode(p, output)
 
 #
 # File format parsing
 #
 
-class CommonParser(object):
+class CommonParser:
     """Shared parser parts."""
     _main = None
     _hdrenc_main = None
@@ -860,7 +993,8 @@ class CommonParser(object):
     _password = None
     comment = None
 
-    def __init__(self, rarfile, password, crc_check, charset, strict, info_cb, sfx_offset):
+    def __init__(self, rarfile, password, crc_check, charset, strict,
+                 info_cb, sfx_offset, part_only):
         self._rarfile = rarfile
         self._password = password
         self._crc_check = crc_check
@@ -871,6 +1005,7 @@ class CommonParser(object):
         self._info_map = {}
         self._vol_list = []
         self._sfx_offset = sfx_offset
+        self._part_only = part_only
 
     def has_header_encryption(self):
         """Returns True if headers are encrypted
@@ -882,9 +1017,9 @@ class CommonParser(object):
                 return True
         return False
 
-    def setpassword(self, psw):
+    def setpassword(self, pwd):
         """Set cached password."""
-        self._password = psw
+        self._password = pwd
 
     def volumelist(self):
         """Volume files"""
@@ -913,21 +1048,14 @@ class CommonParser(object):
         else:
             fname = member
 
-        # accept both ways here
-        if PATH_SEP == "/":
-            fname2 = fname.replace("\\", "/")
-        else:
-            fname2 = fname.replace("/", "\\")
+        if fname.endswith("/"):
+            fname = fname.rstrip("/")
 
         try:
             return self._info_map[fname]
         except KeyError:
-            try:
-                return self._info_map[fname2]
-            except KeyError:
-                raise NoRarEntry("No such file: %s" % fname)
+            raise NoRarEntry("No such file: %s" % fname) from None
 
-    # read rar
     def parse(self):
         """Process file."""
         self._fd = None
@@ -939,13 +1067,13 @@ class CommonParser(object):
                 self._fd = None
 
     def _parse_real(self):
+        """Actually read file.
+        """
         fd = XFile(self._rarfile)
         self._fd = fd
         fd.seek(self._sfx_offset, 0)
         sig = fd.read(len(self._expect_sig))
         if sig != self._expect_sig:
-            if isinstance(self._rarfile, str):
-                raise NotRarFile("Not a Rar archive: {}".format(self._rarfile))
             raise NotRarFile("Not a Rar archive")
 
         volume = 0  # first vol (.rar) is 0
@@ -953,13 +1081,17 @@ class CommonParser(object):
         endarc = False
         volfile = self._rarfile
         self._vol_list = [self._rarfile]
-        while 1:
+        raise_need_first_vol = False
+        while True:
             if endarc:
                 h = None    # don"t read past ENDARC
             else:
                 h = self._parse_header(fd)
             if not h:
-                if more_vols:
+                if raise_need_first_vol:
+                    # did not find ENDARC with VOLNR
+                    raise NeedFirstVolume("Need to start from first volume", None)
+                if more_vols and not self._part_only:
                     volume += 1
                     fd.close()
                     try:
@@ -984,7 +1116,7 @@ class CommonParser(object):
 
             if h.type == RAR_BLOCK_MAIN and not self._main:
                 self._main = h
-                if volume == 0 and (h.flags & RAR_MAIN_NEWNUMBERING):
+                if volume == 0 and (h.flags & RAR_MAIN_NEWNUMBERING) and not self._part_only:
                     # RAR 2.x does not set FIRSTVOLUME,
                     # so check it only if NEWNUMBERING is used
                     if (h.flags & RAR_MAIN_FIRSTVOLUME) == 0:
@@ -992,9 +1124,11 @@ class CommonParser(object):
                             # rar5 may have more info
                             raise NeedFirstVolume(
                                 "Need to start from first volume (current: %r)"
-                                % (h.main_volume_number,)
+                                % (h.main_volume_number,),
+                                h.main_volume_number
                             )
-                        raise NeedFirstVolume("Need to start from first volume")
+                        # delay raise until we have volnr from ENDARC
+                        raise_need_first_vol = True
                 if h.flags & RAR_MAIN_PASSWORD:
                     self._needs_password = True
                     if not self._password:
@@ -1002,13 +1136,20 @@ class CommonParser(object):
             elif h.type == RAR_BLOCK_ENDARC:
                 more_vols = (h.flags & RAR_ENDARC_NEXT_VOLUME) > 0
                 endarc = True
+                if raise_need_first_vol and (h.flags & RAR_ENDARC_VOLNR) > 0:
+                    raise NeedFirstVolume(
+                        "Need to start from first volume (current: %r)"
+                        % (h.endarc_volnr,),
+                        h.endarc_volnr
+                    )
             elif h.type == RAR_BLOCK_FILE:
                 # RAR 2.x does not write RAR_BLOCK_ENDARC
                 if h.flags & RAR_FILE_SPLIT_AFTER:
                     more_vols = True
                 # RAR 2.x does not set RAR_MAIN_FIRSTVOLUME
                 if volume == 0 and h.flags & RAR_FILE_SPLIT_BEFORE:
-                    raise NeedFirstVolume("Need to start from first volume")
+                    if not self._part_only:
+                        raise_need_first_vol = True
 
             if h.needs_password():
                 self._needs_password = True
@@ -1033,11 +1174,12 @@ class CommonParser(object):
     def _parse_block_header(self, fd):
         raise NotImplementedError("_parse_block_header")
 
-    def _open_hack(self, inf, psw):
+    def _open_hack(self, inf, pwd):
         raise NotImplementedError("_open_hack")
 
-    # read single header
     def _parse_header(self, fd):
+        """Read single header
+        """
         try:
             # handle encrypted headers
             if (self._main and self._main.flags & RAR_MAIN_PASSWORD) or self._hdrenc_main:
@@ -1051,8 +1193,9 @@ class CommonParser(object):
             self._set_error("Broken header in RAR file")
             return None
 
-    # given current vol name, construct next one
     def _next_volname(self, volfile):
+        """Given current vol name, construct next one
+        """
         if is_filelike(volfile):
             raise IOError("Working on single FD")
         if self._main.flags & RAR_MAIN_NEWNUMBERING:
@@ -1066,18 +1209,23 @@ class CommonParser(object):
         if self._strict:
             raise BadRarFile(msg)
 
-    def open(self, inf, psw):
+    def open(self, inf, pwd):
         """Return stream object for file data."""
 
         if inf.file_redir:
+            redir_type, redir_flags, redir_name = inf.file_redir
             # cannot leave to unrar as it expects copied file to exist
-            if inf.file_redir[0] in (RAR5_XREDIR_FILE_COPY, RAR5_XREDIR_HARD_LINK):
-                inf = self.getinfo(inf.file_redir[2])
+            if redir_type in (RAR5_XREDIR_FILE_COPY, RAR5_XREDIR_HARD_LINK):
+                inf = self.getinfo(redir_name)
                 if not inf:
                     raise BadRarFile("cannot find copied file")
-
+            elif redir_type in (
+                RAR5_XREDIR_UNIX_SYMLINK, RAR5_XREDIR_WINDOWS_SYMLINK,
+                RAR5_XREDIR_WINDOWS_JUNCTION,
+            ):
+                return io.BytesIO(redir_name.encode("utf8"))
         if inf.flags & RAR_FILE_SPLIT_BEFORE:
-            raise NeedFirstVolume("Partial file, please start from first volume: " + inf.filename)
+            raise NeedFirstVolume("Partial file, please start from first volume: " + inf.filename, None)
 
         # is temp write usable?
         use_hack = 1
@@ -1098,16 +1246,16 @@ class CommonParser(object):
         if inf.compress_type == RAR_M0 and (inf.flags & RAR_FILE_PASSWORD) == 0 and inf.file_redir is None:
             return self._open_clear(inf)
         elif use_hack:
-            return self._open_hack(inf, psw)
+            return self._open_hack(inf, pwd)
         elif is_filelike(self._rarfile):
-            return self._open_unrar_membuf(self._rarfile, inf, psw)
+            return self._open_unrar_membuf(self._rarfile, inf, pwd)
         else:
-            return self._open_unrar(self._rarfile, inf, psw)
+            return self._open_unrar(self._rarfile, inf, pwd)
 
     def _open_clear(self, inf):
         return DirectReader(self, inf)
 
-    def _open_hack_core(self, inf, psw, prefix, suffix):
+    def _open_hack_core(self, inf, pwd, prefix, suffix):
 
         size = inf.compress_size + inf.header_size
         rf = XFile(inf.volume_file, 0)
@@ -1130,34 +1278,35 @@ class CommonParser(object):
             tmpf.write(suffix)
             tmpf.close()
             rf.close()
-        except:
+        except BaseException:
             rf.close()
             tmpf.close()
             os.unlink(tmpname)
             raise
 
-        return self._open_unrar(tmpname, inf, psw, tmpname)
+        return self._open_unrar(tmpname, inf, pwd, tmpname)
 
-    # write in-memory archive to temp file - needed for solid archives
-    def _open_unrar_membuf(self, memfile, inf, psw):
+    def _open_unrar_membuf(self, memfile, inf, pwd):
+        """Write in-memory archive to temp file, needed for solid archives.
+        """
         tmpname = membuf_tempfile(memfile)
-        return self._open_unrar(tmpname, inf, psw, tmpname, force_file=True)
+        return self._open_unrar(tmpname, inf, pwd, tmpname, force_file=True)
 
-    # extract using unrar
-    def _open_unrar(self, rarfile, inf, psw=None, tmpfile=None, force_file=False):
+    def _open_unrar(self, rarfile, inf, pwd=None, tmpfile=None, force_file=False):
+        """Extract using unrar
+        """
         setup = tool_setup()
 
         # not giving filename avoids encoding related problems
         fn = None
         if not tmpfile or force_file:
             fn = inf.filename
-            if PATH_SEP != os.sep:
-                fn = fn.replace(PATH_SEP, os.sep)
 
         # read from unrar pipe
-        cmd = setup.open_cmdline(psw, rarfile, fn)
+        cmd = setup.open_cmdline(pwd, rarfile, fn)
         return PipeReader(self, inf, cmd, tmpfile)
 
+
 #
 # RAR3 format
 #
@@ -1173,11 +1322,15 @@ class Rar3Info(RarInfo):
     data_offset = None
     _md_class = None
     _md_expect = None
+    _name_size = None
 
     # make sure some rar5 fields are always present
     file_redir = None
     blake2sp_hash = None
 
+    endarc_datacrc = None
+    endarc_volnr = None
+
     def _must_disable_hack(self):
         if self.type == RAR_BLOCK_FILE:
             if self.flags & RAR_FILE_PASSWORD:
@@ -1189,6 +1342,27 @@ class Rar3Info(RarInfo):
                 return True
         return False
 
+    def is_dir(self):
+        """Returns True if entry is a directory."""
+        if self.type == RAR_BLOCK_FILE and not self.is_symlink():
+            return (self.flags & RAR_FILE_DIRECTORY) == RAR_FILE_DIRECTORY
+        return False
+
+    def is_symlink(self):
+        """Returns True if entry is a symlink."""
+        return (
+            self.type == RAR_BLOCK_FILE and
+            self.host_os == RAR_OS_UNIX and
+            self.mode & 0xF000 == 0xA000
+        )
+
+    def is_file(self):
+        """Returns True if entry is a normal file."""
+        return (
+            self.type == RAR_BLOCK_FILE and
+            not (self.is_dir() or self.is_symlink())
+        )
+
 
 class RAR3Parser(CommonParser):
     """Parse RAR3 file format.
@@ -1207,8 +1381,9 @@ class RAR3Parser(CommonParser):
             self._last_aes_key = (salt, key, iv)
         return HeaderDecrypt(fd, key, iv)
 
-    # common header
     def _parse_block_header(self, fd):
+        """Parse common block header
+        """
         h = Rar3Info()
         h.header_offset = fd.tell()
 
@@ -1216,6 +1391,9 @@ class RAR3Parser(CommonParser):
         buf = fd.read(S_BLK_HDR.size)
         if not buf:
             return None
+        if len(buf) < S_BLK_HDR.size:
+            self._set_error("Unexpected EOF when reading header")
+            return None
         t = S_BLK_HDR.unpack_from(buf)
         h.header_crc, h.type, h.flags, h.header_size = t
 
@@ -1263,6 +1441,13 @@ class RAR3Parser(CommonParser):
         elif h.type == RAR_BLOCK_OLD_EXTRA:
             pos += 7
             crc_pos = pos
+        elif h.type == RAR_BLOCK_ENDARC:
+            if h.flags & RAR_ENDARC_DATACRC:
+                h.endarc_datacrc, pos = load_le32(hdata, pos)
+            if h.flags & RAR_ENDARC_VOLNR:
+                h.endarc_volnr = S_SHORT.unpack_from(hdata, pos)[0]
+                pos += 2
+            crc_pos = h.header_size
         else:
             crc_pos = h.header_size
 
@@ -1272,7 +1457,7 @@ class RAR3Parser(CommonParser):
         else:
             crcdat = hdata[2:crc_pos]
 
-        calc_crc = rar_crc32(crcdat) & 0xFFFF
+        calc_crc = crc32(crcdat) & 0xFFFF
 
         # return good header
         if h.header_crc == calc_crc:
@@ -1285,8 +1470,9 @@ class RAR3Parser(CommonParser):
         # instead panicing, send eof
         return None
 
-    # read file-specific header
     def _parse_file_header(self, h, hdata, pos):
+        """Read file-specific header
+        """
         fld = S_FILE_HDR.unpack_from(hdata, pos)
         pos += S_FILE_HDR.size
 
@@ -1298,7 +1484,7 @@ class RAR3Parser(CommonParser):
         h.mtime = to_datetime(h.date_time)
         h.extract_version = fld[5]
         h.compress_type = fld[6]
-        name_size = fld[7]
+        h._name_size = name_size = fld[7]
         h.mode = fld[8]
 
         h._md_class = CRC32Context
@@ -1312,8 +1498,9 @@ class RAR3Parser(CommonParser):
             h.add_size = h.compress_size
 
         name, pos = load_bytes(hdata, name_size, pos)
-        if h.flags & RAR_FILE_UNICODE:
-            nul = name.find(ZERO)
+        if h.flags & RAR_FILE_UNICODE and b"\0" in name:
+            # stored in custom encoding
+            nul = name.find(b"\0")
             h.orig_filename = name[:nul]
             u = UnicodeFilename(h.orig_filename, name[nul + 1:])
             h.filename = u.decode()
@@ -1321,13 +1508,19 @@ class RAR3Parser(CommonParser):
             # if parsing failed fall back to simple name
             if u.failed:
                 h.filename = self._decode(h.orig_filename)
+        elif h.flags & RAR_FILE_UNICODE:
+            # stored in UTF8
+            h.orig_filename = name
+            h.filename = name.decode("utf8", "replace")
         else:
+            # stored in random encoding
             h.orig_filename = name
             h.filename = self._decode(name)
 
-        # change separator, if requested
-        if PATH_SEP != "\\":
-            h.filename = h.filename.replace("\\", PATH_SEP)
+        # change separator, set dir suffix
+        h.filename = h.filename.replace("\\", "/").rstrip("/")
+        if h.is_dir():
+            h.filename = h.filename + "/"
 
         if h.flags & RAR_FILE_SALT:
             h.salt, pos = load_bytes(hdata, 8, pos)
@@ -1342,8 +1535,9 @@ class RAR3Parser(CommonParser):
 
         return pos
 
-    # find old-style comment subblock
     def _parse_subblocks(self, h, hdata, pos):
+        """Find old-style comment subblock
+        """
         while pos < len(hdata):
             # ordinary block header
             t = S_BLK_HDR.unpack_from(hdata, pos)
@@ -1359,18 +1553,16 @@ class RAR3Parser(CommonParser):
             if stype == RAR_BLOCK_OLD_COMMENT and pos + S_COMMENT_HDR.size <= pos_next:
                 declen, ver, meth, crc = S_COMMENT_HDR.unpack_from(hdata, pos)
                 pos += S_COMMENT_HDR.size
-                data = hdata[pos : pos_next]
+                data = hdata[pos: pos_next]
                 cmt = rar3_decompress(ver, meth, data, declen, sflags,
                                       crc, self._password)
-                if not self._crc_check:
-                    h.comment = self._decode_comment(cmt)
-                elif rar_crc32(cmt) & 0xFFFF == crc:
+                if not self._crc_check or (crc32(cmt) & 0xFFFF == crc):
                     h.comment = self._decode_comment(cmt)
 
             pos = pos_next
         return pos
 
-    def _read_comment_v3(self, inf, psw=None):
+    def _read_comment_v3(self, inf, pwd=None):
 
         # read data
         with XFile(inf.volume_file) as rf:
@@ -1379,11 +1571,11 @@ class RAR3Parser(CommonParser):
 
         # decompress
         cmt = rar3_decompress(inf.extract_version, inf.compress_type, data,
-                              inf.file_size, inf.flags, inf.CRC, psw, inf.salt)
+                              inf.file_size, inf.flags, inf.CRC, pwd, inf.salt)
 
         # check crc
         if self._crc_check:
-            crc = rar_crc32(cmt)
+            crc = crc32(cmt)
             if crc != inf.CRC:
                 return None
 
@@ -1403,8 +1595,10 @@ class RAR3Parser(CommonParser):
     def process_entry(self, fd, item):
         if item.type == RAR_BLOCK_FILE:
             # use only first part
-            if (item.flags & RAR_FILE_SPLIT_BEFORE) == 0:
-                self._info_map[item.filename] = item
+            if item.flags & RAR_FILE_VERSION:
+                pass    # skip old versions
+            elif (item.flags & RAR_FILE_SPLIT_BEFORE) == 0:
+                self._info_map[item.filename.rstrip("/")] = item
                 self._info_list.append(item)
             elif len(self._info_list) > 0:
                 # final crc is in last block
@@ -1436,10 +1630,11 @@ class RAR3Parser(CommonParser):
 
     # put file compressed data into temporary .rar archive, and run
     # unrar on that, thus avoiding unrar going over whole archive
-    def _open_hack(self, inf, psw):
+    def _open_hack(self, inf, pwd):
         # create main header: crc, type, flags, size, res1, res2
-        prefix = RAR_ID + S_BLK_HDR.pack(0x90CF, 0x73, 0, 13) + ZERO * (2 + 4)
-        return self._open_hack_core(inf, psw, prefix, EMPTY)
+        prefix = RAR_ID + S_BLK_HDR.pack(0x90CF, 0x73, 0, 13) + b"\0" * (2 + 4)
+        return self._open_hack_core(inf, pwd, prefix, b"")
+
 
 #
 # RAR5 format
@@ -1474,7 +1669,7 @@ class Rar5BaseFile(Rar5Info):
     """
     type = -1
     file_flags = None
-    file_encryption = (0, 0, 0, EMPTY, EMPTY, EMPTY)
+    file_encryption = (0, 0, 0, b"", b"", b"")
     file_compress_flags = None
     file_redir = None
     file_owner = None
@@ -1498,6 +1693,29 @@ class Rar5FileInfo(Rar5BaseFile):
     """
     type = RAR_BLOCK_FILE
 
+    def is_symlink(self):
+        """Returns True if entry is a symlink."""
+        # pylint: disable=unsubscriptable-object
+        return (
+            self.file_redir is not None and
+            self.file_redir[0] in (
+                RAR5_XREDIR_UNIX_SYMLINK,
+                RAR5_XREDIR_WINDOWS_SYMLINK,
+                RAR5_XREDIR_WINDOWS_JUNCTION,
+            )
+        )
+
+    def is_file(self):
+        """Returns True if entry is a normal file."""
+        return not (self.is_dir() or self.is_symlink())
+
+    def is_dir(self):
+        """Returns True if entry is a directory."""
+        if not self.file_redir:
+            if self.file_flags & RAR5_FILE_FLAG_ISDIR:
+                return True
+        return False
+
 
 class Rar5ServiceInfo(Rar5BaseFile):
     """RAR5 service record.
@@ -1553,10 +1771,10 @@ class RAR5Parser(CommonParser):
             return self._last_aes256_key[2]
         if kdf_count > 24:
             raise BadRarFile("Too large kdf_count")
-        psw = self._password
-        if isinstance(psw, str):
-            psw = psw.encode("utf8")
-        key = pbkdf2_sha256(psw, salt, 1 << kdf_count)
+        pwd = self._password
+        if isinstance(pwd, str):
+            pwd = pwd.encode("utf8")
+        key = pbkdf2_hmac("sha256", pwd, salt, 1 << kdf_count)
         self._last_aes256_key = (kdf_count, salt, key)
         return key
 
@@ -1568,12 +1786,22 @@ class RAR5Parser(CommonParser):
         iv = fd.read(16)
         return HeaderDecrypt(fd, key, iv)
 
-    # common header
     def _parse_block_header(self, fd):
+        """Parse common block header
+        """
         header_offset = fd.tell()
 
-        preload = 4 + 3
+        preload = 4 + 1
         start_bytes = fd.read(preload)
+        if len(start_bytes) < preload:
+            self._set_error("Unexpected EOF when reading header")
+            return None
+        while start_bytes[-1] & 0x80:
+            b = fd.read(1)
+            if not b:
+                self._set_error("Unexpected EOF when reading header")
+                return None
+            start_bytes += b
         header_crc, pos = load_le32(start_bytes, 0)
         hdrlen, pos = load_vint(start_bytes, pos)
         if hdrlen > 2 * 1024 * 1024:
@@ -1587,7 +1815,7 @@ class RAR5Parser(CommonParser):
             return None
         data_offset = fd.tell()
 
-        calc_crc = rar_crc32(memoryview(hdata)[4:])
+        calc_crc = crc32(memoryview(hdata)[4:])
         if header_crc != calc_crc:
             # header parsing failed.
             self._set_error("Header CRC error: exp=%x got=%x (xlen = %d)",
@@ -1673,7 +1901,7 @@ class RAR5Parser(CommonParser):
         h.file_compress_flags, pos = load_vint(hdata, pos)
         h.file_host_os, pos = load_vint(hdata, pos)
         h.orig_filename, pos = load_vstr(hdata, pos)
-        h.filename = h.orig_filename.decode("utf8", "replace")
+        h.filename = h.orig_filename.decode("utf8", "replace").rstrip("/")
 
         # use compatible values
         if h.file_host_os == RAR5_OS_WINDOWS:
@@ -1698,6 +1926,8 @@ class RAR5Parser(CommonParser):
         if h.file_compress_flags & RAR5_COMPR_SOLID:
             h.flags |= RAR_FILE_SOLID
 
+        if h.is_dir():
+            h.filename = h.filename + "/"
         return h
 
     def _parse_endarc_block(self, h, hdata, pos):
@@ -1718,7 +1948,6 @@ class RAR5Parser(CommonParser):
         self._hdrenc_main = h
         return h
 
-    # file extra record
     def _process_file_extra(self, h, xdata):
         xtype, pos = load_vint(xdata, 0)
         if xtype == RAR5_XFILE_TIME:
@@ -1741,9 +1970,11 @@ class RAR5Parser(CommonParser):
     # extra block for file time record
     def _parse_file_xtime(self, h, xdata, pos):
         tflags, pos = load_vint(xdata, pos)
+
         ldr = load_windowstime
         if tflags & RAR5_XTIME_UNIXTIME:
             ldr = load_unixtime
+
         if tflags & RAR5_XTIME_HAS_MTIME:
             h.mtime, pos = ldr(xdata, pos)
             h.date_time = h.mtime.timetuple()[:6]
@@ -1752,6 +1983,17 @@ class RAR5Parser(CommonParser):
         if tflags & RAR5_XTIME_HAS_ATIME:
             h.atime, pos = ldr(xdata, pos)
 
+        if tflags & RAR5_XTIME_UNIXTIME_NS:
+            if tflags & RAR5_XTIME_HAS_MTIME:
+                nsec, pos = load_le32(xdata, pos)
+                h.mtime = to_nsdatetime(h.mtime, nsec)
+            if tflags & RAR5_XTIME_HAS_CTIME:
+                nsec, pos = load_le32(xdata, pos)
+                h.ctime = to_nsdatetime(h.ctime, nsec)
+            if tflags & RAR5_XTIME_HAS_ATIME:
+                nsec, pos = load_le32(xdata, pos)
+                h.atime = to_nsdatetime(h.atime, nsec)
+
     # just remember encryption info
     def _parse_file_encryption(self, h, xdata, pos):
         algo, pos = load_vint(xdata, pos)
@@ -1806,9 +2048,11 @@ class RAR5Parser(CommonParser):
 
     def process_entry(self, fd, item):
         if item.block_type == RAR5_BLOCK_FILE:
-            # use only first part
-            if (item.block_flags & RAR5_BLOCK_FLAG_SPLIT_BEFORE) == 0:
-                self._info_map[item.filename] = item
+            if item.file_version:
+                pass    # skip old versions
+            elif (item.block_flags & RAR5_BLOCK_FLAG_SPLIT_BEFORE) == 0:
+                # use only first part
+                self._info_map[item.filename.rstrip("/")] = item
                 self._info_list.append(item)
             elif len(self._info_list) > 0:
                 # final crc is in last block
@@ -1840,23 +2084,24 @@ class RAR5Parser(CommonParser):
                 cmt = cmtstream.read()
 
         # rar bug? - appends zero to comment
-        cmt = cmt.split(ZERO, 1)[0]
+        cmt = cmt.split(b"\0", 1)[0]
         self.comment = cmt.decode("utf8")
         return None
 
-    def _open_hack(self, inf, psw):
+    def _open_hack(self, inf, pwd):
         # len, type, blk_flags, flags
         main_hdr = b"\x03\x01\x00\x00"
         endarc_hdr = b"\x03\x05\x00\x00"
-        main_hdr = S_LONG.pack(rar_crc32(main_hdr)) + main_hdr
-        endarc_hdr = S_LONG.pack(rar_crc32(endarc_hdr)) + endarc_hdr
-        return self._open_hack_core(inf, psw, RAR5_ID + main_hdr, endarc_hdr)
+        main_hdr = S_LONG.pack(crc32(main_hdr)) + main_hdr
+        endarc_hdr = S_LONG.pack(crc32(endarc_hdr)) + endarc_hdr
+        return self._open_hack_core(inf, pwd, RAR5_ID + main_hdr, endarc_hdr)
+
 
 ##
 ## Utility classes
 ##
 
-class UnicodeFilename(object):
+class UnicodeFilename:
     """Handle RAR3 unicode filename decompression.
     """
     def __init__(self, name, encdata):
@@ -1919,7 +2164,7 @@ class UnicodeFilename(object):
         return self.buf.decode("utf-16le", "replace")
 
 
-class RarExtFile(RawIOBase):
+class RarExtFile(io.RawIOBase):
     """Base class for file-like object that :meth:`RarFile.open` returns.
 
     Provides public methods and common crc checking.
@@ -1928,30 +2173,20 @@ class RarExtFile(RawIOBase):
      - no short reads - .read() and .readinfo() read as much as requested.
      - no internal buffer, use io.BufferedReader for that.
     """
+    name = None     #: Filename of the archive entry
+    mode = "rb"
+    _parser = None
+    _inf = None
+    _fd = None
+    _remain = 0
+    _returncode = 0
+    _md_context = None
 
-    #: Filename of the archive entry
-    name = None
-
-    def __init__(self, parser, inf):
-        """Open archive entry.
-        """
-        super(RarExtFile, self).__init__()
-
-        # standard io.* properties
+    def _open_extfile(self, parser, inf):
         self.name = inf.filename
-        self.mode = "rb"
-
         self._parser = parser
         self._inf = inf
-        self._fd = None
-        self._remain = 0
-        self._returncode = 0
-
-        self._md_context = None
-
-        self._open()
 
-    def _open(self):
         if self._fd:
             self._fd.close()
         md_class = self._inf._md_class or NoHashContext
@@ -1959,24 +2194,31 @@ class RarExtFile(RawIOBase):
         self._fd = None
         self._remain = self._inf.file_size
 
-    def read(self, cnt=None):
+    def read(self, n=-1):
         """Read all or specified amount of data from archive entry."""
 
-        # sanitize cnt
-        if cnt is None or cnt < 0:
-            cnt = self._remain
-        elif cnt > self._remain:
-            cnt = self._remain
-        if cnt == 0:
-            return EMPTY
+        # sanitize count
+        if n is None or n < 0:
+            n = self._remain
+        elif n > self._remain:
+            n = self._remain
+        if n == 0:
+            return b""
 
-        # actual read
-        data = self._read(cnt)
-        if data:
+        buf = []
+        orig = n
+        while n > 0:
+            # actual read
+            data = self._read(n)
+            if not data:
+                break
+            buf.append(data)
             self._md_context.update(data)
             self._remain -= len(data)
-        if len(data) != cnt:
-            raise BadRarFile("Failed the read enough data")
+            n -= len(data)
+        data = b"".join(buf)
+        if n > 0:
+            raise BadRarFile("Failed the read enough data: req=%d got=%d" % (orig, len(data)))
 
         # done?
         if not data or self._remain == 0:
@@ -1993,7 +2235,7 @@ class RarExtFile(RawIOBase):
         if final is None:
             return
         if self._returncode:
-            check_returncode(self, "")
+            check_returncode(self._returncode, "", tool_setup().get_errmap())
         if self._remain != 0:
             raise BadRarFile("Failed the read enough data")
         if final != exp:
@@ -2007,7 +2249,7 @@ class RarExtFile(RawIOBase):
     def close(self):
         """Close open resources."""
 
-        super(RarExtFile, self).close()
+        super().close()
 
         if self._fd:
             self._fd.close()
@@ -2028,7 +2270,7 @@ class RarExtFile(RawIOBase):
         """Return current reading position in uncompressed data."""
         return self._inf.file_size - self._remain
 
-    def seek(self, ofs, whence=0):
+    def seek(self, offset, whence=0):
         """Seek in data.
 
         On uncompressed files, the seeking works by actual
@@ -2044,11 +2286,11 @@ class RarExtFile(RawIOBase):
         cur_ofs = self.tell()
 
         if whence == 0:     # seek from beginning of file
-            new_ofs = ofs
+            new_ofs = offset
         elif whence == 1:   # seek from current position
-            new_ofs = cur_ofs + ofs
+            new_ofs = cur_ofs + offset
         elif whence == 2:   # seek from end of file
-            new_ofs = fsize + ofs
+            new_ofs = fsize + offset
         else:
             raise ValueError("Invalid value for whence")
 
@@ -2063,20 +2305,13 @@ class RarExtFile(RawIOBase):
             self._skip(new_ofs - cur_ofs)
         else:
             # reopen and seek
-            self._open()
+            self._open_extfile(self._parser, self._inf)
             self._skip(new_ofs)
         return self.tell()
 
     def _skip(self, cnt):
         """Read and discard data"""
-        while cnt > 0:
-            if cnt > 8192:
-                buf = self.read(8192)
-            else:
-                buf = self.read(cnt)
-            if not buf:
-                break
-            cnt -= len(buf)
+        empty_read(self, cnt, BSIZE)
 
     def readable(self):
         """Returns True"""
@@ -2105,27 +2340,25 @@ class RarExtFile(RawIOBase):
 class PipeReader(RarExtFile):
     """Read data from pipe, handle tempfile cleanup."""
 
-    def __init__(self, rf, inf, cmd, tempfile=None):
+    def __init__(self, parser, inf, cmd, tempfile=None):
+        super().__init__()
         self._cmd = cmd
         self._proc = None
         self._tempfile = tempfile
-        super(PipeReader, self).__init__(rf, inf)
+        self._open_extfile(parser, inf)
 
     def _close_proc(self):
         if not self._proc:
             return
-        if self._proc.stdout:
-            self._proc.stdout.close()
-        if self._proc.stdin:
-            self._proc.stdin.close()
-        if self._proc.stderr:
-            self._proc.stderr.close()
+        for f in (self._proc.stdout, self._proc.stderr, self._proc.stdin):
+            if f:
+                f.close()
         self._proc.wait()
         self._returncode = self._proc.returncode
         self._proc = None
 
-    def _open(self):
-        super(PipeReader, self)._open()
+    def _open_extfile(self, parser, inf):
+        super()._open_extfile(parser, inf)
 
         # stop old process
         self._close_proc()
@@ -2135,10 +2368,6 @@ class PipeReader(RarExtFile):
         self._proc = custom_popen(self._cmd)
         self._fd = self._proc.stdout
 
-        # avoid situation where unrar waits on stdin
-        if self._proc.stdin:
-            self._proc.stdin.close()
-
     def _read(self, cnt):
         """Read from pipe."""
 
@@ -2156,13 +2385,13 @@ class PipeReader(RarExtFile):
                 break
             cnt -= len(data)
             buf.append(data)
-        return EMPTY.join(buf)
+        return b"".join(buf)
 
     def close(self):
         """Close open resources."""
 
         self._close_proc()
-        super(PipeReader, self).close()
+        super().close()
 
         if self._tempfile:
             try:
@@ -2179,10 +2408,10 @@ class PipeReader(RarExtFile):
         vbuf = memoryview(buf)
         res = got = 0
         while got < cnt:
-            res = self._fd.readinto(vbuf[got : cnt])
+            res = self._fd.readinto(vbuf[got: cnt])
             if not res:
                 break
-            self._md_context.update(vbuf[got : got + res])
+            self._md_context.update(vbuf[got: got + res])
             self._remain -= res
             got += res
         return got
@@ -2195,8 +2424,12 @@ class DirectReader(RarExtFile):
     _cur_avail = None
     _volfile = None
 
-    def _open(self):
-        super(DirectReader, self)._open()
+    def __init__(self, parser, inf):
+        super().__init__()
+        self._open_extfile(parser, inf)
+
+    def _open_extfile(self, parser, inf):
+        super()._open_extfile(parser, inf)
 
         self._volfile = self._inf.volume_file
         self._fd = XFile(self._volfile, 0)
@@ -2250,7 +2483,7 @@ class DirectReader(RarExtFile):
 
         if len(buf) == 1:
             return buf[0]
-        return EMPTY.join(buf)
+        return b"".join(buf)
 
     def _open_next(self):
         """Proceed to next volume."""
@@ -2272,7 +2505,7 @@ class DirectReader(RarExtFile):
             raise BadRarFile("Invalid signature")
 
         # loop until first file header
-        while 1:
+        while True:
             cur = self._parser._parse_header(fd)
             if not cur:
                 raise BadRarFile("Unexpected EOF")
@@ -2302,22 +2535,22 @@ class DirectReader(RarExtFile):
                 cnt = self._cur_avail
 
             # read into temp view
-            res = self._fd.readinto(vbuf[got : got + cnt])
+            res = self._fd.readinto(vbuf[got: got + cnt])
             if not res:
                 break
-            self._md_context.update(vbuf[got : got + res])
+            self._md_context.update(vbuf[got: got + res])
             self._cur_avail -= res
             self._remain -= res
             got += res
         return got
 
 
-class HeaderDecrypt(object):
+class HeaderDecrypt:
     """File-like object that decrypts from another file"""
     def __init__(self, f, key, iv):
         self.f = f
         self.ciph = AES_CBC_Decrypt(key, iv)
-        self.buf = EMPTY
+        self.buf = b""
 
     def tell(self):
         """Current file pos - works only on block boundaries."""
@@ -2334,7 +2567,7 @@ class HeaderDecrypt(object):
             self.buf = self.buf[cnt:]
             return res
         res = self.buf
-        self.buf = EMPTY
+        self.buf = b""
         cnt -= len(res)
 
         # decrypt new data
@@ -2355,8 +2588,7 @@ class HeaderDecrypt(object):
         return res
 
 
-# handle (filename|filelike) object
-class XFile(object):
+class XFile:
     """Input may be filename or file object.
     """
     __slots__ = ("_fd", "_need_close")
@@ -2382,9 +2614,9 @@ class XFile(object):
         """Move file pos."""
         return self._fd.seek(ofs, whence)
 
-    def readinto(self, dst):
+    def readinto(self, buf):
         """Read into buffer."""
-        return self._fd.readinto(dst)
+        return self._fd.readinto(buf)
 
     def close(self):
         """Close file object."""
@@ -2398,7 +2630,7 @@ class XFile(object):
         self.close()
 
 
-class NoHashContext(object):
+class NoHashContext:
     """No-op hash function."""
     def __init__(self, data=None):
         """Initialize"""
@@ -2410,7 +2642,7 @@ class NoHashContext(object):
         """Hexadecimal digest."""
 
 
-class CRC32Context(object):
+class CRC32Context:
     """Hash context that uses CRC32."""
     __slots__ = ["_crc"]
 
@@ -2421,7 +2653,7 @@ class CRC32Context(object):
 
     def update(self, data):
         """Process data."""
-        self._crc = rar_crc32(data, self._crc)
+        self._crc = crc32(data, self._crc)
 
     def digest(self):
         """Final hash."""
@@ -2432,7 +2664,7 @@ class CRC32Context(object):
         return "%08x" % self.digest()
 
 
-class Blake2SP(object):
+class Blake2SP:
     """Blake2sp hash context.
     """
     __slots__ = ["_thread", "_buf", "_cur", "_digest"]
@@ -2484,7 +2716,7 @@ class Blake2SP(object):
         if self._digest is None:
             if self._buf:
                 self._add_block(self._buf)
-                self._buf = EMPTY
+                self._buf = b""
             ctx = self._blake2s(0, 1, True)
             for t in self._thread:
                 ctx.update(t.digest())
@@ -2493,11 +2725,11 @@ class Blake2SP(object):
 
     def hexdigest(self):
         """Hexadecimal digest."""
-        return tohex(self.digest())
+        return hexlify(self.digest()).decode("ascii")
 
 
-class Rar3Sha1(object):
-    """Bug-compat for SHA1
+class Rar3Sha1:
+    """Emulate buggy SHA1 from RAR3.
     """
     digest_size = 20
     block_size = 64
@@ -2554,8 +2786,9 @@ S_BLK_HDR = Struct("<HBHH")
 S_FILE_HDR = Struct("<LLBLLBBHL")
 S_COMMENT_HDR = Struct("<HBBH")
 
+
 def load_vint(buf, pos):
-    """Load variable-size int."""
+    """Load RAR5 variable-size int."""
     limit = min(pos + 11, len(buf))
     res = ofs = 0
     while pos < limit:
@@ -2567,6 +2800,7 @@ def load_vint(buf, pos):
             return res, pos
     raise BadRarFile("cannot load vint")
 
+
 def load_byte(buf, pos):
     """Load single byte"""
     end = pos + 1
@@ -2574,37 +2808,43 @@ def load_byte(buf, pos):
         raise BadRarFile("cannot load byte")
     return S_BYTE.unpack_from(buf, pos)[0], end
 
+
 def load_le32(buf, pos):
     """Load little-endian 32-bit integer"""
     end = pos + 4
     if end > len(buf):
         raise BadRarFile("cannot load le32")
-    return S_LONG.unpack_from(buf, pos)[0], pos + 4
+    return S_LONG.unpack_from(buf, pos)[0], end
+
 
 def load_bytes(buf, num, pos):
     """Load sequence of bytes"""
     end = pos + num
     if end > len(buf):
         raise BadRarFile("cannot load bytes")
-    return buf[pos : end], end
+    return buf[pos: end], end
+
 
 def load_vstr(buf, pos):
     """Load bytes prefixed by vint length"""
     slen, pos = load_vint(buf, pos)
     return load_bytes(buf, slen, pos)
 
+
 def load_dostime(buf, pos):
     """Load LE32 dos timestamp"""
     stamp, pos = load_le32(buf, pos)
     tup = parse_dos_time(stamp)
     return to_datetime(tup), pos
 
+
 def load_unixtime(buf, pos):
     """Load LE32 unix timestamp"""
     secs, pos = load_le32(buf, pos)
-    dt = datetime.fromtimestamp(secs, UTC)
+    dt = datetime.fromtimestamp(secs, timezone.utc)
     return dt, pos
 
+
 def load_windowstime(buf, pos):
     """Load LE64 windows timestamp"""
     # unix epoch (1970) in seconds from windows epoch (1601)
@@ -2612,39 +2852,72 @@ def load_windowstime(buf, pos):
     val1, pos = load_le32(buf, pos)
     val2, pos = load_le32(buf, pos)
     secs, n1secs = divmod((val2 << 32) | val1, 10000000)
-    dt = datetime.fromtimestamp(secs - unix_epoch, UTC)
-    dt = dt.replace(microsecond=n1secs // 10)
+    dt = datetime.fromtimestamp(secs - unix_epoch, timezone.utc)
+    dt = to_nsdatetime(dt, n1secs * 100)
     return dt, pos
 
-# new-style next volume
+
+#
+# volume numbering
+#
+
+_rc_num = re.compile('^[0-9]+$')
+
+
 def _next_newvol(volfile):
+    """New-style next volume
+    """
+    name, ext = os.path.splitext(volfile)
+    if ext.lower() in ("", ".exe", ".sfx"):
+        volfile = name + ".rar"
     i = len(volfile) - 1
     while i >= 0:
-        if volfile[i] >= "0" and volfile[i] <= "9":
-            return _inc_volname(volfile, i)
+        if "0" <= volfile[i] <= "9":
+            return _inc_volname(volfile, i, False)
+        if volfile[i] in ("/", os.sep):
+            break
         i -= 1
     raise BadRarName("Cannot construct volume name: " + volfile)
 
-# old-style next volume
+
+
 def _next_oldvol(volfile):
-    # rar -> r00
-    if volfile[-4:].lower() == ".rar":
-        return volfile[:-2] + "00"
-    return _inc_volname(volfile, len(volfile) - 1)
+    """Old-style next volume
+    """
+    name, ext = os.path.splitext(volfile)
+    if ext.lower() in ("", ".exe", ".sfx"):
+        ext = ".rar"
+    sfx = ext[2:]
+    if _rc_num.match(sfx):
+        ext = _inc_volname(ext, len(ext) - 1, True)
+    else:
+        # .rar -> .r00
+        ext = ext[:2] + "00"
+    return name + ext
 
-# increase digits with carry, otherwise just increment char
-def _inc_volname(volfile, i):
+
+def _inc_volname(volfile, i, inc_chars):
+    """increase digits with carry, otherwise just increment char
+    """
     fn = list(volfile)
     while i >= 0:
-        if fn[i] != "9":
+        if fn[i] == "9":
+            fn[i] = "0"
+            i -= 1
+            if i < 0:
+                fn.insert(0, "1")
+        elif "0" <= fn[i] < "9" or inc_chars:
             fn[i] = chr(ord(fn[i]) + 1)
             break
-        fn[i] = "0"
-        i -= 1
+        else:
+            fn.insert(i + 1, "1")
+            break
     return "".join(fn)
 
-# rar3 extended time fields
+
 def _parse_ext_time(h, data, pos):
+    """Parse all RAR3 extended time fields
+    """
     # flags and rest of data can be missing
     flags = 0
     if pos + 2 <= len(data):
@@ -2660,38 +2933,34 @@ def _parse_ext_time(h, data, pos):
         h.date_time = mtime.timetuple()[:6]
     return pos
 
-# rar3 one extended time field
+
 def _parse_xtime(flag, data, pos, basetime=None):
+    """Parse one RAR3 extended time field
+    """
     res = None
     if flag & 8:
         if not basetime:
             basetime, pos = load_dostime(data, pos)
 
-        # load second fractions
+        # load second fractions of 100ns units
         rem = 0
         cnt = flag & 3
         for _ in range(cnt):
             b, pos = load_byte(data, pos)
             rem = (b << 16) | (rem >> 8)
 
-        # convert 100ns units to microseconds
-        usec = rem // 10
-        if usec > 1000000:
-            usec = 999999
-
         # dostime has room for 30 seconds only, correct if needed
         if flag & 4 and basetime.second < 59:
-            res = basetime.replace(microsecond=usec, second=basetime.second + 1)
-        else:
-            res = basetime.replace(microsecond=usec)
+            basetime = basetime.replace(second=basetime.second + 1)
+
+        res = to_nsdatetime(basetime, rem * 100)
     return res, pos
 
+
 def is_filelike(obj):
     """Filename or file object?
     """
-    filename_types = (bytes, str, Path)
-
-    if isinstance(obj, filename_types):
+    if isinstance(obj, (bytes, str, Path)):
         return False
     res = True
     for a in ("read", "tell", "seek"):
@@ -2700,14 +2969,15 @@ def is_filelike(obj):
         raise ValueError("Invalid object passed as file")
     return True
 
-def rar3_s2k(psw, salt):
+
+def rar3_s2k(pwd, salt):
     """String-to-key hash for RAR3.
     """
-    if not isinstance(psw, str):
-        psw = psw.decode("utf8")
-    seed = bytearray(psw.encode("utf-16le") + salt)
+    if not isinstance(pwd, str):
+        pwd = pwd.decode("utf8")
+    seed = bytearray(pwd.encode("utf-16le") + salt)
     h = Rar3Sha1(rarbug=True)
-    iv = EMPTY
+    iv = b""
     for i in range(16):
         for j in range(0x4000):
             cnt = S_LONG.pack(i * 0x4000 + j)
@@ -2719,7 +2989,8 @@ def rar3_s2k(psw, salt):
     key_le = pack("<LLLL", *unpack(">LLLL", key_be))
     return key_le, iv
 
-def rar3_decompress(vers, meth, data, declen=0, flags=0, crc=0, psw=None, salt=None):
+
+def rar3_decompress(vers, meth, data, declen=0, flags=0, crc=0, pwd=None, salt=None):
     """Decompress blob of compressed data.
 
     Used for data with non-standard header - eg. comments.
@@ -2735,23 +3006,21 @@ def rar3_decompress(vers, meth, data, declen=0, flags=0, crc=0, psw=None, salt=N
     # file header
     fname = b"data"
     date = ((2010 - 1980) << 25) + (12 << 21) + (31 << 16)
-    mode = 0x20
+    mode = DOS_MODE_ARCHIVE
     fhdr = S_FILE_HDR.pack(len(data), declen, RAR_OS_MSDOS, crc,
                            date, vers, meth, len(fname), mode)
     fhdr += fname
-    if flags & RAR_FILE_SALT:
-        if not salt:
-            return EMPTY
+    if salt:
         fhdr += salt
 
     # full header
     hlen = S_BLK_HDR.size + len(fhdr)
     hdr = S_BLK_HDR.pack(0, RAR_BLOCK_FILE, flags, hlen) + fhdr
-    hcrc = rar_crc32(hdr[2:]) & 0xFFFF
+    hcrc = crc32(hdr[2:]) & 0xFFFF
     hdr = S_BLK_HDR.pack(hcrc, RAR_BLOCK_FILE, flags, hlen) + fhdr
 
     # archive main header
-    mh = S_BLK_HDR.pack(0x90CF, RAR_BLOCK_MAIN, 0, 13) + ZERO * (2 + 4)
+    mh = S_BLK_HDR.pack(0x90CF, RAR_BLOCK_MAIN, 0, 13) + b"\0" * (2 + 4)
 
     # decompress via temp rar
     setup = tool_setup()
@@ -2761,20 +3030,53 @@ def rar3_decompress(vers, meth, data, declen=0, flags=0, crc=0, psw=None, salt=N
         tmpf.write(RAR_ID + mh + hdr + data)
         tmpf.close()
 
-        curpsw = (flags & RAR_FILE_PASSWORD) and psw or None
-        cmd = setup.open_cmdline(curpsw, tmpname)
+        curpwd = (flags & RAR_FILE_PASSWORD) and pwd or None
+        cmd = setup.open_cmdline(curpwd, tmpname)
         p = custom_popen(cmd)
         return p.communicate()[0]
     finally:
         tmpf.close()
         os.unlink(tmpname)
 
+
+def sanitize_filename(fname, pathsep, is_win32):
+    """Simulate unrar sanitization.
+    """
+    if is_win32:
+        if len(fname) > 1 and fname[1] == ":":
+            fname = fname[2:]
+        rc = RC_BAD_CHARS_WIN32
+    else:
+        rc = RC_BAD_CHARS_UNIX
+    if rc.search(fname):
+        fname = rc.sub("_", fname)
+
+    parts = []
+    for seg in fname.split("/"):
+        if seg in ("", ".", ".."):
+            continue
+        if is_win32 and seg[-1] in (" ", "."):
+            seg = seg[:-1] + "_"
+        parts.append(seg)
+    return pathsep.join(parts)
+
+
+def empty_read(src, size, blklen):
+    """Read and drop fixed amount of data.
+    """
+    while size > 0:
+        if size > blklen:
+            res = src.read(blklen)
+        else:
+            res = src.read(size)
+        if not res:
+            raise BadRarFile("cannot load data")
+        size -= len(res)
+
+
 def to_datetime(t):
     """Convert 6-part time tuple into datetime object.
     """
-    if t is None:
-        return None
-
     # extract values
     year, mon, day, h, m, s = t
 
@@ -2785,67 +3087,141 @@ def to_datetime(t):
         pass
 
     # sanitize invalid values
-    mday = (0, 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31)
-    if mon < 1:
-        mon = 1
-    if mon > 12:
-        mon = 12
-    if day < 1:
-        day = 1
-    if day > mday[mon]:
-        day = mday[mon]
-    if h > 23:
-        h = 23
-    if m > 59:
-        m = 59
-    if s > 59:
-        s = 59
-    if mon == 2 and day == 29:
-        try:
-            return datetime(year, mon, day, h, m, s)
-        except ValueError:
-            day = 28
+    mday = (0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31)
+    mon = max(1, min(mon, 12))
+    day = max(1, min(day, mday[mon]))
+    h = min(h, 23)
+    m = min(m, 59)
+    s = min(s, 59)
     return datetime(year, mon, day, h, m, s)
 
+
 def parse_dos_time(stamp):
     """Parse standard 32-bit DOS timestamp.
     """
     sec, stamp = stamp & 0x1F, stamp >> 5
-    mn,  stamp = stamp & 0x3F, stamp >> 6
-    hr,  stamp = stamp & 0x1F, stamp >> 5
+    mn, stamp = stamp & 0x3F, stamp >> 6
+    hr, stamp = stamp & 0x1F, stamp >> 5
     day, stamp = stamp & 0x1F, stamp >> 5
     mon, stamp = stamp & 0x0F, stamp >> 4
     yr = (stamp & 0x7F) + 1980
     return (yr, mon, day, hr, mn, sec * 2)
 
+
+# pylint: disable=arguments-differ,signature-differs
+class nsdatetime(datetime):
+    """Datetime that carries nanoseconds.
+
+    Arithmetic not supported, will lose nanoseconds.
+
+    .. versionadded:: 4.0
+    """
+    __slots__ = ("nanosecond",)
+    nanosecond: int     #: Number of nanoseconds, 0 <= nanosecond < 999999999
+
+    def __new__(cls, year, month, day, hour=0, minute=0, second=0,
+                microsecond=0, tzinfo=None, *, fold=0, nanosecond=0):
+        usec, mod = divmod(nanosecond, 1000) if nanosecond else (microsecond, 0)
+        if mod == 0:
+            return datetime(year, month, day, hour, minute, second, usec, tzinfo, fold=fold)
+        self = super().__new__(cls, year, month, day, hour, minute, second, usec, tzinfo, fold=fold)
+        self.nanosecond = nanosecond
+        return self
+
+    def isoformat(self, sep="T", timespec="auto"):
+        """Formats with nanosecond precision by default.
+        """
+        if timespec == "auto":
+            pre, post = super().isoformat(sep, "microseconds").split(".", 1)
+            return f"{pre}.{self.nanosecond:09d}{post[6:]}"
+        return super().isoformat(sep, timespec)
+
+    def astimezone(self, tz=None):
+        """Convert to new timezone.
+        """
+        tmp = super().astimezone(tz)
+        return self.__class__(tmp.year, tmp.month, tmp.day, tmp.hour, tmp.minute, tmp.second,
+                              nanosecond=self.nanosecond, tzinfo=tmp.tzinfo, fold=tmp.fold)
+
+    def replace(self, year=None, month=None, day=None, hour=None, minute=None, second=None,
+                microsecond=None, tzinfo=None, *, fold=None, nanosecond=None):
+        """Return new timestamp with specified fields replaced.
+        """
+        return self.__class__(
+            self.year if year is None else year,
+            self.month if month is None else month,
+            self.day if day is None else day,
+            self.hour if hour is None else hour,
+            self.minute if minute is None else minute,
+            self.second if second is None else second,
+            nanosecond=((self.nanosecond if microsecond is None else microsecond * 1000)
+                        if nanosecond is None else nanosecond),
+            tzinfo=self.tzinfo if tzinfo is None else tzinfo,
+            fold=self.fold if fold is None else fold)
+
+    def __hash__(self):
+        return hash((super().__hash__(), self.nanosecond)) if self.nanosecond else super().__hash__()
+
+    def __eq__(self, other):
+        return super().__eq__(other) and self.nanosecond == (
+            other.nanosecond if isinstance(other, nsdatetime) else other.microsecond * 1000)
+
+    def __gt__(self, other):
+        return super().__gt__(other) or (super().__eq__(other) and self.nanosecond > (
+            other.nanosecond if isinstance(other, nsdatetime) else other.microsecond * 1000))
+
+    def __lt__(self, other):
+        return not (self > other or self == other)
+
+    def __ge__(self, other):
+        return not self < other
+
+    def __le__(self, other):
+        return not self > other
+
+    def __ne__(self, other):
+        return not self == other
+
+
+def to_nsdatetime(dt, nsec):
+    """Apply nanoseconds to datetime.
+    """
+    if not nsec:
+        return dt
+    return nsdatetime(dt.year, dt.month, dt.day, dt.hour, dt.minute, dt.second,
+                      tzinfo=dt.tzinfo, fold=dt.fold, nanosecond=nsec)
+
+
+def to_nsecs(dt):
+    """Convert datatime instance to nanoseconds.
+    """
+    secs = int(dt.timestamp())
+    nsecs = dt.nanosecond if isinstance(dt, nsdatetime) else dt.microsecond * 1000
+    return secs * 1000000000 + nsecs
+
+
 def custom_popen(cmd):
     """Disconnect cmd from parent fds, read only from stdout.
     """
-    # needed for py2exe
-    creationflags = 0
-    if sys.platform == "win32":
-        creationflags = 0x08000000   # CREATE_NO_WINDOW
-
-    # run command
+    creationflags = 0x08000000 if WIN32 else 0  # CREATE_NO_WINDOW
     try:
-        p = Popen(cmd, bufsize=0, stdout=PIPE, stdin=PIPE, stderr=STDOUT,
+        p = Popen(cmd, bufsize=0, stdout=PIPE, stderr=STDOUT, stdin=DEVNULL,
                   creationflags=creationflags)
     except OSError as ex:
         if ex.errno == errno.ENOENT:
-            raise RarCannotExec("Unrar not installed?")
+            raise RarCannotExec("Unrar not installed?") from None
         if ex.errno == errno.EACCES or ex.errno == errno.EPERM:
-            raise RarCannotExec("Cannot execute unrar")
+            raise RarCannotExec("Cannot execute unrar") from None
         raise
     return p
 
-def check_returncode(p, out):
+
+def check_returncode(code, out, errmap):
     """Raise exception according to unrar exit code.
     """
-    code = p.returncode
     if code == 0:
         return
 
-    errmap = tool_setup().get_errmap()
     if code > 0 and code < len(errmap):
         exc = errmap[code]
     elif code == 255:
@@ -2857,59 +3233,30 @@ def check_returncode(p, out):
 
     # format message
     if out:
-        msg = "%s [%d]: %s" % (exc.__doc__, p.returncode, out)
+        msg = "%s [%d]: %s" % (exc.__doc__, code, out)
     else:
-        msg = "%s [%d]" % (exc.__doc__, p.returncode)
+        msg = "%s [%d]" % (exc.__doc__, code)
 
     raise exc(msg)
 
-def hmac_sha256(key, data):
-    """HMAC-SHA256"""
-    return HMAC(key, data, sha256).digest()
 
 def membuf_tempfile(memfile):
-    """Write in-memory file object to real file."""
+    """Write in-memory file object to real file.
+    """
     memfile.seek(0, 0)
 
     tmpfd, tmpname = mkstemp(suffix=".rar", dir=HACK_TMP_DIR)
     tmpf = os.fdopen(tmpfd, "wb")
 
     try:
-        while True:
-            buf = memfile.read(BSIZE)
-            if not buf:
-                break
-            tmpf.write(buf)
+        shutil.copyfileobj(memfile, tmpf, BSIZE)
         tmpf.close()
-    except:
+    except BaseException:
         tmpf.close()
         os.unlink(tmpname)
         raise
     return tmpname
 
-class XTempFile(object):
-    """Real file for archive.
-    """
-    __slots__ = ("_tmpfile", "_filename")
-
-    def __init__(self, rarfile):
-        if is_filelike(rarfile):
-            self._tmpfile = membuf_tempfile(rarfile)
-            self._filename = self._tmpfile
-        else:
-            self._tmpfile = None
-            self._filename = rarfile
-
-    def __enter__(self):
-        return self._filename
-
-    def __exit__(self, exc_type, exc_value, tb):
-        if self._tmpfile:
-            try:
-                os.unlink(self._tmpfile)
-            except OSError:
-                pass
-            self._tmpfile = None
 
 #
 # Find working command-line tool
@@ -2928,66 +3275,45 @@ class ToolSetup:
         except RarCannotExec:
             return False
 
-    def open_cmdline(self, psw, rarfn, filefn=None):
-        cmdline = self.get_cmdline("open_cmd", psw)
+    def open_cmdline(self, pwd, rarfn, filefn=None):
+        cmdline = self.get_cmdline("open_cmd", pwd)
         cmdline.append(rarfn)
         if filefn:
-            cmdline.append(filefn)
-        return cmdline
-
-    def test_cmdline(self, psw, rarfn):
-        cmdline = self.get_cmdline("test_cmd", psw)
-        cmdline.append(rarfn)
-        return cmdline
-
-    def extract_cmdline(self, psw, rarfn, fnlist, path):
-        cmdline = self.get_cmdline("extract_cmd", psw, nodash=True)
-        dstdir = "DSTDIR" in cmdline
-        if dstdir:
-            if not path:
-                path = "."
-            cmdline[cmdline.index("DSTDIR", 1)] = path
-
-        cmdline.append("--")
-
-        cmdline.append(rarfn)
-        for fn in fnlist:
-            cmdline.append(fn)
-
-        if path and not dstdir:
-            cmdline.append(path + os.sep)
+            self.add_file_arg(cmdline, filefn)
         return cmdline
 
     def get_errmap(self):
         return self.setup["errmap"]
 
-    def get_cmdline(self, key, psw, nodash=False):
+    def get_cmdline(self, key, pwd, nodash=False):
         cmdline = list(self.setup[key])
         cmdline[0] = globals()[cmdline[0]]
-        self.add_password_arg(cmdline, psw)
+        self.add_password_arg(cmdline, pwd)
         if not nodash:
             cmdline.append("--")
         return cmdline
 
-    def add_password_arg(self, cmdline, psw):
+    def add_file_arg(self, cmdline, filename):
+        cmdline.append(filename)
+
+    def add_password_arg(self, cmdline, pwd):
         """Append password switch to commandline.
         """
-        if psw is not None:
-            if not isinstance(psw, str):
-                psw = psw.decode("utf8")
+        if pwd is not None:
+            if not isinstance(pwd, str):
+                pwd = pwd.decode("utf8")
             args = self.setup["password"]
             if isinstance(args, str):
-                cmdline.append(args + psw)
+                cmdline.append(args + pwd)
             else:
                 cmdline.extend(args)
-                cmdline.append(psw)
+                cmdline.append(pwd)
         else:
             cmdline.extend(self.setup["no_password"])
 
+
 UNRAR_CONFIG = {
     "open_cmd": ("UNRAR_TOOL", "p", "-inul"),
-    "extract_cmd": ("UNRAR_TOOL", "x", "-y", "-idq"),
-    "test_cmd": ("UNRAR_TOOL", "t", "-idq"),
     "check_cmd": ("UNRAR_TOOL", "-inul"),
     "password": "-p",
     "no_password": ("-p-",),
@@ -3003,8 +3329,6 @@ UNRAR_CONFIG = {
 # - Does not support RAR5 Blake2sp hash [reading works]
 UNAR_CONFIG = {
     "open_cmd": ("UNAR_TOOL", "-q", "-o", "-"),
-    "extract_cmd": ("UNAR_TOOL", "-q", "-f", "-D", "-o", "DSTDIR"),
-    "test_cmd": ("LSAR_TOOL", "-test"),
     "check_cmd": ("UNAR_TOOL", "-version"),
     "password": ("-p",),
     "no_password": ("-p", ""),
@@ -3017,8 +3341,6 @@ UNAR_CONFIG = {
 # - Does not support RARVM-based compression filters.
 BSDTAR_CONFIG = {
     "open_cmd": ("BSDTAR_TOOL", "-x", "--to-stdout", "-f"),
-    "extract_cmd": ("BSDTAR_TOOL", "-x", "-C", "DSTDIR", "-f"),
-    "test_cmd": ("BSDTAR_TOOL", "-t", "-f"),
     "check_cmd": ("BSDTAR_TOOL", "--version"),
     "password": None,
     "no_password": (),
@@ -3027,6 +3349,7 @@ BSDTAR_CONFIG = {
 
 CURRENT_SETUP = None
 
+
 def tool_setup(unrar=True, unar=True, bsdtar=True, force=False):
     """Pick a tool, return cached ToolSetup.
     """
@@ -3052,3 +3375,33 @@ def tool_setup(unrar=True, unar=True, bsdtar=True, force=False):
         raise RarCannotExec("Cannot find working tool")
     return CURRENT_SETUP
 
+
+def main(args):
+    """Minimal command-line interface for rarfile module.
+    """
+    import argparse
+    p = argparse.ArgumentParser(description=main.__doc__)
+    g = p.add_mutually_exclusive_group(required=True)
+    g.add_argument("-l", "--list", metavar="<rarfile>",
+                   help="Show archive listing")
+    g.add_argument("-e", "--extract", nargs=2,
+                   metavar=("<rarfile>", "<output_dir>"),
+                   help="Extract archive into target dir")
+    g.add_argument("-t", "--test", metavar="<rarfile>",
+                   help="Test if a archive is valid")
+    cmd = p.parse_args(args)
+
+    if cmd.list:
+        with RarFile(cmd.list) as rf:
+            rf.printdir()
+    elif cmd.test:
+        with RarFile(cmd.test) as rf:
+            rf.testrar()
+    elif cmd.extract:
+        with RarFile(cmd.extract[0]) as rf:
+            rf.extractall(cmd.extract[1])
+
+
+if __name__ == "__main__":
+    main(sys.argv[1:])
+
diff --git a/lib/requests/__init__.py b/lib/requests/__init__.py
index d0b51b2..f8f9429 100644
--- a/lib/requests/__init__.py
+++ b/lib/requests/__init__.py
@@ -57,18 +57,16 @@ def check_compatibility(urllib3_version, chardet_version):
     # Check urllib3 for compatibility.
     major, minor, patch = urllib3_version  # noqa: F811
     major, minor, patch = int(major), int(minor), int(patch)
-    # urllib3 >= 1.21.1, <= 1.25
+    # urllib3 >= 1.21.1, <= 1.26
     assert major == 1
     assert minor >= 21
-    assert minor <= 25
+    assert minor <= 26
 
     # Check chardet for compatibility.
     major, minor, patch = chardet_version.split('.')[:3]
     major, minor, patch = int(major), int(minor), int(patch)
-    # chardet >= 3.0.2, < 3.1.0
-    # assert major == 3
-    # assert minor < 1
-    # assert patch >= 2
+    # chardet >= 3.0.2, < 5.0.0
+    assert (3, 0, 2) <= (major, minor, patch) < (5, 0, 0)
 
 
 def _check_cryptography(cryptography_version):
diff --git a/lib/requests/__version__.py b/lib/requests/__version__.py
index 531e26c..1267488 100644
--- a/lib/requests/__version__.py
+++ b/lib/requests/__version__.py
@@ -5,8 +5,8 @@
 __title__ = 'requests'
 __description__ = 'Python HTTP for Humans.'
 __url__ = 'https://requests.readthedocs.io'
-__version__ = '2.24.0'
-__build__ = 0x022400
+__version__ = '2.25.1'
+__build__ = 0x022501
 __author__ = 'Kenneth Reitz'
 __author_email__ = 'me@kennethreitz.org'
 __license__ = 'Apache 2.0'
diff --git a/lib/requests/sessions.py b/lib/requests/sessions.py
index fdf7e9f..ae4bcc8 100644
--- a/lib/requests/sessions.py
+++ b/lib/requests/sessions.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
 """
-requests.session
-~~~~~~~~~~~~~~~~
+requests.sessions
+~~~~~~~~~~~~~~~~~
 
 This module provides a Session object to manage and persist settings across
 requests (cookies, auth, proxies).
@@ -633,7 +633,7 @@ class Session(SessionRedirectMixin):
         kwargs.setdefault('stream', self.stream)
         kwargs.setdefault('verify', self.verify)
         kwargs.setdefault('cert', self.cert)
-        kwargs.setdefault('proxies', self.proxies)
+        kwargs.setdefault('proxies', self.rebuild_proxies(request, self.proxies))
 
         # It's possible that users might accidentally send a Request object.
         # Guard against that specific failure case.
diff --git a/lib/requests/utils.py b/lib/requests/utils.py
index 16d5776..db67938 100644
--- a/lib/requests/utils.py
+++ b/lib/requests/utils.py
@@ -503,6 +503,10 @@ def get_encoding_from_headers(headers):
     if 'text' in content_type:
         return 'ISO-8859-1'
 
+    if 'application/json' in content_type:
+        # Assume UTF-8 based on RFC 4627: https://www.ietf.org/rfc/rfc4627.txt since the charset was unset
+        return 'utf-8'
+
 
 def stream_decode_response_unicode(iterator, r):
     """Stream decodes a iterator."""
diff --git a/lib/sg_futures/base.py b/lib/sg_futures/base.py
index e2db376..606bf19 100644
--- a/lib/sg_futures/base.py
+++ b/lib/sg_futures/base.py
@@ -16,7 +16,7 @@ class GenericWorkItem(_WorkItem):
 
     def _set_thread_name(self):
         try:
-            ct = threading.currentThread()
+            ct = threading.current_thread()
             ct.name = '%s^WEB%s' % (self.args[0].__class__.__name__.upper(), self.number_regex.search(ct.name).group(1))
         except (BaseException, Exception):
             pass
diff --git a/lib/sg_helpers.py b/lib/sg_helpers.py
index 1bd047f..be784e6 100644
--- a/lib/sg_helpers.py
+++ b/lib/sg_helpers.py
@@ -2,6 +2,7 @@
 # ---------------
 # functions are placed here to remove cyclic import issues from placement in helpers
 #
+import ast
 import codecs
 import datetime
 import getpass
@@ -14,6 +15,7 @@ import shutil
 import socket
 import stat
 import subprocess
+import sys
 import tempfile
 import threading
 import time
@@ -29,26 +31,38 @@ from send2trash import send2trash
 import encodingKludge as ek
 import requests
 
-from _23 import decode_bytes, filter_list, html_unescape, list_range, scandir, urlparse, urlsplit, urlunparse
+from _23 import decode_bytes, filter_list, html_unescape, list_range, \
+    ordered_dict, Popen, scandir, urlparse, urlsplit, urlunparse
 from six import integer_types, iteritems, iterkeys, itervalues, PY2, string_types, text_type
 
 import zipfile
-try:
-    import py7zr
-except ImportError:
-    py7zr = None
+# py7z hardwired removed, see comment below
+py7zr = None
 
 # noinspection PyUnreachableCode
 if False:
+    from _23 import DirEntry
+    from lxml_etree import etree
+    try:
+        # py7z hardwired removed because Python 3.9 interpretor crashes with a process kill signal 9 when memory is
+        # low/exhausted during a native 7z compress action on Linux. Therefore, the native functions cannot be trusted.
+        # `import` moved to this non-runtime scope to preserve code resolution in case reinstated at a later PY release
+        # noinspection PyUnresolvedReferences,PyPackageRequirements
+        import py7zr
+    except ImportError:
+        py7zr = None
+    # sickbeard is strictly used here for resolution, this is only possible because
+    # this section is not used at runtime which would create circular reference issues
+    # noinspection PyPep8Naming
+    from sickbeard import db, notifiers as NOTIFIERS
     # noinspection PyUnresolvedReferences
     from typing import Any, AnyStr, Dict, Generator, NoReturn, integer_types, Iterable, Iterator, List, Optional, \
         Tuple, Union
-    from lxml_etree import etree
-    from _23 import DirEntry
 
 # global tmdb_info cache
 _TMDB_INFO_CACHE = {'date': datetime.datetime(2000, 1, 1), 'data': None}
 
+PROG_DIR = ek.ek(os.path.join, os.path.dirname(os.path.normpath(os.path.abspath(__file__))), '..')
 
 # Mapping error status codes to official W3C names
 http_error_code = {
@@ -97,10 +111,12 @@ USER_AGENT = ''
 CACHE_DIR = None
 DATA_DIR = None
 PROXY_SETTING = None
-NOTIFIERS = None
 TRASH_REMOVE_SHOW = False
 
+# noinspection PyRedeclaration
 db = None
+# noinspection PyRedeclaration
+NOTIFIERS = None
 
 
 class ConnectionFailTypes(object):
@@ -1140,7 +1156,7 @@ def fix_set_group_id(child_path):
             logger.debug(u'Respecting the set-group-ID bit on the parent directory for %s' % child_path)
         except OSError:
             logger.error(u'Failed to respect the set-group-id bit on the parent directory for %s (setting group id %i)'
-                       % (child_path, parent_gid))
+                         % (child_path, parent_gid))
 
 
 def copy_file(src_file, dest_file):
@@ -1392,9 +1408,6 @@ def compress_file(target, filename, prefer_7z=True, remove_source=True):
     :return: success of compression
     """
     try:
-        # py7z is hardwired removed because Python 3.9 interpretor crashes with a process kill signal 9 when memory is
-        # low/exhausted during a native 7z compress action on Linux. Therefore, the native functions cannot be trusted
-        prefer_7z = False and prefer_7z
         if prefer_7z and None is not py7zr:
             z_name = '%s.7z' % target.rpartition('.')[0]
             with py7zr.SevenZipFile(z_name, 'w') as z_file:
@@ -1444,3 +1457,66 @@ def scantree(path,  # type: AnyStr
                         yield subentry
                 if no_filter:
                     yield entry
+
+
+def cmdline_runner(cmd, shell=False, suppress_stderr=False):
+    # type: (Union[AnyStr, List[AnyStr]], bool, bool) -> Tuple[AnyStr, Optional[AnyStr], int]
+    """ Execute a child program in a new process.
+
+    Can raise an exception to be caught in callee
+
+    :param cmd: A string, or a sequence of program arguments
+    :param shell: If true, the command will be executed through the shell.
+    :param suppress_stderr: Suppress stderr output if True
+    """
+    # noinspection PyUnresolvedReferences
+    kw = dict(cwd=PROG_DIR, shell=shell, stdin=subprocess.PIPE, stdout=subprocess.PIPE,
+              stderr=(open(os.devnull, 'w') if PY2 else subprocess.DEVNULL, subprocess.STDOUT)[not suppress_stderr])
+
+    if not PY2:
+        kw.update(dict(encoding=ek.SYS_ENCODING, text=True, bufsize=0))
+
+    if 'win32' == sys.platform:
+        kw['creationflags'] = 0x08000000   # CREATE_NO_WINDOW (needed for py2exe)
+
+    with Popen(cmd, **kw) as p:
+        out, err = p.communicate()
+        if out:
+            out = out.strip()
+
+        return out, err, p.returncode
+
+
+def ast_eval(value, default=None):
+    # type: (AnyStr, Any) -> Any
+    """Convert string typed value into actual Python type and value
+
+    :param value: string value to convert
+    :param default: value to return if cannot convert
+    :return: converted type and value or default
+    """
+    if not isinstance(value, string_types):
+        return default
+
+    if 'OrderedDict()' == value:
+        value = ordered_dict()
+
+    elif 'OrderedDict([(' == value[0:14]:
+        try:
+            list_of_tuples = ast.literal_eval(value[12:-1])
+            value = ordered_dict()
+            for cur_tuple in list_of_tuples:
+                value[cur_tuple[0]] = cur_tuple[1]
+        except (BaseException, Exception):
+            value = default
+
+    elif '{' == value[0:1] and '}' == value[-1]:  # this way avoids index out of range with (value = '' and [-1])
+        try:
+            value = ast.literal_eval(value)
+        except (BaseException, Exception):
+            value = default
+
+    else:
+        value = default
+
+    return value
diff --git a/lib/six.py b/lib/six.py
index 83f6978..4e15675 100644
--- a/lib/six.py
+++ b/lib/six.py
@@ -29,7 +29,7 @@ import sys
 import types
 
 __author__ = "Benjamin Peterson <benjamin@python.org>"
-__version__ = "1.15.0"
+__version__ = "1.16.0"
 
 
 # Useful for very coarse version differentiation.
@@ -71,6 +71,11 @@ else:
             MAXSIZE = int((1 << 63) - 1)
         del X
 
+if PY34:
+    from importlib.util import spec_from_loader
+else:
+    spec_from_loader = None
+
 
 def _add_doc(func, doc):
     """Add documentation to a function."""
@@ -186,6 +191,11 @@ class _SixMetaPathImporter(object):
             return self
         return None
 
+    def find_spec(self, fullname, path, target=None):
+        if fullname in self.known_modules:
+            return spec_from_loader(fullname, self)
+        return None
+
     def __get_module(self, fullname):
         try:
             return self.known_modules[fullname]
@@ -223,6 +233,12 @@ class _SixMetaPathImporter(object):
         return None
     get_source = get_code  # same as get_code
 
+    def create_module(self, spec):
+        return self.load_module(spec.name)
+
+    def exec_module(self, module):
+        pass
+
 _importer = _SixMetaPathImporter(__name__)
 
 
diff --git a/lib/urllib3/_version.py b/lib/urllib3/_version.py
index 5a0ec53..2dba29e 100644
--- a/lib/urllib3/_version.py
+++ b/lib/urllib3/_version.py
@@ -1,2 +1,2 @@
 # This file is protected via CODEOWNERS
-__version__ = "1.25.11"
+__version__ = "1.26.2"
diff --git a/lib/urllib3/connection.py b/lib/urllib3/connection.py
index 5248741..2a5a3f8 100644
--- a/lib/urllib3/connection.py
+++ b/lib/urllib3/connection.py
@@ -228,7 +228,7 @@ class HTTPConnection(_HTTPConnection, object):
         else:
             # Avoid modifying the headers passed into .request()
             headers = headers.copy()
-        if "user-agent" not in (k.lower() for k in headers):
+        if "user-agent" not in (six.ensure_str(k.lower()) for k in headers):
             headers["User-Agent"] = _get_default_user_agent()
         super(HTTPConnection, self).request(method, url, body=body, headers=headers)
 
diff --git a/lib/urllib3/util/ssl_.py b/lib/urllib3/util/ssl_.py
index 1cb5e7c..e4b5df7 100644
--- a/lib/urllib3/util/ssl_.py
+++ b/lib/urllib3/util/ssl_.py
@@ -44,13 +44,21 @@ _const_compare_digest = getattr(hmac, "compare_digest", _const_compare_digest_ba
 
 try:  # Test for SSL features
     import ssl
-    from ssl import HAS_SNI  # Has SNI?
     from ssl import CERT_REQUIRED, wrap_socket
+except ImportError:
+    pass
+
+try:
+    from ssl import HAS_SNI  # Has SNI?
+except ImportError:
+    pass
 
+try:
     from .ssltransport import SSLTransport
 except ImportError:
     pass
 
+
 try:  # Platform-specific: Python 3.6
     from ssl import PROTOCOL_TLS
 
@@ -393,7 +401,7 @@ def ssl_wrap_socket(
     try:
         if hasattr(context, "set_alpn_protocols"):
             context.set_alpn_protocols(ALPN_PROTOCOLS)
-    except NotImplementedError:
+    except NotImplementedError:  # Defensive: in CI, we always have set_alpn_protocols
         pass
 
     # If we detect server_hostname is an IP address then the SNI
diff --git a/recommended.txt b/recommended.txt
index f292a1d..0622006 100644
--- a/recommended.txt
+++ b/recommended.txt
@@ -1,4 +1,25 @@
-lxml>=4.4.2
-regex>=2019.11.1
-python-Levenshtein>=0.12.0
-scandir>=1.10.0; python_version < '3.0'
+cryptography; '3.7' <= python_version
+cryptography <= 3.2.1; '3.0' > python_version
+lxml >= 4.6.1
+lxml@https://raw.githubusercontent.com/wiki/SickGear/SickGear/packages/lxml-4.6.3-cp310-cp310-win_amd64.whl ; '3.10' <= python_version and 'Windows' == platform_system and ('AMD64' == platform_machine or 'x86_64' == platform_machine)
+lxml@https://raw.githubusercontent.com/wiki/SickGear/SickGear/packages/lxml-4.6.3-cp310-cp310-win32.whl ; '3.10' <= python_version and 'Windows' == platform_system and ('AMD64' != platform_machine and 'x86_64' != platform_machine)
+pip >= 20.0.0; '3.7' <= python_version
+pip <= 19.3.1; '3.0' > python_version
+python-Levenshtein >= 0.12.2; '3.7' <= python_version and 'Windows' == platform_system
+python-Levenshtein >= 0.12.0, != 0.12.1; '3.7' <= python_version and 'Windows' != platform_system
+python-Levenshtein@https://raw.githubusercontent.com/wiki/SickGear/SickGear/packages/python_Levenshtein-0.12.2-cp39-cp39-win_amd64.whl  ; '3.9' == python_version and 'Windows' == platform_system and ('AMD64' == platform_machine or 'x86_64' == platform_machine)
+python-Levenshtein@https://raw.githubusercontent.com/wiki/SickGear/SickGear/packages/python_Levenshtein-0.12.2-cp38-cp38-win_amd64.whl  ; '3.8' == python_version and 'Windows' == platform_system and ('AMD64' == platform_machine or 'x86_64' == platform_machine)
+python-Levenshtein@https://raw.githubusercontent.com/wiki/SickGear/SickGear/packages/python_Levenshtein-0.12.2-cp37-cp37m-win_amd64.whl ; '3.7' == python_version and 'Windows' == platform_system and ('AMD64' == platform_machine or 'x86_64' == platform_machine)
+python-Levenshtein@https://raw.githubusercontent.com/wiki/SickGear/SickGear/packages/python_Levenshtein-0.12.2-cp39-cp39-win32.whl  ; '3.9' == python_version and 'Windows' == platform_system and ('AMD64' != platform_machine and 'x86_64' != platform_machine)
+python-Levenshtein@https://raw.githubusercontent.com/wiki/SickGear/SickGear/packages/python_Levenshtein-0.12.2-cp38-cp38-win32.whl  ; '3.8' == python_version and 'Windows' == platform_system and ('AMD64' != platform_machine and 'x86_64' != platform_machine)
+python-Levenshtein@https://raw.githubusercontent.com/wiki/SickGear/SickGear/packages/python_Levenshtein-0.12.2-cp37-cp37m-win32.whl ; '3.7' == python_version and 'Windows' == platform_system and ('AMD64' != platform_machine and 'x86_64' != platform_machine)
+python-Levenshtein == 0.12.0; '3.0' > python_version
+python-Levenshtein@https://raw.githubusercontent.com/wiki/SickGear/SickGear/packages/python_Levenshtein-0.12.0-cp27-cp27m-win_amd64.whl ; '2.7' == python_version and 'Windows' == platform_system and ('AMD64' == platform_machine or 'x86_64' == platform_machine)
+python-Levenshtein@https://raw.githubusercontent.com/wiki/SickGear/SickGear/packages/python_Levenshtein-0.12.0-cp27-cp27m-win32.whl ; '2.7' == python_version and 'Windows' == platform_system and ('AMD64' != platform_machine and 'x86_64' != platform_machine)
+regex >= 2020.11.1; '3.7' <= python_version
+regex <= 2020.10.28; '3.0' > python_version
+regex@https://raw.githubusercontent.com/wiki/SickGear/SickGear/packages/regex-2021.4.4-cp310-cp310-win_amd64.whl ; '3.10' <= python_version and 'Windows' == platform_system and ('AMD64' == platform_machine or 'x86_64' == platform_machine)
+regex@https://raw.githubusercontent.com/wiki/SickGear/SickGear/packages/regex-2021.4.4-cp310-cp310-win32.whl ; '3.10' <= python_version and 'Windows' == platform_system and ('AMD64' != platform_machine and 'x86_64' != platform_machine)
+scandir >= 1.10.0; '3.0' > python_version
+setuptools >= 50.0.0; '3.7' <= python_version
+setuptools <= 44.1.1; '3.0' > python_version
diff --git a/requirements.txt b/requirements.txt
index 79b4e2d..7ea7442 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1 @@
-Cheetah3>=3.2.5
+Cheetah3>=3.2.5
\ No newline at end of file
diff --git a/sickbeard/__init__.py b/sickbeard/__init__.py
index 5d5ffc7..3563e8d 100755
--- a/sickbeard/__init__.py
+++ b/sickbeard/__init__.py
@@ -30,7 +30,6 @@ import socket
 import webbrowser
 
 # apparently py2exe won't build these unless they're imported somewhere
-import ast
 import os.path
 import sys
 import threading
@@ -96,7 +95,8 @@ events = None  # type: Events
 recent_search_scheduler = None
 backlog_search_scheduler = None
 show_update_scheduler = None
-version_check_scheduler = None
+update_software_scheduler = None
+update_packages_scheduler = None
 show_queue_scheduler = None
 search_queue_scheduler = None
 proper_finder_scheduler = None
@@ -128,9 +128,22 @@ metadata_provider_dict = {}
 
 MODULE_UPDATE_STRING = None
 NEWEST_VERSION_STRING = None
-VERSION_NOTIFY = False
-AUTO_UPDATE = False
+
+MIN_UPDATE_INTERVAL = 1
+DEFAULT_UPDATE_INTERVAL = 12
+UPDATE_NOTIFY = False
+UPDATE_AUTO = False
+UPDATE_INTERVAL = DEFAULT_UPDATE_INTERVAL
 NOTIFY_ON_UPDATE = False
+
+MIN_UPDATE_PACKAGES_INTERVAL = 1
+MAX_UPDATE_PACKAGES_INTERVAL = 9999
+DEFAULT_UPDATE_PACKAGES_INTERVAL = 24
+UPDATE_PACKAGES_NOTIFY = False
+UPDATE_PACKAGES_AUTO = False
+UPDATE_PACKAGES_MENU = False
+UPDATE_PACKAGES_INTERVAL = DEFAULT_UPDATE_PACKAGES_INTERVAL
+
 CUR_COMMIT_HASH = None
 EXT_UPDATES = False
 BRANCH = ''
@@ -199,15 +212,16 @@ METADATA_KODI = None
 
 RESULTS_SORTBY = None
 
+TVINFO_DEFAULT = 0
+TVINFO_TIMEOUT = 20
 QUALITY_DEFAULT = SD
-STATUS_DEFAULT = SKIPPED
 WANTED_BEGIN_DEFAULT = 0
 WANTED_LATEST_DEFAULT = 0
-FLATTEN_FOLDERS_DEFAULT = False
-SUBTITLES_DEFAULT = False
-TVINFO_DEFAULT = 0
-TVINFO_TIMEOUT = 20
+PAUSE_DEFAULT = False
+STATUS_DEFAULT = SKIPPED
 SCENE_DEFAULT = False
+SUBTITLES_DEFAULT = False
+FLATTEN_FOLDERS_DEFAULT = False
 ANIME_DEFAULT = False
 USE_IMDB_INFO = True
 IMDB_ACCOUNTS = []
@@ -246,14 +260,12 @@ NEWZNAB_DATA = ''
 DEFAULT_MEDIAPROCESS_INTERVAL = 10
 DEFAULT_BACKLOG_PERIOD = 21
 DEFAULT_RECENTSEARCH_INTERVAL = 40
-DEFAULT_UPDATE_INTERVAL = 1
 DEFAULT_WATCHEDSTATE_INTERVAL = 10
 
 MEDIAPROCESS_INTERVAL = DEFAULT_MEDIAPROCESS_INTERVAL
 BACKLOG_PERIOD = DEFAULT_BACKLOG_PERIOD
 BACKLOG_LIMITED_PERIOD = 7
 RECENTSEARCH_INTERVAL = DEFAULT_RECENTSEARCH_INTERVAL
-UPDATE_INTERVAL = DEFAULT_UPDATE_INTERVAL
 
 RECENTSEARCH_STARTUP = False
 BACKLOG_NOFULL = False
@@ -262,7 +274,6 @@ MIN_MEDIAPROCESS_INTERVAL = 1
 MIN_RECENTSEARCH_INTERVAL = 10
 MIN_BACKLOG_PERIOD = 7
 MAX_BACKLOG_PERIOD = 42
-MIN_UPDATE_INTERVAL = 1
 MIN_WATCHEDSTATE_INTERVAL = 10
 MAX_WATCHEDSTATE_INTERVAL = 60
 
@@ -278,6 +289,9 @@ RENAME_EPISODES = False
 AIRDATE_EPISODES = False
 PROCESS_AUTOMATICALLY = False
 KEEP_PROCESSED_DIR = False
+PROCESS_LAST_DIR = None
+PROCESS_LAST_METHOD = None
+PROCESS_LAST_CLEANUP = False
 PROCESS_METHOD = None
 MOVE_ASSOCIATED_FILES = False
 POSTPONE_IF_SYNC_FILES = True
@@ -552,6 +566,8 @@ BACKUP_DB_ONEDAY = False  # type: bool
 BACKUP_DB_MAX_COUNT = 14  # type: int
 BACKUP_DB_DEFAULT_COUNT = 14  # type: int
 
+UPDATES_TODO = {}
+
 EXTRA_SCRIPTS = []
 SG_EXTRA_SCRIPTS = []
 
@@ -597,6 +613,7 @@ else:
 
 MC_MRU = ''
 TVC_MRU = ''
+NE_MRU = ''
 
 COOKIE_SECRET = b64encodestring(uuid.uuid4().bytes + uuid.uuid4().bytes)
 
@@ -643,10 +660,10 @@ def init_stage_1(console_logging):
     # Add Show Search
     global RESULTS_SORTBY
     # Add Show Defaults
-    global STATUS_DEFAULT, QUALITY_DEFAULT, SHOW_TAG_DEFAULT, FLATTEN_FOLDERS_DEFAULT, SUBTITLES_DEFAULT, \
-        WANTED_BEGIN_DEFAULT, WANTED_LATEST_DEFAULT, SCENE_DEFAULT, ANIME_DEFAULT
+    global QUALITY_DEFAULT, WANTED_BEGIN_DEFAULT, WANTED_LATEST_DEFAULT, SHOW_TAG_DEFAULT, PAUSE_DEFAULT, \
+        STATUS_DEFAULT, SCENE_DEFAULT, SUBTITLES_DEFAULT, FLATTEN_FOLDERS_DEFAULT, ANIME_DEFAULT
     # Post processing
-    global KEEP_PROCESSED_DIR
+    global KEEP_PROCESSED_DIR, PROCESS_LAST_DIR, PROCESS_LAST_METHOD, PROCESS_LAST_CLEANUP
     # Views
     global GUI_NAME, HOME_LAYOUT, FOOTER_TIME_LAYOUT, POSTER_SORTBY, POSTER_SORTDIR, DISPLAY_SHOW_SPECIALS, \
         EPISODE_VIEW_LAYOUT, EPISODE_VIEW_SORT, EPISODE_VIEW_DISPLAY_PAUSED, \
@@ -658,7 +675,8 @@ def init_stage_1(console_logging):
     # Gen Config/Misc
     global LAUNCH_BROWSER, UPDATE_SHOWS_ON_START, SHOW_UPDATE_HOUR, \
         TRASH_REMOVE_SHOW, TRASH_ROTATE_LOGS, ACTUAL_LOG_DIR, LOG_DIR, TVINFO_TIMEOUT, ROOT_DIRS, \
-        VERSION_NOTIFY, AUTO_UPDATE, UPDATE_INTERVAL, NOTIFY_ON_UPDATE
+        UPDATE_NOTIFY, UPDATE_AUTO, UPDATE_INTERVAL, NOTIFY_ON_UPDATE,\
+        UPDATE_PACKAGES_NOTIFY, UPDATE_PACKAGES_AUTO, UPDATE_PACKAGES_MENU, UPDATE_PACKAGES_INTERVAL
     # Gen Config/Interface
     global THEME_NAME, DEFAULT_HOME, FANART_LIMIT, SHOWLIST_TAGVIEW, SHOW_TAGS, \
         HOME_SEARCH_FOCUS, USE_IMDB_INFO, IMDB_ACCOUNTS, DISPLAY_FREESPACE, SORT_ARTICLE, FUZZY_DATING, TRIM_ZERO, \
@@ -736,7 +754,7 @@ def init_stage_1(console_logging):
     global USE_TRAKT, TRAKT_CONNECTED_ACCOUNT, TRAKT_ACCOUNTS, TRAKT_MRU, TRAKT_VERIFY, \
         TRAKT_USE_WATCHLIST, TRAKT_REMOVE_WATCHLIST, TRAKT_TIMEOUT, TRAKT_METHOD_ADD, TRAKT_START_PAUSED, \
         TRAKT_SYNC, TRAKT_DEFAULT_INDEXER, TRAKT_REMOVE_SERIESLIST, TRAKT_UPDATE_COLLECTION, \
-        MC_MRU, TVC_MRU, \
+        MC_MRU, TVC_MRU, NE_MRU, \
         USE_SLACK, SLACK_NOTIFY_ONSNATCH, SLACK_NOTIFY_ONDOWNLOAD, SLACK_NOTIFY_ONSUBTITLEDOWNLOAD, \
         SLACK_CHANNEL, SLACK_AS_AUTHED, SLACK_BOT_NAME, SLACK_ICON_URL, SLACK_ACCESS_TOKEN, \
         USE_DISCORD, DISCORD_NOTIFY_ONSNATCH, DISCORD_NOTIFY_ONDOWNLOAD, \
@@ -752,6 +770,8 @@ def init_stage_1(console_logging):
     global ANIME_TREAT_AS_HDTV, USE_ANIDB, ANIDB_USERNAME, ANIDB_PASSWORD, ANIDB_USE_MYLIST
     # db backup settings
     global BACKUP_DB_PATH, BACKUP_DB_ONEDAY, BACKUP_DB_MAX_COUNT, BACKUP_DB_DEFAULT_COUNT
+    # pip update states
+    global UPDATES_TODO
 
     for stanza in ('General', 'Blackhole', 'SABnzbd', 'NZBGet', 'Emby', 'Kodi', 'XBMC', 'PLEX',
                    'Growl', 'Prowl', 'Slack', 'Discord', 'Boxcar2', 'NMJ', 'NMJv2',
@@ -803,11 +823,7 @@ def init_stage_1(console_logging):
     DEFAULT_HOME = check_setting_str(CFG, 'GUI', 'default_home', 'episodes')
     FANART_LIMIT = check_setting_int(CFG, 'GUI', 'fanart_limit', 3)
     FANART_PANEL = check_setting_str(CFG, 'GUI', 'fanart_panel', 'highlight2')
-    FANART_RATINGS = check_setting_str(CFG, 'GUI', 'fanart_ratings', None)
-    if None is not FANART_RATINGS:
-        FANART_RATINGS = ast.literal_eval(FANART_RATINGS or '{}')
-    if not isinstance(FANART_RATINGS, dict):
-        FANART_RATINGS = {}
+    FANART_RATINGS = sg_helpers.ast_eval(check_setting_str(CFG, 'GUI', 'fanart_ratings', None), {})
     USE_IMDB_INFO = bool(check_setting_int(CFG, 'GUI', 'use_imdb_info', 1))
     IMDB_ACCOUNTS = CFG.get('GUI', []).get('imdb_accounts', [IMDB_DEFAULT_LIST_ID, IMDB_DEFAULT_LIST_NAME])
     HOME_SEARCH_FOCUS = bool(check_setting_int(CFG, 'General', 'home_search_focus', HOME_SEARCH_FOCUS))
@@ -901,19 +917,38 @@ def init_stage_1(console_logging):
     STATUS_DEFAULT = check_setting_int(CFG, 'General', 'status_default', SKIPPED)
     WANTED_BEGIN_DEFAULT = check_setting_int(CFG, 'General', 'wanted_begin_default', 0)
     WANTED_LATEST_DEFAULT = check_setting_int(CFG, 'General', 'wanted_latest_default', 0)
-    VERSION_NOTIFY = bool(check_setting_int(CFG, 'General', 'version_notify', 1))
-    AUTO_UPDATE = bool(check_setting_int(CFG, 'General', 'auto_update', 0))
+
+    UPDATE_NOTIFY = bool(check_setting_int(CFG, 'General', 'update_notify', None))
+    if None is UPDATE_NOTIFY:
+        UPDATE_NOTIFY = check_setting_int(CFG, 'General', 'version_notify', 1)  # deprecated 2020.11.21 no config update
+    UPDATE_AUTO = bool(check_setting_int(CFG, 'General', 'update_auto', None))
+    if None is UPDATE_AUTO:
+        UPDATE_AUTO = check_setting_int(CFG, 'General', 'auto_update', 0)  # deprecated 2020.11.21 no config update
+    UPDATE_INTERVAL = max(
+        MIN_UPDATE_INTERVAL,
+        check_setting_int(CFG, 'General', 'update_interval', DEFAULT_UPDATE_INTERVAL))
     NOTIFY_ON_UPDATE = bool(check_setting_int(CFG, 'General', 'notify_on_update', 1))
-    FLATTEN_FOLDERS_DEFAULT = bool(check_setting_int(CFG, 'General', 'flatten_folders_default', 0))
+
+    UPDATE_PACKAGES_NOTIFY = bool(
+        check_setting_int(CFG, 'General', 'update_packages_notify', 'win' == sys.platform[0:3]))
+    UPDATE_PACKAGES_AUTO = bool(check_setting_int(CFG, 'General', 'update_packages_auto', 0))
+    UPDATE_PACKAGES_MENU = bool(check_setting_int(CFG, 'General', 'update_packages_menu', 0))
+    UPDATE_PACKAGES_INTERVAL = max(
+        MIN_UPDATE_PACKAGES_INTERVAL,
+        check_setting_int(CFG, 'General', 'update_packages_interval', DEFAULT_UPDATE_PACKAGES_INTERVAL))
+
     TVINFO_DEFAULT = check_setting_int(CFG, 'General', 'indexer_default', 0)
     if TVINFO_DEFAULT and not TVInfoAPI(TVINFO_DEFAULT).config['active']:
         TVINFO_DEFAULT = TVINFO_TVDB
     TVINFO_TIMEOUT = check_setting_int(CFG, 'General', 'indexer_timeout', 20)
-    ANIME_DEFAULT = bool(check_setting_int(CFG, 'General', 'anime_default', 0))
+
+    PAUSE_DEFAULT = bool(check_setting_int(CFG, 'General', 'pause default', 0))
     SCENE_DEFAULT = bool(check_setting_int(CFG, 'General', 'scene_default', 0))
+    FLATTEN_FOLDERS_DEFAULT = bool(check_setting_int(CFG, 'General', 'flatten_folders_default', 0))
+    ANIME_DEFAULT = bool(check_setting_int(CFG, 'General', 'anime_default', 0))
 
     PROVIDER_ORDER = check_setting_str(CFG, 'General', 'provider_order', '').split()
-    PROVIDER_HOMES = ast.literal_eval(check_setting_str(CFG, 'General', 'provider_homes', None) or '{}')
+    PROVIDER_HOMES = sg_helpers.ast_eval(check_setting_str(CFG, 'General', 'provider_homes', None), {})
 
     NAMING_PATTERN = check_setting_str(CFG, 'General', 'naming_pattern', 'Season %0S/%SN - S%0SE%0E - %EN')
     NAMING_ABD_PATTERN = check_setting_str(CFG, 'General', 'naming_abd_pattern', '%SN - %A.D - %EN')
@@ -966,10 +1001,6 @@ def init_stage_1(console_logging):
     BACKLOG_PERIOD = minimax(BACKLOG_PERIOD, DEFAULT_BACKLOG_PERIOD, MIN_BACKLOG_PERIOD, MAX_BACKLOG_PERIOD)
     BACKLOG_LIMITED_PERIOD = check_setting_int(CFG, 'General', 'backlog_limited_period', 7)
 
-    UPDATE_INTERVAL = check_setting_int(CFG, 'General', 'update_interval', DEFAULT_UPDATE_INTERVAL)
-    if UPDATE_INTERVAL < MIN_UPDATE_INTERVAL:
-        UPDATE_INTERVAL = MIN_UPDATE_INTERVAL
-
     SEARCH_UNAIRED = bool(check_setting_int(CFG, 'General', 'search_unaired', 0))
     UNAIRED_RECENT_SEARCH_ONLY = bool(check_setting_int(CFG, 'General', 'unaired_recent_search_only', 1))
     FLARESOLVERR_HOST = check_setting_str(CFG, 'General', 'flaresolverr_host', '')
@@ -984,6 +1015,9 @@ def init_stage_1(console_logging):
     AIRDATE_EPISODES = bool(check_setting_int(CFG, 'General', 'airdate_episodes', 0))
     KEEP_PROCESSED_DIR = bool(check_setting_int(CFG, 'General', 'keep_processed_dir', 1))
     PROCESS_METHOD = check_setting_str(CFG, 'General', 'process_method', 'copy' if KEEP_PROCESSED_DIR else 'move')
+    PROCESS_LAST_DIR = check_setting_str(CFG, 'General', 'process_last_dir', TV_DOWNLOAD_DIR)
+    PROCESS_LAST_METHOD = check_setting_str(CFG, 'General', 'process_last_method', PROCESS_METHOD)
+    PROCESS_LAST_CLEANUP = bool(check_setting_int(CFG, 'General', 'process_last_cleanup', 0))
     MOVE_ASSOCIATED_FILES = bool(check_setting_int(CFG, 'General', 'move_associated_files', 0))
     POSTPONE_IF_SYNC_FILES = bool(check_setting_int(CFG, 'General', 'postpone_if_sync_files', 1))
     NFO_RENAME = bool(check_setting_int(CFG, 'General', 'nfo_rename', 1))
@@ -1162,6 +1196,7 @@ def init_stage_1(console_logging):
 
     MC_MRU = check_setting_str(CFG, 'Metacritic', 'mc_mru', '')
     TVC_MRU = check_setting_str(CFG, 'TVCalendar', 'tvc_mru', '')
+    NE_MRU = check_setting_str(CFG, 'NextEpisode', 'ne_mru', '')
 
     USE_PYTIVO = bool(check_setting_int(CFG, 'pyTivo', 'use_pytivo', 0))
     PYTIVO_HOST = check_setting_str(CFG, 'pyTivo', 'pytivo_host', '')
@@ -1313,17 +1348,15 @@ def init_stage_1(console_logging):
         lambda y: TVidProdid.glue in y and y or '%s%s%s' % (
             (TVINFO_TVDB, TVINFO_IMDB)[bool(helpers.parse_imdb_id(y))], TVidProdid.glue, y),
         [x.strip() for x in check_setting_str(CFG, 'GUI', 'browselist_hidden', '').split('|~|') if x.strip()])
-    BROWSELIST_MRU = check_setting_str(CFG, 'GUI', 'browselist_prefs', None)
-    if None is not BROWSELIST_MRU:
-        BROWSELIST_MRU = ast.literal_eval(BROWSELIST_MRU or '{}')
-    if not isinstance(BROWSELIST_MRU, dict):
-        BROWSELIST_MRU = {}
+    BROWSELIST_MRU = sg_helpers.ast_eval(check_setting_str(CFG, 'GUI', 'browselist_prefs', None), {})
 
     BACKUP_DB_PATH = check_setting_str(CFG, 'Backup', 'backup_db_path', '')
     BACKUP_DB_ONEDAY = bool(check_setting_int(CFG, 'Backup', 'backup_db_oneday', 0))
     BACKUP_DB_MAX_COUNT = minimax(check_setting_int(CFG, 'Backup', 'backup_db_max_count', BACKUP_DB_DEFAULT_COUNT),
                                   BACKUP_DB_DEFAULT_COUNT, 0, 90)
 
+    UPDATES_TODO = sg_helpers.ast_eval(check_setting_str(CFG, 'Updates', 'updates_todo', None), {})
+
     sg_helpers.db = db
     sg_helpers.DOMAIN_FAILURES.load_from_db()
 
@@ -1395,7 +1428,7 @@ def init_stage_1(console_logging):
 
         for (attr, default) in [
             ('enable_backlog', True), ('enable_scheduled_backlog', True),
-            ('api_key', ''), ('username', ''),
+            ('api_key', ''), ('digest', ''), ('username', ''),
             ('scene_only', False), ('scene_or_contain', ''), ('scene_loose', False), ('scene_loose_active', False),
             ('scene_rej_nuked', False), ('scene_nuked_active', False),
             ('search_mode', 'eponly'), ('search_fallback', False), ('server_type', NewznabConstants.SERVER_DEFAULT)
@@ -1468,12 +1501,12 @@ def init_stage_2():
     # Schedulers
     # global trakt_checker_scheduler
     global recent_search_scheduler, backlog_search_scheduler, show_update_scheduler, \
-        version_check_scheduler, show_queue_scheduler, search_queue_scheduler, \
+        update_software_scheduler, update_packages_scheduler, show_queue_scheduler, search_queue_scheduler, \
         proper_finder_scheduler, media_process_scheduler, subtitles_finder_scheduler, \
         background_mapping_task, \
         watched_state_queue_scheduler, emby_watched_state_scheduler, plex_watched_state_scheduler
     # Gen Config/Misc
-    global SHOW_UPDATE_HOUR, UPDATE_INTERVAL
+    global SHOW_UPDATE_HOUR, UPDATE_INTERVAL, UPDATE_PACKAGES_INTERVAL
     # Search Settings/Episode
     global RECENTSEARCH_INTERVAL
     # Subtitles
@@ -1521,10 +1554,17 @@ def init_stage_2():
     # initialize schedulers
     # updaters
     update_now = datetime.timedelta(minutes=0)
-    version_check_scheduler = scheduler.Scheduler(
-        version_checker.CheckVersion(),
+    update_software_scheduler = scheduler.Scheduler(
+        version_checker.SoftwareUpdater(),
         cycleTime=datetime.timedelta(hours=UPDATE_INTERVAL),
-        threadName='CHECKVERSION',
+        threadName='SOFTWAREUPDATER',
+        silent=False)
+
+    update_packages_scheduler = scheduler.Scheduler(
+        version_checker.PackagesUpdater(),
+        cycleTime=datetime.timedelta(hours=UPDATE_PACKAGES_INTERVAL),
+        # run_delay=datetime.timedelta(minutes=2),
+        threadName='PACKAGESUPDATER',
         silent=False)
 
     show_queue_scheduler = scheduler.Scheduler(
@@ -1610,7 +1650,7 @@ def init_stage_2():
         threadName='FINDSUBTITLES',
         silent=not USE_SUBTITLES)
 
-    background_mapping_task = threading.Thread(name='LOAD-MAPPINGS', target=indexermapper.load_mapped_ids)
+    background_mapping_task = threading.Thread(name='MAPPINGSUPDATER', target=indexermapper.load_mapped_ids)
 
     watched_state_queue_scheduler = scheduler.Scheduler(
         watchedstate_queue.WatchedStateQueue(),
@@ -1629,7 +1669,7 @@ def init_stage_2():
         run_delay=datetime.timedelta(minutes=5),
         threadName='PLEXWATCHEDSTATE')
 
-    MEMCACHE['history_tab_limit'] = 9
+    MEMCACHE['history_tab_limit'] = 10
     MEMCACHE['history_tab'] = History.menu_tab(MEMCACHE['history_tab_limit'])
 
     try:
@@ -1646,10 +1686,12 @@ def init_stage_2():
 def enabled_schedulers(is_init=False):
     # ([], [trakt_checker_scheduler])[USE_TRAKT] + \
     return ([], [events])[is_init] \
-           + [recent_search_scheduler, backlog_search_scheduler, show_update_scheduler,
-              version_check_scheduler, show_queue_scheduler, search_queue_scheduler, proper_finder_scheduler,
-              media_process_scheduler, subtitles_finder_scheduler,
-              emby_watched_state_scheduler, plex_watched_state_scheduler, watched_state_queue_scheduler]\
+           + ([], [recent_search_scheduler, backlog_search_scheduler, show_update_scheduler,
+                   update_software_scheduler, update_packages_scheduler,
+                   show_queue_scheduler, search_queue_scheduler, proper_finder_scheduler,
+                   media_process_scheduler, subtitles_finder_scheduler,
+                   emby_watched_state_scheduler, plex_watched_state_scheduler, watched_state_queue_scheduler]
+              )[not MEMCACHE.get('update_restart')] \
            + ([events], [])[is_init]
 
 
@@ -1677,14 +1719,19 @@ def start():
             started = True
 
 
-def restart(soft=True):
-    if soft:
+def restart(soft=True, update_pkg=None):
+
+    if not soft:
+        if update_pkg:
+            MY_ARGS.append('--update-pkg')
+
+        events.put(events.SystemEvent.RESTART)
+
+    else:
         halt()
         save_all()
         logger.log(u'Re-initializing all data')
         initialize()
-    else:
-        events.put(events.SystemEvent.RESTART)
 
 
 def sig_handler(signum=None, _=None):
@@ -1750,12 +1797,13 @@ def halt():
 
 
 def save_all():
-    global showList
+    if not MEMCACHE.get('update_restart'):
+        global showList
 
-    # write all shows
-    logger.log(u'Saving all shows to the database')
-    for show_obj in showList:  # type: tv.TVShow
-        show_obj.save_to_db()
+        # write all shows
+        logger.log(u'Saving all shows to the database')
+        for show_obj in showList:  # type: tv.TVShow
+            show_obj.save_to_db()
 
     # save config
     logger.log(u'Saving config file to disk')
@@ -1812,7 +1860,6 @@ def save_config():
     new_config['General']['recentsearch_interval'] = int(RECENTSEARCH_INTERVAL)
     new_config['General']['backlog_period'] = int(BACKLOG_PERIOD)
     new_config['General']['backlog_limited_period'] = int(BACKLOG_LIMITED_PERIOD)
-    new_config['General']['update_interval'] = int(UPDATE_INTERVAL)
     new_config['General']['download_propers'] = int(DOWNLOAD_PROPERS)
     new_config['General']['propers_webdl_onegrp'] = int(PROPERS_WEBDL_ONEGRP)
     new_config['General']['allow_high_priority'] = int(ALLOW_HIGH_PRIORITY)
@@ -1820,21 +1867,27 @@ def save_config():
     new_config['General']['backlog_nofull'] = int(BACKLOG_NOFULL)
     new_config['General']['skip_removed_files'] = int(SKIP_REMOVED_FILES)
     new_config['General']['results_sortby'] = str(RESULTS_SORTBY)
+    new_config['General']['indexer_default'] = int(TVINFO_DEFAULT)
+    new_config['General']['indexer_timeout'] = int(TVINFO_TIMEOUT)
     new_config['General']['quality_default'] = int(QUALITY_DEFAULT)
-    new_config['General']['status_default'] = int(STATUS_DEFAULT)
     new_config['General']['wanted_begin_default'] = int(WANTED_BEGIN_DEFAULT)
     new_config['General']['wanted_latest_default'] = int(WANTED_LATEST_DEFAULT)
+    new_config['General']['pause default'] = int(PAUSE_DEFAULT)
+    new_config['General']['status_default'] = int(STATUS_DEFAULT)
+    new_config['General']['scene_default'] = int(SCENE_DEFAULT)
     new_config['General']['flatten_folders_default'] = int(FLATTEN_FOLDERS_DEFAULT)
-    new_config['General']['indexer_default'] = int(TVINFO_DEFAULT)
-    new_config['General']['indexer_timeout'] = int(TVINFO_TIMEOUT)
     new_config['General']['anime_default'] = int(ANIME_DEFAULT)
-    new_config['General']['scene_default'] = int(SCENE_DEFAULT)
     new_config['General']['provider_order'] = ' '.join(PROVIDER_ORDER)
     new_config['General']['provider_homes'] = '%s' % dict([(pid, v) for pid, v in list_items(PROVIDER_HOMES) if pid in [
         p.get_id() for p in [x for x in providers.sortedProviderList() if GenericProvider.TORRENT == x.providerType]]])
-    new_config['General']['version_notify'] = int(VERSION_NOTIFY)
-    new_config['General']['auto_update'] = int(AUTO_UPDATE)
+    new_config['General']['update_notify'] = int(UPDATE_NOTIFY)
+    new_config['General']['update_auto'] = int(UPDATE_AUTO)
+    new_config['General']['update_interval'] = int(UPDATE_INTERVAL)
     new_config['General']['notify_on_update'] = int(NOTIFY_ON_UPDATE)
+    new_config['General']['update_packages_notify'] = int(UPDATE_PACKAGES_NOTIFY)
+    new_config['General']['update_packages_auto'] = int(UPDATE_PACKAGES_AUTO)
+    new_config['General']['update_packages_menu'] = int(UPDATE_PACKAGES_MENU)
+    new_config['General']['update_packages_interval'] = int(UPDATE_PACKAGES_INTERVAL)
     new_config['General']['naming_strip_year'] = int(NAMING_STRIP_YEAR)
     new_config['General']['naming_pattern'] = NAMING_PATTERN
     new_config['General']['naming_custom_abd'] = int(NAMING_CUSTOM_ABD)
@@ -1878,6 +1931,9 @@ def save_config():
     new_config['General']['tv_download_dir'] = TV_DOWNLOAD_DIR
     new_config['General']['keep_processed_dir'] = int(KEEP_PROCESSED_DIR)
     new_config['General']['process_method'] = PROCESS_METHOD
+    new_config['General']['process_last_dir'] = PROCESS_LAST_DIR
+    new_config['General']['process_last_method'] = PROCESS_LAST_METHOD
+    new_config['General']['process_last_cleanup'] = int(PROCESS_LAST_CLEANUP)
     new_config['General']['move_associated_files'] = int(MOVE_ASSOCIATED_FILES)
     new_config['General']['postpone_if_sync_files'] = int(POSTPONE_IF_SYNC_FILES)
     new_config['General']['nfo_rename'] = int(NFO_RENAME)
@@ -1899,6 +1955,9 @@ def save_config():
     new_config['General']['require_words'] = helpers.generate_word_str(REQUIRE_WORDS, REQUIRE_WORDS_REGEX)
     new_config['General']['calendar_unprotected'] = int(CALENDAR_UNPROTECTED)
 
+    new_config['Updates'] = {}
+    new_config['Updates']['updates_todo'] = '%s' % (UPDATES_TODO or {})
+
     new_config['Backup'] = {}
     if BACKUP_DB_PATH:
         new_config['Backup']['backup_db_path'] = BACKUP_DB_PATH
@@ -1951,7 +2010,8 @@ def save_config():
         if int(src.enabled):
             new_config[src_id_uc][src_id] = int(src.enabled)
 
-        for attr in filter_iter(lambda _a: None is not getattr(src, _a, None), ('api_key', 'username', 'search_mode')):
+        for attr in filter_iter(lambda _a: None is not getattr(src, _a, None),
+                                ('api_key', 'digest', 'username', 'search_mode')):
             if 'search_mode' != attr or 'eponly' != getattr(src, attr):
                 new_config[src_id_uc]['%s_%s' % (src_id, attr)] = getattr(src, attr)
 
@@ -2123,6 +2183,9 @@ def save_config():
         ('TVCalendar', [
             ('mru', TVC_MRU)
         ]),
+        ('NextEpisode', [
+            ('mru', NE_MRU)
+        ]),
         ('Slack', [
             ('use_%s', int(USE_SLACK)),
             ('channel', SLACK_CHANNEL),
@@ -2222,7 +2285,7 @@ def save_config():
     new_config['GUI']['default_home'] = DEFAULT_HOME
     new_config['GUI']['fanart_limit'] = FANART_LIMIT
     new_config['GUI']['fanart_panel'] = FANART_PANEL
-    new_config['GUI']['fanart_ratings'] = '%s' % FANART_RATINGS
+    new_config['GUI']['fanart_ratings'] = '%s' % (FANART_RATINGS or {})
     new_config['GUI']['use_imdb_info'] = int(USE_IMDB_INFO)
     new_config['GUI']['imdb_accounts'] = IMDB_ACCOUNTS
     new_config['GUI']['fuzzy_dating'] = int(FUZZY_DATING)
@@ -2261,7 +2324,7 @@ def save_config():
     new_config['GUI']['show_tag_default'] = SHOW_TAG_DEFAULT
     new_config['GUI']['history_layout'] = HISTORY_LAYOUT
     new_config['GUI']['browselist_hidden'] = '|~|'.join(BROWSELIST_HIDDEN)
-    new_config['GUI']['browselist_prefs'] = '%s' % BROWSELIST_MRU
+    new_config['GUI']['browselist_prefs'] = '%s' % (BROWSELIST_MRU or {})
 
     new_config['Subtitles'] = {}
     new_config['Subtitles']['use_subtitles'] = int(USE_SUBTITLES)
diff --git a/sickbeard/_legacy.py b/sickbeard/_legacy.py
index e672a2d..0eaebf8 100644
--- a/sickbeard/_legacy.py
+++ b/sickbeard/_legacy.py
@@ -407,14 +407,6 @@ class LegacyBaseHandler(LegacyBase):
         # abstract method
         pass
 
-    def sanitizeFileName(self, *args):
-        # todo: find where this is called in JS or tmpl, the old name must still be used as refactor didnt find it
-        return self.sanitize_file_name(*args)
-
-    def sanitize_file_name(self, *args):
-        # abstract method
-        pass
-
     def searchIndexersForShowName(self, *args, **kwargs):
         return self.search_tvinfo_for_showname(*args, **kwargs)
 
@@ -508,15 +500,6 @@ class LegacyBaseHandler(LegacyBase):
         # abstract method
         pass
 
-    def saveNewznabProvider(self, *args, **kwargs):
-        # todo: find where this is called in JS or tmpl, the old name must still be used as refactor didnt find it
-        return self.save_newznab_provider(*args, **kwargs)
-
-    @staticmethod
-    def save_newznab_provider(*args, **kwargs):
-        # abstract method
-        pass
-
     def getNewznabCategories(self, *args):
         return self.get_newznab_categories(*args)
 
@@ -525,15 +508,6 @@ class LegacyBaseHandler(LegacyBase):
         # abstract method
         pass
 
-    def deleteNewznabProvider(self, *args):
-        # todo: find where this is called in JS or tmpl, the old name must still be used as refactor didnt find it
-        return self.delete_newznab_provider(*args)
-
-    @staticmethod
-    def delete_newznab_provider(*args):
-        # abstract method
-        pass
-
     def canAddTorrentRssProvider(self, *args):
         return self.can_add_torrent_rss_provider(*args)
 
@@ -542,24 +516,6 @@ class LegacyBaseHandler(LegacyBase):
         # abstract method
         pass
 
-    def saveTorrentRssProvider(self, *args):
-        # todo: find where this is called in JS or tmpl, the old name must still be used as refactor didnt find it
-        return self.save_torrent_rss_provider(*args)
-
-    @staticmethod
-    def save_torrent_rss_provider(*args):
-        # abstract method
-        pass
-
-    def deleteTorrentRssProvider(self, **kwargs):
-        # todo: find where this is called in JS or tmpl, the old name must still be used as refactor didnt find it
-        return self.delete_torrent_rss_provider(kwargs.get('id'))
-
-    @staticmethod
-    def delete_torrent_rss_provider(*args):
-        # abstract method
-        pass
-
     def checkProvidersPing(self):
         return self.check_providers_ping()
 
diff --git a/sickbeard/config.py b/sickbeard/config.py
index 962e5cd..3bca7fb 100644
--- a/sickbeard/config.py
+++ b/sickbeard/config.py
@@ -177,25 +177,49 @@ def schedule_backlog(iv):
     sickbeard.backlog_search_scheduler.action.cycleTime = sickbeard.BACKLOG_PERIOD
 
 
-def schedule_update(iv):
+def schedule_update_software(iv):
     sickbeard.UPDATE_INTERVAL = to_int(iv, default=sickbeard.DEFAULT_UPDATE_INTERVAL)
 
     if sickbeard.UPDATE_INTERVAL < sickbeard.MIN_UPDATE_INTERVAL:
         sickbeard.UPDATE_INTERVAL = sickbeard.MIN_UPDATE_INTERVAL
 
-    sickbeard.version_check_scheduler.cycleTime = datetime.timedelta(hours=sickbeard.UPDATE_INTERVAL)
+    sickbeard.update_software_scheduler.cycleTime = datetime.timedelta(hours=sickbeard.UPDATE_INTERVAL)
 
 
-def schedule_version_notify(version_notify):
-    old_setting = sickbeard.VERSION_NOTIFY
+def schedule_update_software_notify(update_notify):
+    old_setting = sickbeard.UPDATE_NOTIFY
 
-    sickbeard.VERSION_NOTIFY = version_notify
+    sickbeard.UPDATE_NOTIFY = update_notify
 
-    if not version_notify:
+    if not update_notify:
         sickbeard.NEWEST_VERSION_STRING = None
 
-    if not old_setting and version_notify:
-        sickbeard.version_check_scheduler.action.run()
+    if not old_setting and update_notify:
+        sickbeard.update_software_scheduler.action.run()
+
+
+def schedule_update_packages(iv):
+    sickbeard.UPDATE_PACKAGES_INTERVAL = minimax(iv, sickbeard.DEFAULT_UPDATE_PACKAGES_INTERVAL,
+                                                 sickbeard.MIN_UPDATE_PACKAGES_INTERVAL,
+                                                 sickbeard.MAX_UPDATE_PACKAGES_INTERVAL)
+
+    sickbeard.update_packages_scheduler.cycleTime = datetime.timedelta(hours=sickbeard.UPDATE_PACKAGES_INTERVAL)
+
+
+def schedule_update_packages_notify(update_packages_notify):
+    # this adds too much time to the save_config button click, see below
+    # old_setting = sickbeard.UPDATE_PACKAGES_NOTIFY
+
+    sickbeard.UPDATE_PACKAGES_NOTIFY = update_packages_notify
+
+    if not update_packages_notify:
+        sickbeard.NEWEST_VERSION_STRING = None
+
+    # this adds too much time to the save_config button click,
+    # also the call to save_config raises the risk of a race condition
+    # user must instead restart to activate an update on startup
+    # if not old_setting and update_packages_notify:
+    #     sickbeard.update_packages_scheduler.action.run()
 
 
 def schedule_download_propers(download_propers):
diff --git a/sickbeard/db.py b/sickbeard/db.py
index 2481377..8a2f810 100644
--- a/sickbeard/db.py
+++ b/sickbeard/db.py
@@ -193,40 +193,47 @@ class DBConnection(object):
             return version
         return 0
 
-    def mass_action(self, querylist, log_transaction=False):
+    def mass_action(self, queries, log_transaction=False):
         # type: (List[Union[List[AnyStr], Tuple[AnyStr, List], Tuple[AnyStr]]], bool) -> Optional[List, sqlite3.Cursor]
 
         from . import helpers
         with db_lock:
 
-            if None is querylist:
+            if None is queries:
                 return
 
-            sqlResult = []
+            if not queries:
+                return []
+
             attempt = 0
 
+            sql_result = {'affected': 0, 'data': []}
             while 5 > attempt:
                 try:
-                    affected = 0
-                    for qu in querylist:
+                    def sql_action(query, result):
                         cursor = self.connection.cursor()
-                        if 1 == len(qu):
-                            if log_transaction:
-                                logger.log(qu[0], logger.DB)
-
-                            sqlResult.append(cursor.execute(qu[0]).fetchall())
-                        elif 1 < len(qu):
-                            if log_transaction:
-                                logger.log(qu[0] + ' with args ' + str(qu[1]), logger.DB)
-                            sqlResult.append(cursor.execute(qu[0], qu[1]).fetchall())
-                        affected += cursor.rowcount
+                        if 'SELECT' == query[0][0:6].upper():
+                            result['data'].append(cursor.execute(*tuple(query)).fetchall())
+                        else:
+                            cursor.execute(*tuple(query)).fetchall()
+                        result['affected'] += abs(cursor.rowcount)
+
+                    if not log_transaction:
+                        for cur_query in queries:
+                            sql_action(cur_query, sql_result)
+                    else:
+                        for cur_query in queries:
+                            logger.log(cur_query[0] if 1 == len(cur_query)
+                                       else '%s with args %s' % tuple(cur_query), logger.DB)
+                            sql_action(cur_query, sql_result)
+
                     self.connection.commit()
-                    if 0 < affected:
-                        logger.log(u'Transaction with %s queries executed affected %i row%s' % (
-                            len(querylist), affected, helpers.maybe_plural(affected)), logger.DEBUG)
-                    return sqlResult
+                    if 0 < sql_result['affected']:
+                        logger.debug(u'Transaction with %s queries executed affected at least %i row%s' % (
+                            len(queries), sql_result['affected'], helpers.maybe_plural(sql_result['affected'])))
+                    return sql_result['data']
                 except sqlite3.OperationalError as e:
-                    sqlResult = []
+                    sql_result['data'] = []
                     if self.connection:
                         self.connection.rollback()
                     if not self.action_error(e):
@@ -235,10 +242,10 @@ class DBConnection(object):
                 except sqlite3.DatabaseError as e:
                     if self.connection:
                         self.connection.rollback()
-                    logger.log(u'Fatal error executing query: ' + ex(e), logger.ERROR)
+                    logger.error(u'Fatal error executing query: ' + ex(e))
                     raise
 
-            return sqlResult
+            return sql_result['data']
 
     @staticmethod
     def action_error(e):
@@ -257,17 +264,17 @@ class DBConnection(object):
             if None is query:
                 return
 
-            sqlResult = None
+            sql_result = None
             attempt = 0
 
             while 5 > attempt:
                 try:
                     if None is args:
-                        logger.log(self.filename + ': ' + query, logger.DB)
-                        sqlResult = self.connection.execute(query)
+                        logger.log('%s: %s' % (self.filename, query), logger.DB)
+                        sql_result = self.connection.execute(query)
                     else:
-                        logger.log(self.filename + ': ' + query + ' with args ' + str(args), logger.DB)
-                        sqlResult = self.connection.execute(query, args)
+                        logger.log('%s: %s with args %s' % (self.filename, query, str(args)), logger.DB)
+                        sql_result = self.connection.execute(query, args)
                     self.connection.commit()
                     # get out of the connection attempt loop since we were successful
                     break
@@ -279,17 +286,17 @@ class DBConnection(object):
                     logger.log(u'Fatal error executing query: ' + ex(e), logger.ERROR)
                     raise
 
-            return sqlResult
+            return sql_result
 
     def select(self, query, args=None):
         # type: (AnyStr, Optional[List, Tuple]) -> List
 
-        sqlResults = self.action(query, args).fetchall()
+        sql_results = self.action(query, args).fetchall()
 
-        if None is sqlResults:
+        if None is sql_results:
             return []
 
-        return sqlResults
+        return sql_results
 
     def upsert(self, table_name, value_dict, key_dict):
         # type: (AnyStr, Dict, Dict) -> None
@@ -315,10 +322,10 @@ class DBConnection(object):
         # type: (AnyStr) -> Dict[AnyStr, Dict[AnyStr, AnyStr]]
 
         # FIXME ? binding is not supported here, but I cannot find a way to escape a string manually
-        sqlResult = self.select('PRAGMA table_info([%s])' % table_name)
+        sql_result = self.select('PRAGMA table_info([%s])' % table_name)
         columns = {}
-        for column in sqlResult:
-            columns[column['name']] = {'type': column['type']}
+        for cur_column in sql_result:
+            columns[cur_column['name']] = {'type': cur_column['type']}
         return columns
 
     # http://stackoverflow.com/questions/3300464/how-can-i-get-dict-from-sqlite-query
@@ -364,9 +371,7 @@ class DBConnection(object):
     def has_flag(self, flag_name):
         # type: (AnyStr) -> bool
         sql_result = self.select('SELECT flag FROM flags WHERE flag = ?', [flag_name])
-        if 0 < len(sql_result):
-            return True
-        return False
+        return 0 < len(sql_result)
 
     def add_flag(self, flag_name):
         # type: (AnyStr) -> bool
@@ -771,8 +776,6 @@ def get_rollback_module():
     except (BaseException, Exception):
         pass
 
-    return None
-
 
 def delete_old_db_backups(target):
     # type: (AnyStr) -> None
@@ -818,15 +821,15 @@ def backup_all_dbs(target, compress=True, prefer_7z=True):
     d = sgdatetime.SGDatetime.sbfdate(now, d_preset='%Y-%m-%d')
     t = sgdatetime.SGDatetime.sbftime(now, t_preset='%H-%M')
     ds = '%s_%s' % (d, t)
-    for c in ['sickbeard', 'cache', 'failed']:
-        cur_db = DBConnection('%s.db' % c)
-        b_name = '%s_%s.db' % (c, ds)
-        success, msg = cur_db.backup_db(target=target, backup_filename=b_name)
+    for cur_db in ['sickbeard', 'cache', 'failed']:
+        db_conn = DBConnection('%s.db' % cur_db)
+        name = '%s_%s.db' % (cur_db, ds)
+        success, msg = db_conn.backup_db(target=target, backup_filename=name)
         if not success:
             return False, msg
         if compress:
-            full_path = ek.ek(os.path.join, target, b_name)
-            if not compress_file(full_path, '%s.db' % c, prefer_7z=prefer_7z):
+            full_path = ek.ek(os.path.join, target, name)
+            if not compress_file(full_path, '%s.db' % cur_db, prefer_7z=prefer_7z):
                 return False, 'Failure to compress backup'
     delete_old_db_backups(target)
     my_db.upsert('lastUpdate',
diff --git a/sickbeard/generic_queue.py b/sickbeard/generic_queue.py
index 30c294a..63bfc9d 100644
--- a/sickbeard/generic_queue.py
+++ b/sickbeard/generic_queue.py
@@ -180,4 +180,4 @@ class QueueItem(threading.Thread):
 
         self.inProgress = False
 
-        threading.currentThread().name = self.name
+        threading.current_thread().name = self.name
diff --git a/sickbeard/helpers.py b/sickbeard/helpers.py
index 63f3de0..31808aa 100644
--- a/sickbeard/helpers.py
+++ b/sickbeard/helpers.py
@@ -30,7 +30,6 @@ import shutil
 import socket
 import time
 import uuid
-import subprocess
 import sys
 
 try:
@@ -53,8 +52,8 @@ import requests.exceptions
 import subliminal
 from lxml_etree import etree, is_lxml
 
-from _23 import b64decodebytes, b64encodebytes, decode_bytes, decode_str, filter_iter, Popen, scandir
-from six import iteritems, PY2, string_types, text_type
+from _23 import b64decodebytes, b64encodebytes, decode_bytes, decode_str, filter_iter, scandir
+from six import iteritems, string_types, text_type
 # noinspection PyUnresolvedReferences
 from six.moves import zip
 
@@ -270,7 +269,7 @@ def make_dir(path):
     if not ek.ek(os.path.isdir, path):
         try:
             ek.ek(os.makedirs, path)
-            # do the library update for synoindex
+            # do a Synology library update
             notifiers.NotifierFactory().get('SYNOINDEX').addFolder(path)
         except OSError:
             return False
@@ -543,7 +542,7 @@ def delete_empty_folders(check_empty_dir, keep_dir=None):
                 logger.log(u"Deleting empty folder: " + check_empty_dir)
                 # need shutil.rmtree when ignore_items is really implemented
                 ek.ek(os.rmdir, check_empty_dir)
-                # do the library update for synoindex
+                # do a Synology library update
                 notifiers.NotifierFactory().get('SYNOINDEX').deleteFolder(check_empty_dir)
             except OSError as e:
                 logger.log(u"Unable to delete " + check_empty_dir + ": " + repr(e) + " / " + ex(e), logger.WARNING)
@@ -1169,6 +1168,28 @@ def get_size(start_path='.'):
         return 0
 
 
+def get_media_stats(start_path='.'):
+    # type: (AnyStr) -> Tuple[int, int, int, int]
+    """
+    return recognised media stats for a folder as...
+
+    number of media files, smallest size in bytes, largest size in bytes, average size in bytes
+
+    :param start_path: path to scan
+    """
+    if ek.ek(os.path.isdir, start_path):
+        sizes = sorted(map(lambda y: y.stat(follow_symlinks=False).st_size,
+                           filter(lambda x: has_media_ext(x.name), scantree(start_path))))
+        if sizes:
+            return len(sizes), sizes[0], sizes[-1], int(sum(sizes) / len(sizes))
+
+    elif ek.ek(os.path.isfile, start_path):
+        size = ek.ek(os.path.getsize, start_path)
+        return 1, size, size, size
+
+    return 0, 0, 0, 0
+
+
 def remove_article(text=''):
     """
     remove articles from text
@@ -1313,8 +1334,7 @@ def check_port(host, port, timeout=1.0):
         s = None
         try:
             s = socket.socket(af, socktype, proto)
-            # See http://groups.google.com/group/cherrypy-users/
-            #        browse_frm/thread/bbfe5eb39c904fe0
+            # See http://groups.google.com/group/cherrypy-users/browse_frm/thread/bbfe5eb39c904fe0
             s.settimeout(timeout)
             s.connect((host, port))
             s.close()
@@ -1587,15 +1607,13 @@ def get_overview(ep_status, show_quality, upgrade_once, split_snatch=False):
 
 
 def generate_show_dir_name(root_dir, show_name):
+    # type: (Optional[AnyStr], AnyStr) -> AnyStr
     """
     generate show dir name
 
     :param root_dir: root dir
-    :type root_dir: Optional[AnyStr]
     :param show_name: show name
-    :type show_name: AnyStr
     :return: show dir name
-    :rtype: AnyStr
     """
     san_show_name = sanitize_filename(show_name)
     if sickbeard.SHOW_DIRS_WITH_DOTS:
@@ -1783,32 +1801,6 @@ def xhtml_escape(text, br=True):
     return escape.xhtml_escape(text)
 
 
-def cmdline_runner(cmd, shell=False):
-    # type: (Union[AnyStr, List[AnyStr]], bool) -> Tuple[AnyStr, Optional[AnyStr], int]
-    """ Execute a child program in a new process.
-
-    Can raise an exception to be caught in callee
-
-    :param cmd: A string, or a sequence of program arguments
-    :param shell: If true, the command will be executed through the shell.
-    """
-    kw = dict(cwd=sickbeard.PROG_DIR, shell=shell,
-              stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-
-    if not PY2:
-        kw.update(dict(encoding=sickbeard.SYS_ENCODING, text=True, bufsize=0))
-
-    if 'win32' == sys.platform:
-        kw['creationflags'] = 0x08000000   # CREATE_NO_WINDOW (needed for py2exe)
-
-    with Popen(cmd, **kw) as p:
-        out, err = p.communicate()
-        if out:
-            out = out.strip()
-
-        return out, err, p.returncode
-
-
 def parse_imdb_id(string):
     # type: (AnyStr) -> Optional[AnyStr]
     """ Parse an IMDB ID from a string
diff --git a/sickbeard/logger.py b/sickbeard/logger.py
index 516a5fe..6a41d6f 100644
--- a/sickbeard/logger.py
+++ b/sickbeard/logger.py
@@ -205,7 +205,7 @@ class SBRotatingLogHandler(object):
             if not expired:
                 continue
 
-            out_line = '%s :: %s' % (threading.currentThread().getName(), to_log)
+            out_line = '%s :: %s' % (threading.current_thread().getName(), to_log)
 
             sb_logger = logging.getLogger('sickbeard')
             setattr(sb_logger, 'db', lambda *args: sb_logger.log(DB, *args))
diff --git a/sickbeard/notifiers/synoindex.py b/sickbeard/notifiers/synoindex.py
index 39be214..857b665 100644
--- a/sickbeard/notifiers/synoindex.py
+++ b/sickbeard/notifiers/synoindex.py
@@ -22,6 +22,7 @@ from .generic import BaseNotifier
 # noinspection PyPep8Naming
 import encodingKludge as ek
 from exceptions_helper import ex
+from sg_helpers import cmdline_runner
 
 
 # noinspection PyPep8Naming
@@ -37,7 +38,6 @@ class SynoIndexNotifier(BaseNotifier):
         self._log_debug(u'Executing command ' + str(synoindex_cmd))
         self._log_debug(u'Absolute path to command: ' + ek.ek(os.path.abspath, synoindex_cmd[0]))
         try:
-            from sickbeard.helpers import cmdline_runner
             output, err, exit_status = cmdline_runner(synoindex_cmd)
             self._log_debug(u'Script result: %s' % output)
         except (BaseException, Exception) as e:
diff --git a/sickbeard/notifiers/synologynotifier.py b/sickbeard/notifiers/synologynotifier.py
index f480577..bc6a6d9 100644
--- a/sickbeard/notifiers/synologynotifier.py
+++ b/sickbeard/notifiers/synologynotifier.py
@@ -21,6 +21,7 @@ from .generic import Notifier
 # noinspection PyPep8Naming
 import encodingKludge as ek
 from exceptions_helper import ex
+from sg_helpers import cmdline_runner
 
 
 class SynologyNotifier(Notifier):
@@ -31,7 +32,6 @@ class SynologyNotifier(Notifier):
         self._log(u'Executing command ' + str(synodsmnotify_cmd))
         self._log_debug(u'Absolute path to command: ' + ek.ek(os.path.abspath, synodsmnotify_cmd[0]))
         try:
-            from sickbeard.helpers import cmdline_runner
             output, err, exit_status = cmdline_runner(synodsmnotify_cmd)
             self._log_debug(u'Script result: %s' % output)
         except (BaseException, Exception) as e:
diff --git a/sickbeard/piper.py b/sickbeard/piper.py
new file mode 100644
index 0000000..551fa20
--- /dev/null
+++ b/sickbeard/piper.py
@@ -0,0 +1,354 @@
+import sys
+
+# noinspection PyPep8Naming
+import encodingKludge as ek
+
+if ek.EXIT_BAD_ENCODING:
+    print('Sorry, you MUST add the SickGear folder to the PYTHONPATH environment variable')
+    print('or find another way to force Python to use %s for string encoding.' % ek.SYS_ENCODING)
+    sys.exit(1)
+
+# #################################
+# Sanity check passed, can continue
+# #################################
+import io
+import json
+import os
+import re
+
+from sg_helpers import cmdline_runner, try_int
+
+from _23 import filter_list, ordered_dict
+from six import iteritems, PY2
+
+# noinspection PyUnreachableCode
+if False:
+    from typing import Any, AnyStr, Dict, List, Optional, Tuple, Union
+
+
+def is_pip_ok():
+    # type: (...) -> bool
+    """Check pip availability
+
+    :return: True if pip is ok
+    """
+    pip_ok = '/' != ek.ek(os.path.expanduser, '~')
+    if pip_ok:
+        try:
+            # noinspection PyPackageRequirements,PyProtectedMember
+            import pip
+        except ImportError:
+            try:
+                import ensurepip
+                ensurepip.bootstrap()
+            except (BaseException, Exception):
+                pip_ok = False
+    return pip_ok
+
+
+def run_pip(pip_cmd, suppress_stderr=False):
+    # type: (List[AnyStr], bool) -> Tuple[AnyStr, Optional[AnyStr], int]
+    """Run pip command
+
+    :param pip_cmd:
+    :param suppress_stderr:
+    :return: out, err, returncode
+    """
+    if 'uninstall' == pip_cmd[0]:
+        pip_cmd += ['-y']
+    elif 'install' == pip_cmd[0]:
+        pip_cmd += ['--progress-bar', 'off']
+
+    new_pip_arg = ['--no-python-version-warning']
+    if PY2:
+        # noinspection PyCompatibility, PyPackageRequirements
+        from pip import __version__ as pip_version
+        if pip_version and 20 > int(pip_version.split('.')[0]):
+            new_pip_arg = []
+
+    return cmdline_runner(
+        [sys.executable, '-m', 'pip'] + new_pip_arg + ['--disable-pip-version-check'] + pip_cmd,
+        suppress_stderr=suppress_stderr)
+
+
+def initial_requirements():
+    """Process requirements
+
+    * Upgrades legacy Cheetah version 2 to version 3+
+    """
+    if is_pip_ok():
+        try:
+            # noinspection PyUnresolvedReferences
+            import Cheetah
+            # noinspection PyUnresolvedReferences
+            if 3 > try_int(Cheetah.Version[0]):
+                run_pip(['uninstall', 'cheetah', 'markdown'])
+                raise ValueError
+        except (BaseException, Exception):
+            run_pip(['install', '-U', '--user', '-r', 'requirements.txt'])
+            module = 'Cheetah'
+            try:
+                locals()[module] = __import__(module)
+                sys.modules[module] = __import__(module)
+            except (BaseException, Exception) as e:
+                pass
+
+
+def extras_failed_filepath(data_dir):
+    return ek.ek(os.path.join, data_dir, '.pip_req_spec_failed.txt')
+
+
+def load_ignorables(data_dir):
+    # type: (AnyStr) -> List[AnyStr]
+
+    data = []
+
+    filepath = extras_failed_filepath(data_dir)
+    if ek.ek(os.path.isfile, filepath):
+        try:
+            with io.open(filepath, 'r', encoding='UTF8') as fp:
+                data = fp.readlines()
+        except (BaseException, Exception):
+            pass
+
+    return data
+
+
+def save_ignorables(data_dir, data):
+    # type: (AnyStr, List[AnyStr]) -> None
+
+    try:
+        with io.open(extras_failed_filepath(data_dir), 'w', encoding='UTF8') as fp:
+            fp.writelines(data)
+            fp.flush()
+            os.fsync(fp.fileno())
+    except (BaseException, Exception):
+        pass
+
+
+def check_pip_outdated(reset_fails=False):
+    # type: (bool) -> Dict[Any]
+    """Check outdated or missing Python performance packages"""
+    _, work_todo, _, _ = _check_pip_env(pip_outdated=True, reset_fails=reset_fails)
+    return work_todo
+
+
+def check_pip_installed():
+    # type: (...) -> Tuple[List[tuple], List[AnyStr]]
+    """Return working installed Python performance packages"""
+    input_reco, _, installed, _ = _check_pip_env()
+    return installed, input_reco
+
+
+def check_pip_env():
+    # type: (...) -> Tuple[List[tuple], Dict[AnyStr, AnyStr], List[AnyStr]]
+    """Return working installed Python performance packages, extra info, and failed packages, for ui"""
+
+    _, _, installed, failed_names = _check_pip_env()
+
+    py2_last = 'final py2 release'
+    boost = 'performance boost'
+    extra_info = dict({'Cheetah3': 'filled requirement', 'lxml': boost, 'python-Levenshtein': boost})
+    extra_info.update((dict(cryptography=py2_last, pip='stable py2 release', regex=py2_last,
+                            scandir=boost, setuptools=py2_last),
+                       dict(regex=boost))[not PY2])
+    return installed, extra_info, failed_names
+
+
+def _check_pip_env(pip_outdated=False, reset_fails=False):
+    # type: (bool, bool) -> Tuple[List[AnyStr], Dict[Dict[AnyStr, Union[bool, AnyStr]]], List[tuple], List[AnyStr]]
+    """Checking Python requirements and recommendations for installed, outdated, and missing performance packages
+
+    :param pip_outdated: do a Pip list outdated if True
+    :param reset_fails: reset known failures if True
+    :return combined required + recommended names,
+            dictionary of work names:version info,
+            combined required + recommended names with either installed version or '' if not installed,
+            failed item names
+    """
+    if not is_pip_ok():
+        return [], dict(), [], []
+
+    input_reco = []
+    from sickbeard import logger, PROG_DIR, DATA_DIR
+    for cur_reco_file in ['requirements.txt', 'recommended.txt']:
+        try:
+            with io.open(ek.ek(os.path.join, PROG_DIR, cur_reco_file)) as fh:
+                input_reco += ['%s\n' % line.strip() for line in fh]  # must ensure EOL marker
+        except (BaseException, Exception):
+            pass
+
+    environment = {}
+    # noinspection PyUnresolvedReferences
+    import six.moves
+    import pkg_resources
+    six.moves.reload_module(pkg_resources)
+    for cur_distinfo in pkg_resources.working_set:
+        environment[cur_distinfo.project_name] = cur_distinfo.parsed_version
+
+    save_failed = False
+    known_failed = load_ignorables(DATA_DIR)
+    if reset_fails and known_failed:
+        known_failed = []
+        save_failed = True
+    failed_names = []
+    output_reco = {}
+    names_reco = []
+    specifiers = {}
+    requirement_update = set()
+    from pkg_resources import parse_requirements
+    for cur_line in input_reco:
+        try:
+            requirement = next(parse_requirements(cur_line))  # https://packaging.pypa.io/en/latest/requirements.html
+        except ValueError as e:
+            logger.error('Error [%s] with line: %s' % (e, cur_line))  # name@url ; whitespace/newline must follow url
+            continue
+        project_name = getattr(requirement, 'project_name', None)
+        if cur_line in known_failed and project_name not in environment:
+            failed_names += [project_name]
+        else:
+            marker = getattr(requirement, 'marker', None)
+            if marker and not marker.evaluate():
+                continue
+            if project_name:
+                # explicitly output the most recent line where project names repeat, i.e. max(line number)
+                # therefore, position items with greater specificity _after_ items with a broad spec in requirements.txt
+                output_reco[project_name] = cur_line
+                if project_name not in names_reco:
+                    names_reco += [project_name]
+                if project_name in environment:
+                    if environment[project_name] in requirement.specifier:
+                        specifiers[project_name] = requirement.specifier  # requirement is met in the env
+                        if cur_line in known_failed:
+                            known_failed.remove(cur_line)  # manually installed item that previously failed
+                            save_failed = True
+                    else:
+                        requirement_update.add(project_name)  # e.g. when '!=' matches an installed project to uninstall
+    if save_failed:
+        save_ignorables(DATA_DIR, known_failed)
+
+    to_install = set(names_reco).difference(set(environment))
+    fresh_install = len(to_install) == len(names_reco)
+    installed = [(cur_name, getattr(environment.get(cur_name), 'public', '')) for cur_name in names_reco]
+
+    to_update = set()
+    names_outdated = dict()
+    if pip_outdated and not fresh_install:
+        output, err, exit_status = run_pip(['list', '--outdated', '--format', 'json'], suppress_stderr=True)
+        try:
+            names_outdated = dict({cur_item.get('name'): {k: cur_item.get(k) for k in ('version', 'latest_version')}
+                                   for cur_item in json.loads(output)})
+            to_update = set(filter_list(
+                lambda name: name in specifiers and names_outdated[name]['latest_version'] in specifiers[name],
+                set(names_reco).intersection(set(names_outdated))))
+
+            # check whether to ignore direct reference specification updates if not dev mode
+            if not int(os.environ.get('CHK_URL_SPECIFIERS', 0)):
+                to_remove = set()
+                for cur_name in to_update:
+                    if '@' in output_reco[cur_name] and cur_name in specifiers:
+                        # direct reference spec update, is for a package met in the env, so remove update
+                        to_remove.add(cur_name)
+                to_update = to_update.difference(to_remove)
+        except (BaseException, Exception):
+            pass
+
+    updates_todo = ordered_dict()
+    todo = to_install.union(to_update, requirement_update)
+    for cur_name in [cur_n for cur_n in names_reco if cur_n in todo]:
+        updates_todo[cur_name] = dict({
+            _tuple[0]: _tuple[1] for _tuple in
+            (cur_name in names_outdated and [('info', names_outdated[cur_name])] or [])
+            + (cur_name in requirement_update and [('requirement', True)] or [])
+            + [('require_spec', output_reco.get(cur_name, '%s>0.0.0\n' % cur_name))]})
+
+    return input_reco, updates_todo, installed, failed_names
+
+
+def pip_update(loading_msg, updates_todo, data_dir):
+    # type: (AnyStr, Dict[Any], AnyStr) -> bool
+    result = False
+    if not is_pip_ok():
+        return result
+
+    from sickbeard import logger
+    failed_lines = []
+    input_reco = None
+
+    piper_path = ek.ek(os.path.join, data_dir, '.pip_req_spec_temp.txt')
+    for cur_project_name, cur_data in iteritems(updates_todo):
+        msg = 'Installing package "%s"' % cur_project_name
+        if cur_data.get('info'):
+            info = dict(name=cur_project_name, ver=cur_data.get('info').get('version'))
+            if not cur_data.get('requirement'):
+                msg = 'Updating package "%(name)s" version %(ver)s to {}'.format(
+                    cur_data.get('info').get('latest_version')) % info
+            else:
+                msg = 'Checking package "%(name)s" version %(ver)s with "{}"'.format(
+                    re.sub(r',\b', ', ', cur_data.get('require_spec').strip())) % info
+        loading_msg.set_msg_progress(msg, 'Installing...')
+
+        try:
+            with io.open(piper_path, 'w', encoding='utf-8') as fp:
+                fp.writelines(cur_data.get('require_spec'))
+                fp.flush()
+                os.fsync(fp.fileno())
+        except (BaseException, Exception):
+            loading_msg.set_msg_progress(msg, 'Failed to save install data')
+            continue
+
+        # exclude Cheetah3 to prevent `No matching distro found` and fallback to its legacy setup.py installer
+        output, err, exit_status = run_pip(['install', '-U']
+                                           + ([], ['--only-binary=:all:'])[cur_project_name not in ('Cheetah3', )]
+                                           + ['--user', '-r', piper_path])
+        pip_version = None
+        try:
+            # ensure '-' in a project name is not escaped in order to convert the '-' into a `[_-]` regex
+            find_name = re.escape(cur_project_name.replace(r'-', r'44894489')).replace(r'44894489', r'[_-]')
+            parsed_name = re.findall(r'(?sim).*(%s[^\s]+)\.whl.*' % find_name, output) or \
+                re.findall(r'(?sim).*Successfully installed.*?(%s[^\s]+)' % find_name, output)
+            if not parsed_name:
+                parsed_name = re.findall(r'(?sim)up-to-date[^\s]+\s*(%s).*?\s\(([^)]+)\)$' % find_name, output)
+                parsed_name = ['' if not parsed_name else '-'.join(parsed_name[0])]
+            pip_version = re.findall(r'%s-([\d.]+).*?' % find_name, ek.ek(os.path.basename, parsed_name[0]), re.I)[0]
+        except (BaseException, Exception):
+            pass
+
+        # pip may output `...WinError 5 Access denied...` yet still install what appears a failure
+        # therefore, for any apparent failure, recheck the environment to figure if the failure is actually true
+        installed, input_reco = check_pip_installed()
+        if 0 == exit_status or (cur_project_name, pip_version) in installed:
+            result = True
+            installed_version = pip_version or cur_data.get('info', {}).get('latest_version') or 'n/a'
+            msg_result = 'Installed version: %s' % installed_version
+            logger.log('Installed %s version: %s' % (cur_project_name, installed_version))
+        else:
+            failed_lines += [cur_data.get('require_spec')]
+            msg_result = 'Failed to install'
+            log_error = ''
+            for cur_line in output.splitlines()[::-1]:
+                if 'error' in cur_line.lower():
+                    msg_result = re.sub(r'(?i)(\berror:\s*|\s*\(from.*)', '', cur_line)
+                    log_error = ': %s' % msg_result
+                    break
+            logger.debug('Failed to install %s%s' % (cur_project_name, log_error))
+        loading_msg.set_msg_progress(msg, msg_result)
+
+    if failed_lines:
+        # for example, python-Levenshtein failed due to no matching PyPI distro. A recheck at the next PY or SG upgrade
+        # was considered, but an is_env_changed() helper doesn't exist which makes that idea outside this feature scope.
+        # Therefore, prevent a re-attempt and present the missing pkg to the ui for the user to optionally handle.
+        failed_lines += [cur_line for cur_line in load_ignorables(data_dir) if cur_line not in failed_lines]
+        if None is input_reco:
+            _, input_reco = check_pip_installed()  # known items in file content order
+        sorted_failed = [cur_line for cur_line in input_reco if cur_line in failed_lines]
+        save_ignorables(data_dir, sorted_failed)
+
+    return result
+
+
+if '__main__' == __name__:
+    print('This module is supposed to be used as import in other scripts and not run standalone.')
+    sys.exit(1)
+
+initial_requirements()
diff --git a/sickbeard/postProcessor.py b/sickbeard/postProcessor.py
index 78292d4..29033b3 100644
--- a/sickbeard/postProcessor.py
+++ b/sickbeard/postProcessor.py
@@ -38,7 +38,7 @@ from .name_parser.parser import InvalidNameException, InvalidShowException, Name
 
 from _23 import decode_str
 from six import iteritems, PY2, string_types
-from sg_helpers import long_path
+from sg_helpers import long_path, cmdline_runner
 
 # noinspection PyUnreachableCode
 if False:
@@ -849,7 +849,7 @@ class PostProcessor(object):
 
         try:
             # run the command and capture output
-            output, err, exit_status = helpers.cmdline_runner(script_cmd)
+            output, err, exit_status = cmdline_runner(script_cmd)
             self._log('Script result: %s' % output, logger.DEBUG)
 
         except OSError as e:
diff --git a/sickbeard/processTV.py b/sickbeard/processTV.py
index 450927b..10d2edb 100644
--- a/sickbeard/processTV.py
+++ b/sickbeard/processTV.py
@@ -713,7 +713,7 @@ class ProcessTVShow(object):
                     # Skip extraction if any file in archive has previously been extracted
                     skip_file = False
                     for file_in_archive in [ek.ek(os.path.basename, x.filename)
-                                            for x in rar_handle.infolist() if not x.isdir()]:
+                                            for x in rar_handle.infolist() if not x.is_dir()]:
                         if self._already_postprocessed(path, file_in_archive, force):
                             self._log_helper(
                                 u'Archive file already processed, extraction skipped: ' + file_in_archive)
@@ -727,7 +727,7 @@ class ProcessTVShow(object):
 
                         rar_handle.extractall(path=path)
                         rar_content = [ek.ek(os.path.normpath, x.filename)
-                                       for x in rar_handle.infolist() if not x.isdir()]
+                                       for x in rar_handle.infolist() if not x.is_dir()]
                         renamed = self.cleanup_names(path, rar_content)
                         cur_unpacked = rar_content if not renamed else \
                             (list(set(rar_content) - set(iterkeys(renamed))) + list_values(renamed))
diff --git a/sickbeard/properFinder.py b/sickbeard/properFinder.py
index 1ae3c30..d8b37c0 100644
--- a/sickbeard/properFinder.py
+++ b/sickbeard/properFinder.py
@@ -251,7 +251,7 @@ def _get_proper_list(aired_since_shows,  # type: datetime.datetime
 
     my_db = db.DBConnection()
     # for each provider get a list of arbitrary Propers
-    orig_thread_name = threading.currentThread().name
+    orig_thread_name = threading.current_thread().name
     # filter provider list for:
     # 1. from recent search: recent search enabled providers
     # 2. native proper search: active search enabled providers
diff --git a/sickbeard/providers/__init__.py b/sickbeard/providers/__init__.py
index 9910d7d..53d1cb9 100755
--- a/sickbeard/providers/__init__.py
+++ b/sickbeard/providers/__init__.py
@@ -34,6 +34,7 @@ if False:
 
 __all__ = [
     # usenet
+    'filesharingtalk',
     'omgwtfnzbs',
     # torrent
     'alpharatio', 'bb', 'bithdtv', 'blutopia', 'btn',
diff --git a/sickbeard/providers/filesharingtalk.py b/sickbeard/providers/filesharingtalk.py
new file mode 100644
index 0000000..50841c7
--- /dev/null
+++ b/sickbeard/providers/filesharingtalk.py
@@ -0,0 +1,340 @@
+#
+# This file is part of SickGear.
+#
+# SickGear is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# SickGear is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with SickGear. If not, see <http://www.gnu.org/licenses/>.
+
+from datetime import datetime, timedelta
+import difflib
+import re
+import time
+import traceback
+
+import sickbeard
+from . import generic
+from .. import classes, logger, show_name_helpers, tvcache
+from ..classes import NZBDataSearchResult
+from ..common import NeededQualities
+from ..tv import TVEpisode
+
+from bs4_parser import BS4Parser
+
+from six import iteritems
+
+# noinspection PyUnreachableCode
+if False:
+    from typing import Any, AnyStr, Dict, List, Optional
+
+
+class FSTProvider(generic.NZBProvider):
+
+    def __init__(self):
+        generic.NZBProvider.__init__(self, 'FileSharingTalk')
+
+        self.url_base = 'https://filesharingtalk.com/'  # type: AnyStr
+        self.urls = {'config_provider_home_uri': self.url_base,
+                     'cache': self.url_base + 'nzbs/tv/%s?sort=age&order=desc',
+                     'search_init': self.url_base + 'search.php?search_type=1#ads=15',
+                     'search': self.url_base + 'search.php?do=process'}  # type: Dict[AnyStr, AnyStr]
+        self.url = self.urls['config_provider_home_uri']
+
+        self.digest = None
+        self.cache = FSTCache(self)
+
+    cat_sd = ['dvdr', 'xvid', 'x264sd', 'misc']
+    cat_hd = ['x264720', 'x2641080', 'webdl720', 'misc']
+
+    @staticmethod
+    def _get_cats(needed):
+        """
+
+        :param needed: needed class
+        :type needed: NeededQualities
+        :return:
+        :rtype: List
+        """
+        cats = []
+        if needed.need_sd:
+            cats.extend(FSTProvider.cat_sd)
+        if needed.need_hd:
+            cats.extend(FSTProvider.cat_hd)
+        return list(set(cats))
+
+    def _init_cookies(self):
+        # type: (...) -> Optional[bool]
+        """
+        :return: False if success with no issues, or None if failure to init
+        """
+        if not self.should_skip():
+            self.cookies = self.digest
+            success, msg = self._check_cookie()
+            if success:
+                return False
+            logger.warning(u'%s: %s' % (msg, self.cookies))
+
+        self.cookies = None
+        return None
+
+    def _search_provider(self, search, search_mode='eponly', needed=NeededQualities(need_all=True), **kwargs):
+        # type: (AnyStr, AnyStr, NeededQualities, Any) -> List
+        """
+        :param search:
+        :param search_mode:
+        :param needed:needed class
+        :param kwargs:
+        """
+        self._init_cookies()
+        results = []
+        if None is getattr(self, 'cookies', None):
+            return results
+
+        cats = self._get_cats(needed=needed)
+        if not cats:
+            return results
+
+        rc = dict((k, re.compile('(?i)' + v)) for (k, v) in iteritems(dict(
+            cat='(?:%s)' % '|'.join(cats), results='(?:collections|searchbits)')))
+        mode = ('search', 'cache')['' == search]
+        post_data = None
+        if 'cache' == mode:
+            pages = ['', 'page2']
+        else:
+            html = self.get_url(self.urls['search_init'])
+            try:
+                token = re.findall(r'(?i)token["\s]+[^"]+"([0-9a-f-]+)"', html)[0]
+            except(BaseException, Exception):
+                token = None
+            if not token:
+                logger.warning('Failed to parse an initial search token')
+                pages = []
+            else:
+                post_data = {'ngsubcategory[]': [16, 17, 53, 22, 23, 51, 49, 24]}
+                post_data.update(dict(
+                    query='%s' % search, securitytoken='%s' % token, dosearch='Search+Now', saveprefs=0, searchdate=0,
+                    searchuser='', s='', sortby='dateline', order='descending', beforeafter='after', overridesearch=1,
+                    searchfromtype='fstNZB:Collection', contenttypeid='', do='process'))
+                pages = ['']
+
+        for cur_page in pages:
+            cnt = len(results)
+            search_url = self.urls[mode]
+            if 'cache' == mode:
+                search_url = search_url % cur_page
+
+            html = self.get_url(search_url, post_data=post_data)
+            if self.should_skip():
+                return results
+
+            try:
+                if not html:
+                    raise generic.HaltParseException
+
+                with BS4Parser(html, parse_only={'ol': {'id': rc['results']}}) as soup:  # 'collections'
+                    tbl_rows = [] if not soup else soup.find_all('li', class_='collectionbit')
+
+                    if 1 > len(tbl_rows):
+                        raise generic.HaltParseException
+
+                    for tr in tbl_rows:
+                        try:
+                            if tr.find('img', class_=rc['cat']):
+                                title = tr['data-title'].strip()
+                                age = tr.find(class_='binaryage').find('dd').get_text(strip=True).lower()
+                                age_value, age_dim = age.split()
+                                rls_dt = None
+                                age_arg = 'hours' if 'hour' in age_dim else 'days' if 'day' in age_dim else None
+                                if age_arg:
+                                    rls_dt = datetime.utcnow() - timedelta(**{age_arg: float(age_value)})
+                                info_url = self._link(tr['data-url'].strip())
+                        except (AttributeError, TypeError, ValueError):
+                            continue
+
+                        if title and info_url and rls_dt:
+                            results.append({'title': title, 'link': info_url, 'release_dt': rls_dt})
+
+            except generic.HaltParseException:
+                time.sleep(1.1)
+                pass
+            except (BaseException, Exception):
+                logger.error(u'Failed to parse. Traceback: %s' % traceback.format_exc())
+
+            self._log_search((mode, search_mode)['Propers' == search_mode], len(results) - cnt, search_url)
+        return results
+
+    def find_propers(self, **kwargs):
+        """
+
+        :param kwargs:
+        :return:
+        :rtype: List[classes.Proper]
+        """
+        results = []
+        if not self.should_skip():
+
+            search_terms = ['.PROPER.', '.REPACK.', '.REAL.']
+            for term in search_terms:
+                for item in self._search_provider(term, search_mode='Propers'):
+                    title, url = self._title_and_url(item)
+                    results.append(classes.Proper(title, url, item['release_dt'], self.show_obj))
+
+        return results
+
+    @staticmethod
+    def common_string(files):
+        # type: (List) -> Optional[AnyStr]
+        """ find a string common to many strings
+        e.g 1) 123.rar 2) 123.par2 3) 123.nfo returns `123`
+
+        :param files: list of strings
+        :return: string common to those in list or None
+        """
+
+        result = None
+
+        def __matcher(_s1, _s2):
+            sequencer = difflib.SequenceMatcher(None, _s1, _s2)
+            pos_a, pos_b, size = max(sequencer.get_matching_blocks(), key=lambda _x: _x[2])
+            # noinspection PyUnresolvedReferences
+            return sequencer.a[pos_a:pos_a + size]
+
+        base_names = set()
+        # 1st pass, get candidates of common part of name
+        s1 = files[0]
+        for s2 in files[1:]:
+            s1 = __matcher(s1, s2)
+            base_names.add(s1)
+
+        # 2nd pass, finds base name
+        files2nd = sorted(list(base_names), key=len)
+        s1 = files2nd[0]
+        for s2 in files2nd[1:]:
+            s1 = __matcher(s1, s2)
+            if '.' == s1[-1]:
+                result = s1[0:-1]
+                break
+
+        return result
+
+    def get_data(self, url):
+        """
+        :param url: url
+        :type url: AnyStr
+        :return:
+        :rtype:
+        """
+        result = None
+        if url and False is self._init_cookies():
+            html = self.get_url(url, timeout=90)
+            if not self.should_skip() and html:
+                try:
+                    collection = int(url.rpartition('/')[-1].split('-')[0])
+                except(BaseException, Exception):
+                    collection = None
+
+                if collection:
+                    with BS4Parser(html, parse_only={'div': {'id': 'binaryeditor'}}) as soup:
+                        nzb_rows = [] if not soup else soup.find_all('li', {'data-collectionid': '%s' % collection})
+                        try:
+                            files = sorted([_x.find(class_='subject').find('dd').get_text(strip=True)
+                                            for _x in nzb_rows], key=len, reverse=True)
+                        except(BaseException, Exception):
+                            files = []
+
+                    if len(files):
+                        base_name = self.common_string(files)
+                        if base_name:
+                            base_url = 'https://nzbindex.nl/'
+                            # uncomment the following into use if required.
+                            # init_url = base_url + 'search/?q=%s' % base_name
+                            # html = self.get_url(init_url)
+                            # try:
+                            #     action = re.findall(r'action="([^"]+)"', html)[0].lstrip('/')
+                            # except(BaseException, Exception):
+                            #     action = None
+                            # if action:
+                            #     # get a session disclaimer cookie
+                            #     self.get_url(base_url + action, post_data={'_method': 'POST'})
+                            #
+                            # if 'disclaimer' in self.session.cookies:
+                            # all the following to be indented +1 if above is uncommented into use
+                            json = self.get_url(base_url + 'search/json?q=%s' % base_name, parse_json=True,
+                                                params=dict(max=100, minage=0, maxage=0, sort='agedesc',
+                                                            hidespam=1, hidepassword=0, minsize=0, maxsize=0,
+                                                            complete=0, hidecross=0, hasNFO=0, poster='', p=0))
+
+                            ids = []
+                            idx_eq_fst = True
+                            fn_reg = re.compile(r'[^"]+"([^"]+).*')
+                            for cur_result in json['results']:
+                                ids += [cur_result['id']]
+                                # check indexer files match FST files
+                                idx_eq_fst = idx_eq_fst and fn_reg.sub(r'\1', cur_result['name']) in files
+
+                            if idx_eq_fst:
+                                nzb = '%s.nzb' % base_name
+                                response = self.get_url(base_url + 'download/' + nzb, post_data={'n': nzb, 'r[]': ids})
+
+                                if '</nzb>' not in response:
+                                    logger.debug('Failed nzb data response: %s' % response)
+                                else:
+                                    result = response
+        return result
+
+    def get_result(self, ep_obj_list, url):
+        # type: (List[TVEpisode], AnyStr) -> Optional[NZBDataSearchResult]
+        """
+
+        :param ep_obj_list: list of episode objects
+        :param url: url
+        """
+        result = classes.NZBDataSearchResult(ep_obj_list)
+        result.get_data_func = self.get_data
+        result.url = url
+        result.provider = self
+        return result
+
+    def _season_strings(self, ep_obj):
+        """
+
+        :param ep_obj: episode object
+        :type ep_obj: sickbeard.tv.TVEpisode
+        :return: list of search strings
+        :rtype: List[AnyStr]
+        """
+        return [x for x in show_name_helpers.makeSceneSeasonSearchString(self.show_obj, ep_obj)]
+
+    def _episode_strings(self, ep_obj):
+        """
+
+        :param ep_obj: episode object
+        :type ep_obj: sickbeard.tv.TVEpisode
+        :return: list of search strings
+        :rtype: List[AnyStr]
+        """
+        return [x for x in show_name_helpers.makeSceneSearchString(self.show_obj, ep_obj)]
+
+    @staticmethod
+    def ui_string(key=None):
+        return 'filesharingtalk_digest' == key and 'use... \'bb_userid=xx; bb_password=yy\'' or ''
+
+
+class FSTCache(tvcache.TVCache):
+    def __init__(self, this_provider):
+        tvcache.TVCache.__init__(self, this_provider)
+
+    def _cache_data(self, **kwargs):
+        # noinspection PyProtectedMember
+        return self.provider._search_provider('', **kwargs)
+
+
+provider = FSTProvider()
diff --git a/sickbeard/providers/generic.py b/sickbeard/providers/generic.py
index 9956c24..7be8197 100644
--- a/sickbeard/providers/generic.py
+++ b/sickbeard/providers/generic.py
@@ -505,7 +505,7 @@ class GenericProvider(object):
             if time_left > datetime.timedelta(seconds=0):
                 if log_warning:
                     # Ensure provider name output (e.g. when displaying config/provs) instead of e.g. thread "Tornado"
-                    prepend = ('[%s] :: ' % self.name, '')[any([x.name in threading.currentThread().getName()
+                    prepend = ('[%s] :: ' % self.name, '')[any([x.name in threading.current_thread().getName()
                                                                 for x in sickbeard.providers.sortedProviderList()])]
                     logger.log('%sToo many requests reached at %s, waiting for %s' % (
                         prepend, self.fmt_delta(self.tmr_limit_time), self.fmt_delta(time_left)), logger.WARNING)
@@ -1398,7 +1398,7 @@ class GenericProvider(object):
     @staticmethod
     def _should_stop():
         # type: (...) -> bool
-        if getattr(threading.currentThread(), 'stop', False):
+        if getattr(threading.current_thread(), 'stop', False):
             return True
         return False
 
@@ -1566,6 +1566,7 @@ class TorrentProvider(GenericProvider):
         self._reject_notfree = None
         self._reject_container = None
         self._last_recent_search = None
+        self.may_filter = dict()
 
     @property
     def url(self):
diff --git a/sickbeard/providers/nebulance.py b/sickbeard/providers/nebulance.py
index b272893..488204a 100644
--- a/sickbeard/providers/nebulance.py
+++ b/sickbeard/providers/nebulance.py
@@ -219,8 +219,11 @@ class NebulanceProvider(generic.TorrentProvider):
 
     def ui_string(self, key):
         profile_page = 'profile page'
-        if self._authorised():
-            profile_page = '<a href="%s">%s</a>' % (self.urls['api_key'] % self.uid, profile_page)
+        try:
+            if self._check_auth(True) and self._authorised():
+                profile_page = '<a href="%s">%s</a>' % (self.urls['api_key'] % self.uid, profile_page)
+        except (BaseException, Exception):
+            pass
 
         return ('%s_api_key' % self.get_id()) == key and 'API key' or \
             ('%s_api_key_tip' % self.get_id()) == key and \
diff --git a/sickbeard/scene_exceptions.py b/sickbeard/scene_exceptions.py
index f991118..5a7b4b1 100644
--- a/sickbeard/scene_exceptions.py
+++ b/sickbeard/scene_exceptions.py
@@ -418,6 +418,10 @@ def _custom_exceptions_fetcher():
     if refresh:
         set_last_refresh(src_id)
 
+    if not fetch_data and not ek.ek(os.path.isfile, file_cache):
+        logger.debug(u'Unable to fetch custom exceptions, skipped: %s' % file_rar)
+        return custom_exception_dict, cnt_updated_numbers, should_refresh(src_id, iv, remaining=True)
+
     data = {}
     try:
         with io.open(file_cache) as fh:
diff --git a/sickbeard/search.py b/sickbeard/search.py
index d1c3bea..f5d33e2 100644
--- a/sickbeard/search.py
+++ b/sickbeard/search.py
@@ -592,12 +592,12 @@ def search_for_needed_episodes(ep_obj_list):
 
     search_done = False
 
-    orig_thread_name = threading.currentThread().name
+    orig_thread_name = threading.current_thread().name
 
     providers = filter_list(lambda x: x.is_active() and x.enable_recentsearch, sickbeard.providers.sortedProviderList())
 
     for cur_provider in providers:
-        threading.currentThread().name = '%s :: [%s]' % (orig_thread_name, cur_provider.name)
+        threading.current_thread().name = '%s :: [%s]' % (orig_thread_name, cur_provider.name)
 
         ep_obj_search_result_list = cur_provider.search_rss(ep_obj_list)
 
@@ -641,7 +641,7 @@ def search_for_needed_episodes(ep_obj_list):
             except (BaseException, Exception):
                 pass
 
-    threading.currentThread().name = orig_thread_name
+    threading.current_thread().name = orig_thread_name
 
     if not len(providers):
         logger.log('No NZB/Torrent providers in Media Providers/Options are enabled to match recent episodes',
@@ -842,7 +842,7 @@ def search_providers(
     search_done = False
     search_threads = []
 
-    orig_thread_name = threading.currentThread().name
+    orig_thread_name = threading.current_thread().name
 
     provider_list = [x for x in sickbeard.providers.sortedProviderList() if x.is_active() and
                      getattr(x, 'enable_backlog', None) and
diff --git a/sickbeard/search_queue.py b/sickbeard/search_queue.py
index a661cf9..1c9ad15 100644
--- a/sickbeard/search_queue.py
+++ b/sickbeard/search_queue.py
@@ -418,7 +418,7 @@ class RecentSearchQueueItem(generic_queue.QueueItem):
         :param needed: needed class
         :type needed: common.NeededQualities
         """
-        orig_thread_name = threading.currentThread().name
+        orig_thread_name = threading.current_thread().name
         threads = []
 
         providers = filter_list(lambda x: x.is_active() and x.enable_recentsearch,
diff --git a/sickbeard/show_name_helpers.py b/sickbeard/show_name_helpers.py
index 98e19aa..7726623 100644
--- a/sickbeard/show_name_helpers.py
+++ b/sickbeard/show_name_helpers.py
@@ -458,3 +458,15 @@ def determineReleaseName(dir_name=None, nzb_name=None):
         return folder
 
     return None
+
+
+def abbr_showname(name):
+    # type: (AnyStr) -> AnyStr
+    result = name
+    for cur_from, cur_to in (
+            (r'^Star Trek\s*:\s*', r'ST: '), (r'^The Walking Dead\s*:\s*', r'TWD: '),
+    ):
+        result = re.sub('(?i)%s' % cur_from, cur_to, result)
+        if name != result:
+            break
+    return result
diff --git a/sickbeard/show_queue.py b/sickbeard/show_queue.py
index 8cb1353..6cb1f67 100644
--- a/sickbeard/show_queue.py
+++ b/sickbeard/show_queue.py
@@ -343,10 +343,11 @@ class ShowQueue(generic_queue.GenericQueue):
 
             return queue_item_obj
 
-    def addShow(self, tvid, prodid, show_dir, default_status=None, quality=None, flatten_folders=None,
-                lang='en', subtitles=None, anime=None, scene=None, paused=None, blocklist=None, allowlist=None,
-                wanted_begin=None, wanted_latest=None, prune=None, tag=None,
-                new_show=False, show_name=None, upgrade_once=False):
+    def add_show(self, tvid, prodid, show_dir,
+                 quality=None, upgrade_once=False, wanted_begin=None, wanted_latest=None, tag=None,
+                 paused=None, prune=None, default_status=None, scene=None, subtitles=None,
+                 flatten_folders=None, anime=None, blocklist=None, allowlist=None,
+                 show_name=None, new_show=False, lang='en'):
         """
 
         :param tvid: tvid
@@ -355,40 +356,40 @@ class ShowQueue(generic_queue.GenericQueue):
         :type prodid: int or long
         :param show_dir: show dir
         :type show_dir: AnyStr
-        :param default_status:
-        :type default_status: int or None
         :param quality:
         :type quality: None or int
-        :param flatten_folders:
-        :type flatten_folders: int or None
-        :param lang:
-        :type lang: AnyStr
+        :param upgrade_once:
+        :type upgrade_once: bool or None
+        :param wanted_begin:
+        :type wanted_begin: int or None
+        :param wanted_latest:
+        :type wanted_latest: int or None
+        :param tag:
+        :type tag: AnyStr or None
+        :param paused:
+        :type paused: None or int
+        :param prune:
+        :type prune: int or None
+        :param default_status:
+        :type default_status: int or None
+        :param scene:
+        :type scene: int or None
         :param subtitles:
         :type subtitles: int or None
+        :param flatten_folders:
+        :type flatten_folders: int or None
         :param anime:
         :type anime: int or None
-        :param scene:
-        :type scene: int or None
-        :param paused:
-        :type paused: None or int
         :param blocklist:
         :type blocklist: AnyStr or None
         :param allowlist:
         :type allowlist: AnyStr or None
-        :param wanted_begin:
-        :type wanted_begin: int or None
-        :param wanted_latest:
-        :type wanted_latest: int or None
-        :param prune:
-        :type prune: int or None
-        :param tag:
-        :type tag: AnyStr or None
-        :param new_show:
-        :type new_show: AnyStr or None
         :param show_name:
         :type show_name: AnyStr or None
-        :param upgrade_once:
-        :type upgrade_once: bool or None
+        :param new_show:
+        :type new_show: AnyStr or None
+        :param lang:
+        :type lang: AnyStr
         :return:
         :rtype: QueueItemAdd
         """
@@ -695,16 +696,16 @@ class QueueItemAdd(ShowQueueItem):
 
             # set up initial values
             self.show_obj.location = self.showDir
-            self.show_obj.subtitles = self.subtitles if None is not self.subtitles else sickbeard.SUBTITLES_DEFAULT
             self.show_obj.quality = self.quality if self.quality else sickbeard.QUALITY_DEFAULT
             self.show_obj.upgrade_once = self.upgrade_once
+            self.show_obj.tag = self.tag if None is not self.tag else 'Show List'
+            self.show_obj.paused = self.paused if None is not self.paused else sickbeard.PAUSE_DEFAULT
+            self.show_obj.prune = self.prune if None is not self.prune else 0
+            self.show_obj.scene = self.scene if None is not self.scene else sickbeard.SCENE_DEFAULT
+            self.show_obj.subtitles = self.subtitles if None is not self.subtitles else sickbeard.SUBTITLES_DEFAULT
             self.show_obj.flatten_folders = self.flatten_folders if None is not self.flatten_folders \
                 else sickbeard.FLATTEN_FOLDERS_DEFAULT
             self.show_obj.anime = self.anime if None is not self.anime else sickbeard.ANIME_DEFAULT
-            self.show_obj.scene = self.scene if None is not self.scene else sickbeard.SCENE_DEFAULT
-            self.show_obj.paused = self.paused if None is not self.paused else False
-            self.show_obj.prune = self.prune if None is not self.prune else 0
-            self.show_obj.tag = self.tag if None is not self.tag else 'Show List'
 
             if self.show_obj.anime:
                 self.show_obj.release_groups = AniGroupList(self.show_obj.tvid,
diff --git a/sickbeard/show_updater.py b/sickbeard/show_updater.py
index fb8197b..3a4a701 100644
--- a/sickbeard/show_updater.py
+++ b/sickbeard/show_updater.py
@@ -136,7 +136,7 @@ class ShowUpdater(object):
                 import threading
                 try:
                     sickbeard.background_mapping_task = threading.Thread(
-                        name='LOAD-MAPPINGS', target=sickbeard.indexermapper.load_mapped_ids, kwargs={'update': True})
+                        name='MAPPINGSUPDATER', target=sickbeard.indexermapper.load_mapped_ids, kwargs={'update': True})
                     sickbeard.background_mapping_task.start()
                 except (BaseException, Exception):
                     logger.log('missing mapped ids update error', logger.ERROR)
diff --git a/sickbeard/traktChecker.py b/sickbeard/traktChecker.py
index f299ac6..0d3eaca 100644
--- a/sickbeard/traktChecker.py
+++ b/sickbeard/traktChecker.py
@@ -184,10 +184,12 @@ class TraktChecker(object):
                 else:
                     helpers.chmod_as_parent(showPath)
 
-                sickbeard.show_queue_scheduler.action.addShow(int(tvid), int(prod_id), showPath, status,
-                                                              int(sickbeard.QUALITY_DEFAULT),
-                                                              int(sickbeard.FLATTEN_FOLDERS_DEFAULT),
-                                                              paused=sickbeard.TRAKT_START_PAUSED)
+                sickbeard.show_queue_scheduler.action.add_show(
+                    int(tvid), int(prod_id), showPath,
+                    quality=int(sickbeard.QUALITY_DEFAULT),
+                    paused=sickbeard.TRAKT_START_PAUSED, default_status=status,
+                    flatten_folders=int(sickbeard.FLATTEN_FOLDERS_DEFAULT)
+                )
             else:
                 logger.log(u"There was an error creating the show, no root directory setting found", logger.ERROR)
                 return
diff --git a/sickbeard/tv.py b/sickbeard/tv.py
index 0f3b079..957954b 100644
--- a/sickbeard/tv.py
+++ b/sickbeard/tv.py
@@ -206,6 +206,9 @@ class TVidProdid(object):
 
 
 class TVShow(TVShowBase):
+    __slots__ = (
+        'path',
+    )
 
     def __init__(self, tvid, prodid, lang=''):
         # type: (int, int, Text) -> None
@@ -219,7 +222,7 @@ class TVShow(TVShowBase):
         self._not_found_count = None  # type: None or int
         self._last_found_on_indexer = -1  # type: int
 
-        self._location = ''  # type: AnyStr
+        self._location = self.path = ''  # type: AnyStr
         # self._is_location_good = None
         self.lock = threading.Lock()
         self.sxe_ep_obj = {}   # type: Dict
@@ -422,6 +425,7 @@ class TVShow(TVShowBase):
         # Don't validate dir if user wants to add shows without creating a dir
         if sickbeard.ADD_SHOWS_WO_DIR or ek.ek(os.path.isdir, new_location):
             self.dirty_setter('_location')(self, new_location)
+            self.path = new_location
             # self._is_location_good = True
         else:
             raise exceptions_helper.NoNFOException('Invalid folder for the show!')
diff --git a/sickbeard/version_checker.py b/sickbeard/version_checker.py
index 14cf298..87cc710 100644
--- a/sickbeard/version_checker.py
+++ b/sickbeard/version_checker.py
@@ -22,6 +22,7 @@ import re
 import shutil
 import stat
 import tarfile
+import time
 import traceback
 from . import gh_api as github
 
@@ -31,13 +32,74 @@ from exceptions_helper import ex
 
 import sickbeard
 from . import logger, notifiers, ui
-from .helpers import cmdline_runner
+from .piper import check_pip_outdated
+from sg_helpers import cmdline_runner
 
 # noinspection PyUnresolvedReferences
 from six.moves import urllib
+from _23 import list_keys
 
 
-class CheckVersion(object):
+class PackagesUpdater(object):
+
+    def __init__(self):
+        self.install_type = 'Python package updates'
+
+    def run(self, force=False):
+        if not sickbeard.EXT_UPDATES \
+                and self.check_for_new_version(force) \
+                and sickbeard.UPDATE_PACKAGES_AUTO:
+            msg = 'Automatic %s enabled, restarting to update...' % self.install_type
+            logger.log(msg)
+            ui.notifications.message(msg)
+            time.sleep(3)
+            sickbeard.restart(soft=False)
+
+    def check_for_new_version(self, force=False):
+        """
+        Checks for available Python package installs/updates
+
+        :param force: ignore the UPDATE_PACKAGES_NOTIFY setting
+
+        :returns: True when package install/updates are available
+        """
+        if force and not sickbeard.UPDATE_PACKAGES_MENU:
+            logger.log('Checking not enabled from menu action for %s' % self.install_type)
+            return False
+
+        if not sickbeard.UPDATE_PACKAGES_NOTIFY and not sickbeard.UPDATE_PACKAGES_AUTO and not force:
+            logger.log('Checking not enabled for %s' % self.install_type)
+            return False
+
+        logger.log('Checking for %s%s' % (self.install_type, ('', ' (from menu)')[force]))
+        sickbeard.UPDATES_TODO = check_pip_outdated(force)
+        if not sickbeard.UPDATES_TODO:
+            msg = 'No %s needed' % self.install_type
+            logger.log(msg)
+
+            if force:
+                ui.notifications.message(msg)
+            return False
+
+        logger.log('Update(s) for %s found %s' % (self.install_type, list_keys(sickbeard.UPDATES_TODO)))
+
+        # save updates_todo to config to be loaded after restart
+        sickbeard.save_config()
+
+        if not sickbeard.UPDATE_PACKAGES_AUTO:
+            msg = '%s available &mdash; <a href="%s">Update Now</a>' % (
+                    self.install_type, '%s/home/restart/?update_pkg=1&pid=%s' % (sickbeard.WEB_ROOT, sickbeard.PID))
+            if None is sickbeard.NEWEST_VERSION_STRING:
+                sickbeard.NEWEST_VERSION_STRING = ''
+            if msg not in sickbeard.NEWEST_VERSION_STRING:
+                if sickbeard.NEWEST_VERSION_STRING:
+                    sickbeard.NEWEST_VERSION_STRING += '<br>Also, '
+                sickbeard.NEWEST_VERSION_STRING += msg
+
+        return True
+
+
+class SoftwareUpdater(object):
     """
     Version check class meant to run as a thread object with the sg scheduler.
     """
@@ -56,14 +118,15 @@ class CheckVersion(object):
         # set current branch version
         sickbeard.BRANCH = self.get_branch()
 
-        if self.check_for_new_version(force):
-            if sickbeard.AUTO_UPDATE:
-                logger.log(u'New update found for SickGear, starting auto-updater...')
-                ui.notifications.message('New update found for SickGear, starting auto-updater')
-                if sickbeard.version_check_scheduler.action.update():
-                    logger.log(u'Update was successful!')
-                    ui.notifications.message('Update was successful')
-                    sickbeard.events.put(sickbeard.events.SystemEvent.RESTART)
+        if not sickbeard.EXT_UPDATES \
+                and self.check_for_new_version(force) \
+                and sickbeard.UPDATE_AUTO \
+                and sickbeard.update_software_scheduler.action.update():
+            msg = 'Automatic software updates enabled, restarting with updated...'
+            logger.log(msg)
+            ui.notifications.message(msg)
+            time.sleep(3)
+            sickbeard.restart(soft=False)
 
     @staticmethod
     def find_install_type():
@@ -74,36 +137,34 @@ class CheckVersion(object):
             'git': running from source using git
             'source': running from source without git
         """
-
-        if os.path.isdir(ek.ek(os.path.join, sickbeard.PROG_DIR, u'.git')):
-            return 'git'
-        return 'source'
+        return ('source', 'git')[os.path.isdir(ek.ek(os.path.join, sickbeard.PROG_DIR, '.git'))]
 
     def check_for_new_version(self, force=False):
         """
-        Checks the internet for a newer version.
+        Checks for a new software release
 
-        returns: bool, True for new version or False for no new version.
+        :param force: ignore the UPDATE_NOTIFY setting
 
-        force: if true the VERSION_NOTIFY setting will be ignored and a check will be forced
+        :returns: True when a new software version is available
         """
 
-        if not sickbeard.VERSION_NOTIFY and not sickbeard.AUTO_UPDATE and not force:
-            logger.log(u'Version checking is disabled, not checking for the newest version')
+        if not sickbeard.UPDATE_NOTIFY and not sickbeard.UPDATE_AUTO and not force:
+            logger.log('Checking not enabled for software updates')
             return False
 
-        if not sickbeard.AUTO_UPDATE:
-            logger.log(u'Checking if %s needs an update' % self.install_type)
+        logger.log('Checking for "%s" software update%s' % (self.install_type, ('', ' (from menu)')[force]))
         if not self.updater.need_update():
             sickbeard.NEWEST_VERSION_STRING = None
-            if not sickbeard.AUTO_UPDATE:
-                logger.log(u'No update needed')
+            msg = 'No "%s" software update needed' % self.install_type
+            logger.log(msg)
 
             if force:
-                ui.notifications.message('No update needed')
+                ui.notifications.message(msg)
             return False
 
-        self.updater.set_newest_text()
+        if not sickbeard.UPDATE_AUTO:
+            self.updater.set_newest_text()
+
         return True
 
     def update(self):
@@ -147,9 +208,11 @@ class GitUpdateManager(UpdateManager):
         self.github_repo_user = self.get_github_repo_user()
         self.github_repo = self.get_github_repo()
 
-        self.branch = sickbeard.BRANCH
-        if '' == sickbeard.BRANCH:
-            self.branch = self._find_installed_branch()
+        self.branch = self._find_installed_branch()
+        if '' == self.branch:
+            self.branch = sickbeard.BRANCH
+        if self.branch and self.branch != sickbeard.BRANCH:
+            sickbeard.BRANCH = self.branch
 
         self._cur_commit_hash = None
         self._newest_commit_hash = None
@@ -158,75 +221,76 @@ class GitUpdateManager(UpdateManager):
         self._cur_pr_number = self.get_cur_pr_number()
 
     def _find_working_git(self):
-        test_cmd = 'version'
 
-        if sickbeard.GIT_PATH:
-            main_git = '"%s"' % sickbeard.GIT_PATH
-        else:
-            main_git = 'git'
+        logger.debug(u'Checking if git commands are available')
+
+        main_git = (sickbeard.GIT_PATH, 'git')[not sickbeard.GIT_PATH]
 
-        logger.log(u'Checking if we can use git commands: %s %s' % (main_git, test_cmd), logger.DEBUG)
-        output, err, exit_status = self._run_git(main_git, test_cmd)
+        _, _, exit_status = self._git_version(main_git)
 
         if 0 == exit_status:
-            logger.log(u'Using: %s' % main_git, logger.DEBUG)
+            logger.debug(u'Using: %s' % main_git)
             return main_git
-        else:
-            logger.log(u'Not using: %s' % main_git, logger.DEBUG)
+
+        logger.debug(u'Git not found: %s' % main_git)
 
         # trying alternatives
 
-        alternative_git = []
+        alt_git_paths = []
 
-        # osx people who start sg from launchd have a broken path, so try a hail-mary attempt for them
+        # osx users who start sg from launchd have a broken path, so try a possible location
         if 'darwin' == platform.system().lower():
-            alternative_git.append('/usr/local/git/bin/git')
+            alt_git_paths.append('/usr/local/git/bin/git')
 
         if 'windows' == platform.system().lower():
             if main_git != main_git.lower():
-                alternative_git.append(main_git.lower())
+                alt_git_paths.append(main_git.lower())
             if sickbeard.GIT_PATH:
-                logger.log(u'git.exe is missing, remove `git_path` from config.ini: %s' % main_git, logger.DEBUG)
+                logger.debug(u'git.exe is missing, remove `git_path` from config.ini: %s' % main_git)
                 if re.search(r' \(x86\)', main_git):
-                    alternative_git.append(re.sub(r' \(x86\)', '', main_git))
+                    alt_git_paths.append(re.sub(r' \(x86\)', '', main_git))
                 else:
-                    alternative_git.append(re.sub('Program Files', 'Program Files (x86)', main_git))
-                logger.log(
-                    u'Until `git_path` is removed by a config.ini edit, trying: %s' % alternative_git[-1], logger.DEBUG)
+                    alt_git_paths.append(re.sub('Program Files', 'Program Files (x86)', main_git))
+                logger.debug(u'Until `git_path` is removed by a config.ini edit, trying: %s' % alt_git_paths[-1])
 
-        if alternative_git:
-            logger.log(u'Trying known alternative git locations', logger.DEBUG)
+        if alt_git_paths:
+            logger.debug('Trying known alternative git locations')
 
-            for cur_git in alternative_git:
-                logger.log(u'Checking if we can use git commands: ' + cur_git + ' ' + test_cmd, logger.DEBUG)
-                output, err, exit_status = self._run_git(cur_git, test_cmd)
+            for cur_git_path in alt_git_paths:
+                _, _, exit_status = self._git_version(cur_git_path)
 
                 if 0 == exit_status:
-                    logger.log(u'Using: %s' % cur_git, logger.DEBUG)
-                    return cur_git
-                logger.log(u'Not using: %s' % cur_git, logger.DEBUG)
+                    logger.debug(u'Using: %s' % cur_git_path)
+                    return cur_git_path
+                logger.debug(u'Not using: %s' % cur_git_path)
 
         # Still haven't found a working git
         error_message = 'Unable to find your git executable - Shutdown SickGear and EITHER set git_path' \
                         ' in your config.ini OR delete your .git folder and run from source to enable updates.'
         sickbeard.NEWEST_VERSION_STRING = error_message
 
-    @staticmethod
-    def _run_git(git_path, args):
+    def _git_version(self, git_path):
+
+        return self._run_git(['version'], git_path)
+
+    def _run_git(self, arg_list, git_path=None):
 
         output = err = None
         exit_status = 1
 
+        if None is git_path:
+            git_path = self._git_path
+
         if not git_path:
-            logger.log(u'No git specified, cannot use git commands', logger.ERROR)
+            logger.error(u'No git specified, cannot use git commands')
             return output, err, exit_status
 
-        cmd = '%s %s' % (git_path, args)
+        cmd = ' '.join([git_path] + arg_list)
 
         try:
-            logger.log(u'Executing %s with your shell in %s' % (cmd, sickbeard.PROG_DIR), logger.DEBUG)
-            output, err, exit_status = cmdline_runner(cmd, shell=True)
-            logger.log(u'git output: %s' % output, logger.DEBUG)
+            logger.debug(u'Executing %s with your shell in %s' % (cmd, sickbeard.PROG_DIR))
+            output, err, exit_status = cmdline_runner([git_path] + arg_list)
+            logger.debug(u'git output: %s' % output)
 
         except OSError:
             logger.log('Failed command: %s' % cmd)
@@ -235,18 +299,22 @@ class GitUpdateManager(UpdateManager):
             logger.log('Failed command: %s, %s' % (cmd, ex(e)))
 
         if 0 == exit_status:
-            logger.log(u'Successful return: %s' % cmd, logger.DEBUG)
+            logger.debug(u'Successful return: %s' % cmd)
             exit_status = 0
 
         elif 1 == exit_status:
-            logger.log(u'Failed: %s returned: %s' % (cmd, output), logger.ERROR)
+            logger.error(u'Failed: %s returned: %s' % (cmd, output))
 
         elif 128 == exit_status or 'fatal:' in output or err:
-            logger.log(u'Fatal: %s returned: %s' % (cmd, output), logger.ERROR)
             exit_status = 128
+            msg = u'Fatal: %s returned: %s' % (cmd, output)
+            if 'develop' in output.lower() or 'master' in output.lower():
+                logger.error(msg)
+            else:
+                logger.debug(msg)
 
         else:
-            logger.log(u'Treat as error for now, command: %s returned: %s' % (cmd, output), logger.ERROR)
+            logger.error(u'Treat as error for now, command: %s returned: %s' % (cmd, output))
 
         return output, err, exit_status
 
@@ -257,12 +325,12 @@ class GitUpdateManager(UpdateManager):
         Returns: True for success or False for failure
         """
 
-        output, err, exit_status = self._run_git(self._git_path, 'rev-parse HEAD')
+        output, _, exit_status = self._run_git(['rev-parse', 'HEAD'])
 
         if 0 == exit_status and output:
             cur_commit_hash = output.strip()
             if not re.match(r'^[a-z0-9]+$', cur_commit_hash):
-                logger.log(u'Output doesn\'t look like a hash, not using it', logger.ERROR)
+                logger.error(u'Output doesn\'t look like a hash, not using it')
                 return False
             self._cur_commit_hash = cur_commit_hash
             sickbeard.CUR_COMMIT_HASH = str(cur_commit_hash)
@@ -270,9 +338,9 @@ class GitUpdateManager(UpdateManager):
         return False
 
     def _find_installed_branch(self):
-        branch_info, err, exit_status = self._run_git(self._git_path, 'symbolic-ref -q HEAD')
-        if 0 == exit_status and branch_info:
-            branch = branch_info.strip().replace('refs/heads/', '', 1)
+        output, _, exit_status = self._run_git(['symbolic-ref', '-q', 'HEAD'])
+        if 0 == exit_status and output:
+            branch = output.strip().replace('refs/heads/', '', 1)
             if branch:
                 return branch
 
@@ -288,32 +356,31 @@ class GitUpdateManager(UpdateManager):
         self._num_commits_ahead = 0
 
         # get all new info from github
-        output, err, exit_status = self._run_git(self._git_path, 'fetch %s' % sickbeard.GIT_REMOTE)
+        _, _, exit_status = self._run_git(['fetch', '%s' % sickbeard.GIT_REMOTE])
 
         if 0 != exit_status:
-            logger.log(u'Unable to contact github, can\'t check for update', logger.ERROR)
+            logger.error(u'Unable to contact github, can\'t check for update')
             return
 
         if not self._cur_pr_number:
 
             # get latest commit_hash from remote
-            output, err, exit_status = self._run_git(self._git_path, 'rev-parse --verify --quiet "@{upstream}"')
+            output, _, exit_status = self._run_git(['rev-parse', '--verify', '--quiet', '@{upstream}'])
 
             if 0 == exit_status and output:
                 cur_commit_hash = output.strip()
 
                 if not re.match('^[a-z0-9]+$', cur_commit_hash):
-                    logger.log(u'Output doesn\'t look like a hash, not using it', logger.DEBUG)
+                    logger.debug(u'Output doesn\'t look like a hash, not using it')
                     return
 
-                else:
-                    self._newest_commit_hash = cur_commit_hash
+                self._newest_commit_hash = cur_commit_hash
             else:
-                logger.log(u'git didn\'t return newest commit hash', logger.DEBUG)
+                logger.debug(u'git didn\'t return newest commit hash')
                 return
 
             # get number of commits behind and ahead (option --count not supported git < 1.7.2)
-            output, err, exit_status = self._run_git(self._git_path, 'rev-list --left-right "@{upstream}"...HEAD')
+            output, _, exit_status = self._run_git(['rev-list', '--left-right', '@{upstream}...HEAD'])
 
             if 0 == exit_status and output:
 
@@ -322,16 +389,15 @@ class GitUpdateManager(UpdateManager):
                     self._num_commits_ahead = int(output.count('>'))
 
                 except (BaseException, Exception):
-                    logger.log(u'git didn\'t return numbers for behind and ahead, not using it', logger.DEBUG)
+                    logger.debug(u'git didn\'t return numbers for behind and ahead, not using it')
                     return
 
-            logger.log(u'cur_commit = %s, newest_commit = %s, num_commits_behind = %s, num_commits_ahead = %s' % (
-                self._cur_commit_hash, self._newest_commit_hash, self._num_commits_behind, self._num_commits_ahead),
-                       logger.DEBUG)
+            logger.debug(u'cur_commit = %s, newest_commit = %s, num_commits_behind = %s, num_commits_ahead = %s' % (
+                self._cur_commit_hash, self._newest_commit_hash, self._num_commits_behind, self._num_commits_ahead))
         else:
             # we need to treat pull requests specially as it doesn't seem possible to set their "@{upstream}" tag
-            output, err, exit_status = self._run_git(self._git_path, 'ls-remote %s refs/pull/%s/head'
-                                                     % (sickbeard.GIT_REMOTE, self._cur_pr_number))
+            output, _, _ = self._run_git(['ls-remote', '%s' % sickbeard.GIT_REMOTE,
+                                          'refs/pull/%s/head' % self._cur_pr_number])
             self._newest_commit_hash = re.findall('(.*)\t', output)[0]
 
     def set_newest_text(self):
@@ -340,8 +406,8 @@ class GitUpdateManager(UpdateManager):
         url = 'http://github.com/%s/%s' % (self.github_repo_user, self.github_repo)
 
         if self._num_commits_ahead:
-            logger.log(u'Local branch is ahead of %s. Automatic update not possible.' % self.branch, logger.ERROR)
             newest_text = 'Local branch is ahead of %s. Automatic update not possible.' % self.branch
+            logger.error(newest_text)
 
         elif 0 < self._num_commits_behind:
 
@@ -366,24 +432,24 @@ class GitUpdateManager(UpdateManager):
     def need_update(self):
 
         if self.branch != self._find_installed_branch():
-            logger.log(u'Branch checkout: %s->%s' % (self._find_installed_branch(), self.branch), logger.DEBUG)
+            logger.debug(u'Branch checkout: %s->%s' % (self._find_installed_branch(), self.branch))
             return True
 
         self._find_installed_version()
         if not self._cur_commit_hash:
             return True
-        else:
-            try:
-                self._check_github_for_update()
-            except (BaseException, Exception) as e:
-                logger.log(u'Unable to contact github, can\'t check for update: %r' % e, logger.ERROR)
-                return False
 
-            if 0 < self._num_commits_behind:
-                return True
+        try:
+            self._check_github_for_update()
+        except (BaseException, Exception) as e:
+            logger.error(u'Unable to contact github, can\'t check for update: %r' % e)
+            return False
+
+        if 0 < self._num_commits_behind:
+            return True
 
-            if self._cur_pr_number and self._cur_commit_hash != self._newest_commit_hash:
-                return True
+        if self._cur_pr_number and self._cur_commit_hash != self._newest_commit_hash:
+            return True
 
         return False
 
@@ -395,16 +461,15 @@ class GitUpdateManager(UpdateManager):
 
         if self.branch == self._find_installed_branch():
             if not self._cur_pr_number:
-                output, err, exit_status = self._run_git(self._git_path, 'pull -f %s %s'
-                                                         % (sickbeard.GIT_REMOTE, self.branch))
+                _, _, exit_status = self._run_git(['pull', '-f', '%s' % sickbeard.GIT_REMOTE, '%s' % self.branch])
             else:
-                output, err, exit_status = self._run_git(self._git_path, 'pull -f %s pull/%s/head:%s'
-                                                         % (sickbeard.GIT_REMOTE, self._cur_pr_number, self.branch))
+                _, _, exit_status = self._run_git(['pull', '-f', '%s' % sickbeard.GIT_REMOTE,
+                                                   'pull/%s/head:%s' % (self._cur_pr_number, self.branch)])
 
         else:
-            output, err, exit_status = self._run_git(self._git_path, 'fetch %s' % sickbeard.GIT_REMOTE)
-            output, err, exit_status = self._run_git(self._git_path, 'checkout -f -B "%s" "%s/%s"'
-                                                     % (self.branch, sickbeard.GIT_REMOTE, self.branch))
+            self._run_git(['fetch', '%s' % sickbeard.GIT_REMOTE])
+            _, _, exit_status = self._run_git(['checkout', '-f', '-B', '%s' % self.branch,
+                                               '%s/%s' % (sickbeard.GIT_REMOTE, self.branch)])
 
         if 0 == exit_status:
             self._find_installed_version()
@@ -416,10 +481,9 @@ class GitUpdateManager(UpdateManager):
         return False
 
     def list_remote_branches(self):
-        branches, err, exit_status = self._run_git(self._git_path, 'ls-remote --heads %s'
-                                                   % sickbeard.GIT_REMOTE)
-        if 0 == exit_status and branches:
-            return re.findall(r'\S+\Wrefs/heads/(.*)', branches)
+        output, _, exit_status = self._run_git(['ls-remote', '--heads', '%s' % sickbeard.GIT_REMOTE])
+        if 0 == exit_status and output:
+            return re.findall(r'\S+\Wrefs/heads/(.*)', output)
         return []
 
     def list_remote_pulls(self):
@@ -427,8 +491,7 @@ class GitUpdateManager(UpdateManager):
         return gh.pull_requests()
 
     def fetch(self, pull_request):
-        output, err, exit_status = self._run_git(self._git_path, 'fetch -f %s %s'
-                                                 % (sickbeard.GIT_REMOTE, pull_request))
+        _, _, exit_status = self._run_git(['fetch', '-f', '%s' % sickbeard.GIT_REMOTE, '%s' % pull_request])
         return 0 == exit_status
 
     def get_cur_pr_number(self):
@@ -464,11 +527,11 @@ class SourceUpdateManager(UpdateManager):
         try:
             self._check_github_for_update()
         except (BaseException, Exception) as e:
-            logger.log(u'Unable to contact github, can\'t check for update: %r' % e, logger.ERROR)
+            logger.error(u'Unable to contact github, can\'t check for update: %r' % e)
             return False
 
         if self.branch != self._find_installed_branch():
-            logger.log(u'Branch checkout: %s->%s' % (self._find_installed_branch(), self.branch), logger.DEBUG)
+            logger.debug(u'Branch checkout: %s->%s' % (self._find_installed_branch(), self.branch))
             return True
 
         if not self._cur_commit_hash or 0 < self._num_commits_behind:
@@ -514,8 +577,8 @@ class SourceUpdateManager(UpdateManager):
                 # when _cur_commit_hash doesn't match anything _num_commits_behind == 100
                 self._num_commits_behind += 1
 
-        logger.log(u'cur_commit = %s, newest_commit = %s, num_commits_behind = %s'
-                   % (self._cur_commit_hash, self._newest_commit_hash, self._num_commits_behind), logger.DEBUG)
+        logger.debug(u'cur_commit = %s, newest_commit = %s, num_commits_behind = %s'
+                     % (self._cur_commit_hash, self._newest_commit_hash, self._num_commits_behind))
 
     def set_newest_text(self):
 
@@ -523,7 +586,7 @@ class SourceUpdateManager(UpdateManager):
         newest_text = None
 
         if not self._cur_commit_hash:
-            logger.log(u'Unknown current version number, don\'t know if we should update or not', logger.DEBUG)
+            logger.debug(u'Unknown current version number, don\'t know if we should update or not')
 
             newest_text = 'Unknown current version number: If you\'ve never used the SickGear upgrade system' \
                           ' before then current version is not set. &mdash; <a href="%s">Update Now</a>' \
@@ -568,11 +631,11 @@ class SourceUpdateManager(UpdateManager):
             urllib.request.urlretrieve(tar_download_url, tar_download_path)
 
             if not ek.ek(os.path.isfile, tar_download_path):
-                logger.log(u'Unable to retrieve new version from %s, can\'t update' % tar_download_url, logger.ERROR)
+                logger.error(u'Unable to retrieve new version from %s, can\'t update' % tar_download_url)
                 return False
 
             if not ek.ek(tarfile.is_tarfile, tar_download_path):
-                logger.log(u'Retrieved version from %s is corrupt, can\'t update' % tar_download_url, logger.ERROR)
+                logger.error(u'Retrieved version from %s is corrupt, can\'t update' % tar_download_url)
                 return False
 
             # extract to sg-update dir
@@ -589,7 +652,7 @@ class SourceUpdateManager(UpdateManager):
             update_dir_contents = [x for x in os.listdir(sg_update_dir) if
                                    os.path.isdir(os.path.join(sg_update_dir, x))]
             if 1 != len(update_dir_contents):
-                logger.log(u'Invalid update data, update failed: %s' % update_dir_contents, logger.ERROR)
+                logger.error(u'Invalid update data, update failed: %s' % update_dir_contents)
                 return False
             content_dir = os.path.join(sg_update_dir, update_dir_contents[0])
 
@@ -610,7 +673,7 @@ class SourceUpdateManager(UpdateManager):
                             os.remove(new_path)
                             os.renames(old_path, new_path)
                         except (BaseException, Exception) as e:
-                            logger.log(u'Unable to update %s: %s' % (new_path, ex(e)), logger.DEBUG)
+                            logger.debug(u'Unable to update %s: %s' % (new_path, ex(e)))
                             os.remove(old_path)  # Trash the updated file without moving in new path
                         continue
 
@@ -622,8 +685,8 @@ class SourceUpdateManager(UpdateManager):
             sickbeard.CUR_COMMIT_BRANCH = self.branch
 
         except (BaseException, Exception) as e:
-            logger.log(u'Error while trying to update: %s' % ex(e), logger.ERROR)
-            logger.log(u'Traceback: %s' % traceback.format_exc(), logger.DEBUG)
+            logger.error(u'Error while trying to update: %s' % ex(e))
+            logger.debug(u'Traceback: %s' % traceback.format_exc())
             return False
 
         # Notify update successful
diff --git a/sickbeard/webapi.py b/sickbeard/webapi.py
index 8cd4ea4..0f5ad95 100644
--- a/sickbeard/webapi.py
+++ b/sickbeard/webapi.py
@@ -2497,7 +2497,7 @@ class CMD_SickGearRestart(ApiCall):
 
     def run(self):
         """ restart sickgear """
-        sickbeard.events.put(sickbeard.events.SystemEvent.RESTART)
+        sickbeard.restart(soft=False)
         return _responds(RESULT_SUCCESS, msg="SickGear is restarting...")
 
 
@@ -3306,8 +3306,9 @@ class CMD_SickGearShowAddExisting(ApiCall):
              "optionalParameters": {"initial": {"desc": "initial quality for the show"},
                                     "archive": {"desc": "archive quality for the show"},
                                     "upgrade_once": {"desc": "upgrade only once"},
-                                    "flatten_folders": {"desc": "flatten subfolders for the show"},
-                                    "subtitles": {"desc": "allow search episode subtitle"}
+                                    "pause": {"desc": "pause show search tasks to allow edits"},
+                                    "subtitles": {"desc": "allow search episode subtitle"},
+                                    "flatten_folders": {"desc": "flatten subfolders for the show"}
                                     }
              }
 
@@ -3322,6 +3323,7 @@ class CMD_SickGearShowAddExisting(ApiCall):
         self.archive, args = self.check_params(args, kwargs, "archive", None, False, "list", [q for q in quality_map])
         self.upgradeonce, args = self.check_params(args, kwargs, "upgrade_once", False, False, "bool", [])
 
+        self.pause, args = self.check_params(args, kwargs, "pause", int(sickbeard.PAUSE_DEFAULT), False, "int", [])
         self.flatten_folders, args = self.check_params(args, kwargs, "flatten_folders",
                                                        str(sickbeard.FLATTEN_FOLDERS_DEFAULT), False, "bool", [])
         self.subtitles, args = self.check_params(args, kwargs, "subtitles", int(sickbeard.USE_SUBTITLES), False, "int",
@@ -3379,9 +3381,11 @@ class CMD_SickGearShowAddExisting(ApiCall):
         if iqualityID or aqualityID:
             newQuality = Quality.combineQualities(iqualityID, aqualityID)
 
-        sickbeard.show_queue_scheduler.action.addShow(int(self.tvid), int(self.prodid), self.location, SKIPPED,
-                                                      newQuality, int(self.flatten_folders),
-                                                      upgrade_once=self.upgradeonce)
+        sickbeard.show_queue_scheduler.action.add_show(
+            int(self.tvid), int(self.prodid), self.location,
+            quality=newQuality, upgrade_once=self.upgradeonce,
+            paused=self.pause, default_status=SKIPPED, flatten_folders=int(self.flatten_folders)
+        )
 
         return _responds(RESULT_SUCCESS, {"name": indexerName}, indexerName + " has been queued to be added")
 
@@ -3436,14 +3440,15 @@ class CMD_SickGearShowAddNew(ApiCall):
         self.initial, args = self.check_params(args, kwargs, "initial", None, False, "list", [q for q in quality_map])
         self.archive, args = self.check_params(args, kwargs, "archive", None, False, "list", [q for q in quality_map])
         self.upgradeonce, args = self.check_params(args, kwargs, "upgrade_once", False, False, "bool", [])
-        self.flatten_folders, args = self.check_params(args, kwargs, "flatten_folders",
-                                                       str(sickbeard.FLATTEN_FOLDERS_DEFAULT), False, "bool", [])
+        self.pause, args = self.check_params(args, kwargs, "pause", int(sickbeard.PAUSE_DEFAULT), False, "int", [])
         self.status, args = self.check_params(args, kwargs, "status", None, False, "string",
                                               ["wanted", "skipped", "archived", "ignored"])
+        self.scene, args = self.check_params(args, kwargs, "scene", int(sickbeard.SCENE_DEFAULT), False, "int", [])
         self.subtitles, args = self.check_params(
             args, kwargs, "subtitles", int(sickbeard.USE_SUBTITLES), False, "int", [])
+        self.flatten_folders, args = self.check_params(args, kwargs, "flatten_folders",
+                                                       str(sickbeard.FLATTEN_FOLDERS_DEFAULT), False, "bool", [])
         self.anime, args = self.check_params(args, kwargs, "anime", int(sickbeard.ANIME_DEFAULT), False, "int", [])
-        self.scene, args = self.check_params(args, kwargs, "scene", int(sickbeard.SCENE_DEFAULT), False, "int", [])
         self.lang = 'en'
 
         # super, missing, help
@@ -3539,10 +3544,13 @@ class CMD_SickGearShowAddNew(ApiCall):
             else:
                 helpers.chmod_as_parent(showPath)
 
-        sickbeard.show_queue_scheduler.action.addShow(int(self.tvid), int(self.prodid), showPath, newStatus,
-                                                      newQuality,
-                                                      int(self.flatten_folders), self.lang, self.subtitles, self.anime,
-                                                      self.scene, new_show=True, upgrade_once=self.upgradeonce)
+        sickbeard.show_queue_scheduler.action.add_show(
+            int(self.tvid), int(self.prodid), showPath,
+            quality=newQuality, upgrade_once=self.upgradeonce,
+            paused=self.pause, default_status=newStatus, scene=self.scene, subtitles=self.subtitles,
+            flatten_folders=int(self.flatten_folders), anime=self.anime,
+            new_show=True, lang=self.lang
+        )
 
         return _responds(RESULT_SUCCESS, {"name": indexerName}, indexerName + " has been queued to be added")
 
@@ -3551,15 +3559,16 @@ class CMD_ShowAddNew(CMD_SickGearShowAddNew):
     _help = {"desc": "add a new show to sickgear",
              "requiredParameters": {"tvdbid": {"desc": "thetvdb.com id"}
                                     },
-             "optionalParameters": {"initial": {"desc": "initial quality for the show"},
-                                    "location": {"desc": "base path for where the show folder is to be created"},
+             "optionalParameters": {"location": {"desc": "base path for where the show folder is to be created"},
+                                    "initial": {"desc": "initial quality for the show"},
                                     "archive": {"desc": "archive quality for the show"},
-                                    "flatten_folders": {"desc": "flatten subfolders for the show"},
+                                    "pause": {"desc": "pause show search tasks to allow edits"},
                                     "status": {"desc": "status of missing episodes"},
-                                    "lang": {"desc": "the 2 letter lang abbreviation id"},
+                                    "scene": {"desc": "show searches episodes by scene numbering"},
                                     "subtitles": {"desc": "allow search episode subtitle"},
+                                    "flatten_folders": {"desc": "flatten subfolders for the show"},
                                     "anime": {"desc": "set show to anime"},
-                                    "scene": {"desc": "show searches episodes by scene numbering"}
+                                    "lang": {"desc": "the 2 letter lang abbreviation id"}
                                     },
              "SickGearCommand": "sg.show.addnew",
              }
diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py
index c38ef30..a79b14b 100644
--- a/sickbeard/webserve.py
+++ b/sickbeard/webserve.py
@@ -26,6 +26,7 @@ except ImportError:
 from mimetypes import MimeTypes
 
 import base64
+import copy
 import datetime
 import glob
 import hashlib
@@ -53,7 +54,7 @@ from .anime import AniGroupList, pull_anidb_groups, short_group_names
 from .browser import folders_at_path
 from .common import ARCHIVED, DOWNLOADED, FAILED, IGNORED, SKIPPED, SNATCHED, SNATCHED_ANY, UNAIRED, UNKNOWN, WANTED, \
      SD, HD720p, HD1080p, UHD2160p, Overview, Quality, qualityPresetStrings, statusStrings
-from .helpers import has_image_ext, remove_article, remove_file_perm, starify
+from .helpers import get_media_stats, has_image_ext, real_path, remove_article, remove_file_perm, starify
 from .indexermapper import MapStatus, map_indexers_to_show, save_mapping
 from .indexers.indexer_config import TVINFO_IMDB, TVINFO_TRAKT, TVINFO_TVDB
 from .name_parser.parser import InvalidNameException, InvalidShowException, NameParser
@@ -62,6 +63,7 @@ from .scene_numbering import get_scene_absolute_numbering_for_show, get_scene_nu
     get_xem_absolute_numbering_for_show, get_xem_numbering_for_show, set_scene_numbering_helper
 from .search_backlog import FORCED_BACKLOG
 from .sgdatetime import SGDatetime, timestamp_near
+from .show_name_helpers import abbr_showname
 
 from .show_updater import clean_ignore_require_words
 from .trakt_helpers import build_config, trakt_collection_remove_account
@@ -83,7 +85,8 @@ from ._legacy import LegacyBaseHandler
 
 from lib import subliminal
 from lib.cfscrape import CloudflareScraper
-from lib.dateutil import tz
+from lib.dateutil import tz, zoneinfo
+from lib.dateutil.relativedelta import relativedelta
 from lib.fuzzywuzzy import fuzz
 from lib.libtrakt import TraktAPI
 from lib.libtrakt.exceptions import TraktException, TraktAuthException
@@ -101,6 +104,7 @@ from six import binary_type, integer_types, iteritems, iterkeys, itervalues, PY2
 # noinspection PyUnreachableCode
 if False:
     from typing import AnyStr, List, Optional, Tuple
+    from sickbeard.providers.generic import TorrentProvider
 
 
 # noinspection PyAbstractClass
@@ -1838,8 +1842,11 @@ class Home(MainHandler):
 
     def check_update(self):
         # force a check to see if there is a new version
-        if sickbeard.version_check_scheduler.action.check_for_new_version(force=True):
-            logger.log(u'Forcing version check')
+        if sickbeard.update_software_scheduler.action.check_for_new_version(force=True):
+            logger.log(u'Forced version check found results')
+
+        if sickbeard.update_packages_scheduler.action.check_for_new_version(force=True):
+            logger.log(u'Forced package version check found results')
 
         self.redirect('/home/')
 
@@ -1896,7 +1903,7 @@ class Home(MainHandler):
 
         return t.respond()
 
-    def restart(self, pid=None):
+    def restart(self, update_pkg=None, pid=None):
 
         if str(pid) != str(sickbeard.PID):
             return self.redirect('/home/')
@@ -1904,7 +1911,7 @@ class Home(MainHandler):
         t = PageTemplate(web_handler=self, file='restart.tmpl')
         t.shutdown = False
 
-        sickbeard.events.put(sickbeard.events.SystemEvent.RESTART)
+        sickbeard.restart(soft=False, update_pkg=bool(helpers.try_int(update_pkg)))
 
         return t.respond()
 
@@ -1913,7 +1920,7 @@ class Home(MainHandler):
         if str(pid) != str(sickbeard.PID):
             return self.redirect('/home/')
 
-        if sickbeard.version_check_scheduler.action.update():
+        if sickbeard.update_software_scheduler.action.update():
             return self.restart(pid)
 
         return self._generic_message('Update Failed',
@@ -1927,7 +1934,7 @@ class Home(MainHandler):
     def pull_request_checkout(self, branch):
         pull_request = branch
         branch = branch.split(':')[1]
-        fetched = sickbeard.version_check_scheduler.action.fetch(pull_request)
+        fetched = sickbeard.update_software_scheduler.action.fetch(pull_request)
         if fetched:
             sickbeard.BRANCH = branch
             ui.notifications.message('Checking out branch: ', branch)
@@ -2294,6 +2301,32 @@ class Home(MainHandler):
         return 'Episode not found.' if not sql_result else (sql_result[0]['description'] or '')[:250:]
 
     @staticmethod
+    def media_stats(tvid_prodid=None):
+
+        if None is tvid_prodid:
+            shows = sickbeard.showList
+        else:
+            shows = [helpers.find_show_by_id(tvid_prodid)]
+
+        response = {}
+        for cur_show_obj in shows:
+            if cur_show_obj.path:
+                loc_size = helpers.get_size(cur_show_obj.path)
+                num_files, smallest, largest, average_size = get_media_stats(cur_show_obj.path)
+                response[cur_show_obj.tvid_prodid] = {'message': 'No media files'} if not num_files else \
+                    {
+                        'nFiles': num_files,
+                        'bSmallest': smallest, 'hSmallest': helpers.human(smallest),
+                        'bLargest': largest, 'hLargest': helpers.human(largest),
+                        'bAverageSize': average_size, 'hAverageSize': helpers.human(average_size)
+                    }
+
+                response[cur_show_obj.tvid_prodid].update({
+                    'path': cur_show_obj.path, 'bSize': loc_size, 'hSize': helpers.human(loc_size)})
+
+        return json.dumps(response)
+
+    @staticmethod
     def scene_exceptions(tvid_prodid, wanted_season=None):
 
         exceptionsList = sickbeard.scene_exceptions.get_all_scene_exceptions(tvid_prodid)
@@ -3273,7 +3306,8 @@ class Home(MainHandler):
         elif False is result:
             result = dict(result='fail', resp='connect')
         elif isinstance(result, list) and 0 == len(result):
-            result = dict(result='success', groups=[dict(name='No groups fetched in API response', rating='', range='')])
+            result = dict(result='success',
+                          groups=[dict(name='No groups fetched in API response', rating='', range='')])
         else:
             result = dict(result='success', groups=result)
         return json.dumps(result)
@@ -3330,8 +3364,16 @@ class HomeProcessMedia(Home):
                                           webhandler=None if '0' == stream else self.send_message)
             else:
 
+                cleanup = kwargs.get('cleanup') in ('on', '1')
                 if isinstance(dir_name, string_types):
                     dir_name = decode_str(dir_name)
+                    if 'auto' != process_type:
+                        sickbeard.PROCESS_LAST_DIR = dir_name
+                        sickbeard.PROCESS_LAST_METHOD = process_method
+                        if 'move' == process_method:
+                            sickbeard.PROCESS_LAST_CLEANUP = cleanup
+                        sickbeard.save_config()
+
                     if nzbget_call and isinstance(sickbeard.NZBGET_MAP, string_types) and sickbeard.NZBGET_MAP:
                         m = sickbeard.NZBGET_MAP.split('=')
                         dir_name, not_used = helpers.path_mapper(m[0], m[1], dir_name)
@@ -3339,7 +3381,7 @@ class HomeProcessMedia(Home):
                 result = processTV.processDir(dir_name if dir_name else None,
                                               None if not nzb_name else decode_str(nzb_name),
                                               process_method=process_method, pp_type=process_type,
-                                              cleanup=kwargs.get('cleanup') in ('on', '1'),
+                                              cleanup=cleanup,
                                               force=force in ('on', '1'),
                                               force_replace=force_replace in ('on', '1'),
                                               failed='0' != failed,
@@ -3394,10 +3436,6 @@ class AddShows(Home):
         return json.dumps({'results': result})
 
     @staticmethod
-    def sanitize_file_name(name):
-        return helpers.sanitize_filename(name)
-
-    @staticmethod
     def generate_show_dir_name(show_name):
         return helpers.generate_show_dir_name(None, show_name)
 
@@ -4454,6 +4492,176 @@ class AddShows(Home):
         if not filter_list(lambda tvid_prodid: helpers.find_show_by_id(tvid_prodid), ids.split(' ')):
             return self.new_show('|'.join(['', '', '', ids or show_name]), use_show_name=True)
 
+    def ne_default(self):
+
+        return self.redirect('/add-shows/%s' % ('ne_newpop', sickbeard.NE_MRU)[any(sickbeard.NE_MRU)])
+
+    def ne_newpop(self, **kwargs):
+        return self.browse_ne(
+            'hotshowsfilter', 'Popular recent premiered shows at Next Episode', mode='newpop', **kwargs)
+
+    def ne_newtop(self, **kwargs):
+        return self.browse_ne(
+            'hotshowsfilter', 'Top rated recent premiered shows at Next Episode', mode='newtop', **kwargs)
+
+    def ne_upcoming(self, **kwargs):
+        return self.browse_ne(
+            'upcomingshowsfilter', 'Upcoming shows at Next Episode', mode='upcoming', **kwargs)
+
+    def ne_trending(self, **kwargs):
+        return self.browse_ne(
+            'trendingshowsfilter', 'Trending shows at Next Episode', mode='trending', **kwargs)
+
+    def browse_ne(self, url_path, browse_title, **kwargs):
+
+        browse_type = 'Nextepisode'
+
+        footnote = None
+
+        page = 1
+        if 'more' in kwargs:
+            page = 2
+            kwargs['mode'] += '-more'
+
+        filtered = []
+
+        import browser_ua
+
+        when_past = True
+        if 'upcoming' in url_path:
+            when_past = False
+            url = '%s.php?t=1&s=1&inwl=0&user_id=' % url_path
+        elif 'trending' in url_path:
+            url = '%s.php?t=1&a=1&b=1&uid=&status=0&c=1' % url_path
+        else:
+            url = '%s.php?a=1&b=1&uid=0&status=0&c=2&sortOrder=%s' % (url_path, (0, 1)['Top' in browse_title])
+        url = 'https://next-episode.net/PAGES/misc/%s&g=6&channel=0&actors=0&page=%s' % (url, page)
+
+        html = helpers.get_url(url, headers={'User-Agent': browser_ua.get_ua()})
+        if html:
+            try:
+                if re.findall(r'(?i)(<a[^>]+gopage\([^>]+)', html)[0]:
+                    kwargs.update(dict(more=1))
+            except (BaseException, Exception):
+                pass
+
+            with BS4Parser(html) as soup:
+                shows = [] if not soup else soup.find_all(class_='list_item')
+                oldest, newest, oldest_dt, newest_dt = None, None, 9999999, 0
+                rc = [(k, re.compile(r'(?i).*?(\d+)\s*%s.*' % v)) for (k, v) in iteritems({
+                    'months': 'month', 'days': 'day', 'hours': 'hour', 'minutes': 'min'})]
+                rc_show = re.compile(r'^namelink_(\d+)$')
+                rc_title_clean = re.compile(r'(?i)(?:\s*\((?:19|20)\d{2}\))?$')
+                for row in shows:
+                    try:
+                        info_tag = row.find('a', id=rc_show)
+                        if not info_tag:
+                            continue
+
+                        ids = dict(custom=rc_show.findall(info_tag['id'])[0], name='ne')
+                        url_path = info_tag['href'].strip()
+
+                        images = {}
+                        img_uri = None
+                        img_tag = info_tag.find('img')
+                        if img_tag and isinstance(img_tag.attrs, dict):
+                            img_src = img_tag.attrs.get('src').strip()
+                            img_uri = img_src.startswith('//') and ('https:' + img_src) or img_src
+                            images = dict(poster=dict(thumb='imagecache?path=browse/thumb/ne&source=%s' % img_uri))
+                            sickbeard.CACHE_IMAGE_URL_LIST.add_url(img_uri)
+
+                        title = info_tag.get_text('strip=True')
+                        title = rc_title_clean.sub('', title.strip())
+
+                        channel_tag = row.find('span', class_='channel_name')
+
+                        network, date_info, dt = None, None, None
+                        channel_tag_copy = copy.copy(channel_tag)
+                        if channel_tag_copy:
+                            network = channel_tag_copy.a.extract().get_text(strip=True)
+                            date_info = re.sub(r'^[^\d]+', '', channel_tag_copy.get_text(strip=True))
+                            if date_info:
+                                dt = dateutil.parser.parse((date_info, '%s.01.01' % date_info)[4 == len(date_info)])
+
+                        if not when_past and channel_tag:
+                            tag = [t for t in channel_tag.next_siblings if hasattr(t, 'attrs')
+                                   and 'printed' in ' '.join(t.get('class', ''))]
+                            if len(tag):
+                                age_args = {}
+                                future = re.sub(r'[^\d]+(.*)', r'\1', tag[0].get_text(strip=True))
+                                for (dim, rcx) in rc:
+                                    value = helpers.try_int(rcx.sub(r'\1', future), None)
+                                    if value:
+                                        age_args.update({dim: value})
+
+                                if age_args:
+                                    dt = datetime.datetime.utcnow()
+                                    if 'months' in age_args and 'days' in age_args:
+                                        age_args['days'] -= 1
+                                        dt += relativedelta(day=1)
+                                    dt += relativedelta(**age_args)
+                                    date_info = SGDatetime.sbfdate(dt)
+
+                        dt_ordinal = 0
+                        dt_string = ''
+                        if date_info:
+                            dt_ordinal = dt.toordinal()
+                            dt_string = date_info
+                            if dt_ordinal < oldest_dt:
+                                oldest_dt = dt_ordinal
+                                oldest = dt_string
+                            if dt_ordinal > newest_dt:
+                                newest_dt = dt_ordinal
+                                newest = dt_string
+
+                        genres = row.find(class_='genre')
+                        if genres:
+                            genres = re.sub(r',([^\s])', r', \1', genres.get_text(strip=True))
+                        overview = row.find(class_='summary')
+                        if overview:
+                            overview = overview.get_text(strip=True)
+
+                        rating = None
+                        rating_tag = row.find(class_='rating')
+                        if rating_tag:
+                            label_tag = rating_tag.find('label')
+                            if label_tag:
+                                rating = re.sub(r'.*?width:\s*(\d+).*', r'\1', label_tag.get('style', ''))
+
+                        filtered.append(dict(
+                            premiered=dt_ordinal,
+                            premiered_str=dt_string,
+                            when_past=when_past,  # dt_ordinal < datetime.datetime.now().toordinal(),
+                            genres=('No genre yet' if not genres else genres),
+                            network=network or None,
+                            ids=ids,
+                            images='' if not img_uri else images,
+                            overview='No overview yet' if not overview else helpers.xhtml_escape(overview[:250:]),
+                            rating=(rating, 'TBD')[None is rating],
+                            title=title,
+                            url_src_db='https://next-episode.net/%s/' % url_path.strip('/'),
+                            votes=None))
+
+                    except (AttributeError, IndexError, KeyError, TypeError):
+                        continue
+
+                kwargs.update(dict(oldest=oldest, newest=newest))
+
+        kwargs.update(dict(footnote=footnote, use_votes=False))
+
+        mode = kwargs.get('mode', '')
+        if mode:
+            func = 'ne_%s' % mode
+            if callable(getattr(self, func, None)):
+                sickbeard.NE_MRU = func
+                sickbeard.save_config()
+        return self.browse_shows(browse_type, browse_title, filtered, **kwargs)
+
+    # noinspection PyUnusedLocal
+    def info_nextepisode(self, ids, show_name):
+
+        return self.new_show('|'.join(['', '', '', show_name]), use_show_name=True)
+
     def tvc_default(self):
 
         return self.redirect('/add-shows/%s' % ('tvc_newshows', sickbeard.TVC_MRU)[any(sickbeard.TVC_MRU)])
@@ -4664,6 +4872,7 @@ class AddShows(Home):
 
         return self.browse_shows(browse_type, browse_title, filtered, **kwargs)
 
+    # noinspection PyUnusedLocal
     def info_tvcalendar(self, ids, show_name):
 
         return self.new_show('|'.join(['', '', '', show_name]), use_show_name=True)
@@ -4802,6 +5011,7 @@ class AddShows(Home):
                 sickbeard.save_config()
         return self.browse_shows(browse_type, browse_title, filtered, **kwargs)
 
+    # noinspection PyUnusedLocal
     def info_metacritic(self, ids, show_name):
 
         return self.new_show('|'.join(['', '', '', show_name]), use_show_name=True)
@@ -4809,7 +5019,7 @@ class AddShows(Home):
     @staticmethod
     def browse_mru(browse_type, **kwargs):
         save_config = False
-        if browse_type in ('AniDB', 'IMDb', 'Metacritic', 'Trakt', 'TVCalendar'):
+        if browse_type in ('AniDB', 'IMDb', 'Metacritic', 'Trakt', 'TVCalendar', 'Nextepisode'):
             save_config = True
             sickbeard.BROWSELIST_MRU[browse_type] = dict(
                 showfilter=kwargs.get('showfilter', ''), showsort=kwargs.get('showsort', ''))
@@ -4939,12 +5149,13 @@ class AddShows(Home):
 
         return t.respond()
 
-    def add_new_show(self, which_series=None, tvinfo_lang='en', root_dir=None, default_status=None,
+    def add_new_show(self, root_dir=None, full_show_path=None, which_series=None, provided_tvid=None, tvinfo_lang='en',
+                     other_shows=None, skip_show=None,
                      quality_preset=None, any_qualities=None, best_qualities=None, upgrade_once=None,
-                     flatten_folders=None, subs=None,
-                     full_show_path=None, other_shows=None, skip_show=None, provided_tvid=None, anime=None,
-                     scene=None, allowlist=None, blocklist=None, wanted_begin=None, wanted_latest=None,
-                     prune=None, tag=None, return_to=None, cancel_form=None, **kwargs):
+                     wanted_begin=None, wanted_latest=None, tag=None,
+                     pause=None, prune=None, default_status=None, scene=None, subs=None, flatten_folders=None,
+                     anime=None, allowlist=None, blocklist=None,
+                     return_to=None, cancel_form=None, **kwargs):
         """
         Receive tvdb id, dir, and other options and create a show from them. If extra show dirs are
         provided then it forwards back to new_show, if not it goes to /home.
@@ -5021,26 +5232,14 @@ class AddShows(Home):
         if sickbeard.ADD_SHOWS_WO_DIR:
             logger.log(u'Skipping initial creation due to config.ini setting (add_shows_wo_dir)')
         else:
-            dir_exists = helpers.make_dir(show_dir)
-            if not dir_exists:
+            if not helpers.make_dir(show_dir):
                 logger.log(u'Unable to add show because can\'t create folder: ' + show_dir, logger.ERROR)
                 ui.notifications.error('Unable to add show', u'Can\'t create folder: ' + show_dir)
                 return self.redirect('/home/')
 
-            else:
-                helpers.chmod_as_parent(show_dir)
+            helpers.chmod_as_parent(show_dir)
 
         # prepare the inputs for passing along
-        scene = config.checkbox_to_value(scene)
-        anime = config.checkbox_to_value(anime)
-        flatten_folders = config.checkbox_to_value(flatten_folders)
-        subs = config.checkbox_to_value(subs)
-
-        if allowlist:
-            allowlist = short_group_names(allowlist)
-        if blocklist:
-            blocklist = short_group_names(blocklist)
-
         if not any_qualities:
             any_qualities = []
         if not best_qualities or int(quality_preset):
@@ -5049,19 +5248,33 @@ class AddShows(Home):
             any_qualities = [any_qualities]
         if type(best_qualities) != list:
             best_qualities = [best_qualities]
-        newQuality = Quality.combineQualities(map_list(int, any_qualities), map_list(int, best_qualities))
+        new_quality = Quality.combineQualities(map_list(int, any_qualities), map_list(int, best_qualities))
         upgrade_once = config.checkbox_to_value(upgrade_once)
 
         wanted_begin = config.minimax(wanted_begin, 0, -1, 10)
         wanted_latest = config.minimax(wanted_latest, 0, -1, 10)
         prune = config.minimax(prune, 0, 0, 9999)
 
+        pause = config.checkbox_to_value(pause)
+        scene = config.checkbox_to_value(scene)
+        subs = config.checkbox_to_value(subs)
+        flatten_folders = config.checkbox_to_value(flatten_folders)
+
+        anime = config.checkbox_to_value(anime)
+        if allowlist:
+            allowlist = short_group_names(allowlist)
+        if blocklist:
+            blocklist = short_group_names(blocklist)
+
         # add the show
-        sickbeard.show_queue_scheduler.action.addShow(tvid, prodid, show_dir, int(default_status), newQuality,
-                                                      flatten_folders, tvinfo_lang, subs, anime,
-                                                      scene, None, allowlist, blocklist,
-                                                      wanted_begin, wanted_latest, prune, tag, new_show=new_show,
-                                                      show_name=show_name, upgrade_once=upgrade_once)
+        sickbeard.show_queue_scheduler.action.add_show(
+            tvid, prodid, show_dir,
+            quality=new_quality, upgrade_once=upgrade_once,
+            wanted_begin=wanted_begin, wanted_latest=wanted_latest, tag=tag,
+            paused=pause, prune=prune, default_status=int(default_status), scene=scene, subtitles=subs,
+            flatten_folders=flatten_folders, anime=anime, allowlist=allowlist, blocklist=blocklist,
+            show_name=show_name, new_show=new_show, lang=tvinfo_lang
+        )
         # ui.notifications.message('Show added', 'Adding the specified show into ' + show_dir)
 
         return finish_add_show()
@@ -5127,14 +5340,14 @@ class AddShows(Home):
 
             if None is not tvid and None is not prodid:
                 # add the show
-                sickbeard.show_queue_scheduler.action.addShow(tvid, prodid, show_dir,
-                                                              default_status=sickbeard.STATUS_DEFAULT,
-                                                              quality=sickbeard.QUALITY_DEFAULT,
-                                                              flatten_folders=sickbeard.FLATTEN_FOLDERS_DEFAULT,
-                                                              subtitles=sickbeard.SUBTITLES_DEFAULT,
-                                                              anime=sickbeard.ANIME_DEFAULT,
-                                                              scene=sickbeard.SCENE_DEFAULT,
-                                                              show_name=show_name)
+                sickbeard.show_queue_scheduler.action.add_show(
+                    tvid, prodid, show_dir,
+                    quality=sickbeard.QUALITY_DEFAULT,
+                    paused=sickbeard.PAUSE_DEFAULT, default_status=sickbeard.STATUS_DEFAULT,
+                    scene=sickbeard.SCENE_DEFAULT, subtitles=sickbeard.SUBTITLES_DEFAULT,
+                    flatten_folders=sickbeard.FLATTEN_FOLDERS_DEFAULT, anime=sickbeard.ANIME_DEFAULT,
+                    show_name=show_name
+                )
                 num_added += 1
 
         if num_added:
@@ -5170,6 +5383,21 @@ class Manage(MainHandler):
     def index(self):
         t = PageTemplate(web_handler=self, file='manage.tmpl')
         t.submenu = self.manage_menu('Bulk')
+
+        t.has_any_sports = False
+        t.has_any_anime = False
+        t.has_any_flat_folders = False
+        t.shows = []
+        t.shows_no_loc = []
+        for cur_show_obj in sorted(sickbeard.showList, key=lambda _x: _x.name.lower()):
+            t.has_any_sports |= bool(cur_show_obj.sports)
+            t.has_any_anime |= bool(cur_show_obj.anime)
+            t.has_any_flat_folders |= bool(cur_show_obj.flatten_folders)
+            if not cur_show_obj.path:
+                t.shows_no_loc += [cur_show_obj]
+            else:
+                t.shows += [cur_show_obj]
+
         return t.respond()
 
     def get_status_episodes(self, tvid_prodid, which_status):
@@ -5469,7 +5697,7 @@ class Manage(MainHandler):
         my_db = db.DBConnection()
         # noinspection SqlResolve
         sql_result = my_db.select(
-            'SELECT tv_episodes.subtitles subtitles, show_name,'
+            'SELECT tv_episodes.subtitles as subtitles, show_name,'
             ' tv_shows.indexer AS tv_id, tv_shows.indexer_id AS prod_id'
             ' FROM tv_episodes, tv_shows'
             ' WHERE tv_shows.subtitles = 1'
@@ -5874,126 +6102,55 @@ class Manage(MainHandler):
 
         self.redirect('/manage/')
 
-    def bulk_change(self, to_update=None, to_refresh=None,
-                    to_rename=None, to_delete=None, to_remove=None,
-                    to_metadata=None, to_subtitle=None):
+    def bulk_change(self, to_update='', to_refresh='', to_rename='',
+                    to_subtitle='', to_delete='', to_remove='', **kwargs):
 
-        if None is not to_update:
-            to_update = to_update.split('|')
-        else:
-            to_update = []
+        to_change = dict({_tvid_prodid: helpers.find_show_by_id(_tvid_prodid)
+                          for _tvid_prodid in
+                          next(iter([_x.split('|') for _x in (to_update, to_refresh, to_rename, to_subtitle,
+                                                              to_delete, to_remove) if _x]), '')})
 
-        if None is not to_refresh:
-            to_refresh = to_refresh.split('|')
-        else:
-            to_refresh = []
-
-        if None is not to_rename:
-            to_rename = to_rename.split('|')
-        else:
-            to_rename = []
-
-        if None is not to_delete:
-            to_delete = to_delete.split('|')
-        else:
-            to_delete = []
-
-        if None is not to_remove:
-            to_remove = to_remove.split('|')
-        else:
-            to_remove = []
-
-        if None is not to_metadata:
-            to_metadata = to_metadata.split('|')
-        else:
-            to_metadata = []
-
-        if None is not to_subtitle:
-            to_subtitle = to_subtitle.split('|')
-        else:
-            to_subtitle = []
-
-        errors = []
-        updates = []
-        refreshes = []
-        renames = []
-        subs = []
-
-        for cur_tvid_prodid in set(to_update + to_refresh
-                                   + to_rename + to_delete + to_remove
-                                   + to_metadata + to_subtitle):
-
-            if '' == cur_tvid_prodid:
-                continue
-
-            show_obj = helpers.find_show_by_id(cur_tvid_prodid)
-
-            if None is show_obj:
-                continue
+        update, refresh, rename, subtitle, errors = [], [], [], [], []
+        for cur_tvid_prodid, cur_show_obj in iteritems(to_change):
 
             if cur_tvid_prodid in to_delete:
-                show_obj.delete_show(True)
-                # don't do anything else if it's being deleted
-                continue
+                cur_show_obj.delete_show(True)
 
-            if cur_tvid_prodid in to_remove:
-                show_obj.delete_show()
-                # don't do anything else if it's being remove
-                continue
+            elif cur_tvid_prodid in to_remove:
+                cur_show_obj.delete_show()
 
-            if cur_tvid_prodid in to_update:
-                try:
-                    sickbeard.show_queue_scheduler.action.updateShow(show_obj, True, True)
-                    updates.append(show_obj.name)
-                except exceptions_helper.CantUpdateException as e:
-                    errors.append('Unable to update show ' + show_obj.name + ': ' + ex(e))
-
-            # don't bother refreshing shows that were updated anyway
-            if cur_tvid_prodid in to_refresh and cur_tvid_prodid not in to_update:
-                try:
-                    sickbeard.show_queue_scheduler.action.refreshShow(show_obj)
-                    refreshes.append(show_obj.name)
-                except exceptions_helper.CantRefreshException as e:
-                    errors.append('Unable to refresh show ' + show_obj.name + ': ' + ex(e))
-
-            if cur_tvid_prodid in to_rename:
-                sickbeard.show_queue_scheduler.action.renameShowEpisodes(show_obj)
-                renames.append(show_obj.name)
-
-            if sickbeard.USE_SUBTITLES and cur_tvid_prodid in to_subtitle:
-                sickbeard.show_queue_scheduler.action.download_subtitles(show_obj)
-                subs.append(show_obj.name)
-
-        if 0 < len(errors):
-            ui.notifications.error('Errors encountered',
-                                   '<br >\n'.join(errors))
-
-        messageDetail = ''
-
-        if 0 < len(updates):
-            messageDetail += '<br /><b>Updates</b><br /><ul><li>'
-            messageDetail += '</li><li>'.join(updates)
-            messageDetail += '</li></ul>'
+            else:
+                if cur_tvid_prodid in to_update:
+                    try:
+                        sickbeard.show_queue_scheduler.action.updateShow(cur_show_obj, True, True)
+                        update.append(cur_show_obj.name)
+                    except exceptions_helper.CantUpdateException as e:
+                        errors.append('Unable to update show %s: %s' % (cur_show_obj.name, ex(e)))
 
-        if 0 < len(refreshes):
-            messageDetail += '<br /><b>Refreshes</b><br /><ul><li>'
-            messageDetail += '</li><li>'.join(refreshes)
-            messageDetail += '</li></ul>'
+                elif cur_tvid_prodid in to_refresh:
+                    try:
+                        sickbeard.show_queue_scheduler.action.refreshShow(cur_show_obj)
+                        refresh.append(cur_show_obj.name)
+                    except exceptions_helper.CantRefreshException as e:
+                        errors.append('Unable to refresh show %s: %s' % (cur_show_obj.name, ex(e)))
 
-        if 0 < len(renames):
-            messageDetail += '<br /><b>Renames</b><br /><ul><li>'
-            messageDetail += '</li><li>'.join(renames)
-            messageDetail += '</li></ul>'
+                if cur_tvid_prodid in to_rename:
+                    sickbeard.show_queue_scheduler.action.renameShowEpisodes(cur_show_obj)
+                    rename.append(cur_show_obj.name)
 
-        if 0 < len(subs):
-            messageDetail += '<br /><b>Subtitles</b><br /><ul><li>'
-            messageDetail += '</li><li>'.join(subs)
-            messageDetail += '</li></ul>'
+                if sickbeard.USE_SUBTITLES and cur_tvid_prodid in to_subtitle:
+                    sickbeard.show_queue_scheduler.action.download_subtitles(cur_show_obj)
+                    subtitle.append(cur_show_obj.name)
 
-        if 0 < len(updates + refreshes + renames + subs):
-            ui.notifications.message('The following actions were queued:',
-                                     messageDetail)
+        if len(errors):
+            ui.notifications.error('Errors encountered', '<br>\n'.join(errors))
 
+        if len(update + refresh + rename + subtitle):
+            ui.notifications.message(
+                'Queued the following actions:',
+                ''.join(['%s:<br>* %s<br>' % (_to_do, '<br>'.join(_shows))
+                         for (_to_do, _shows) in (('Updates', update), ('Refreshes', refresh),
+                                                  ('Renames', rename), ('Subtitles', subtitle)) if len(_shows)]))
         self.redirect('/manage/')
 
     def failed_downloads(self, limit=100, to_remove=None):
@@ -6180,10 +6337,10 @@ class History(MainHandler):
         for item in history_compact:
             if item.get('tvid_prodid') not in dedupe:
                 dedupe.add(item.get('tvid_prodid'))
+                item['show_name'] = abbr_showname(item['show_name'])
                 result += [item]
                 if limit == len(result):
                     break
-
         return result
 
     @classmethod
@@ -6358,24 +6515,25 @@ class History(MainHandler):
                                            key=lambda y: y.get('next_try') or datetime.timedelta(weeks=65535),
                                            reverse=False)
 
-            def img(item, as_class=False):
+            def img(_item, as_class=False):
                 # type: (AnyStr, bool) -> Optional[AnyStr]
                 """
                 Return an image src, image class, or None based on a recognised identifier
 
-                :param item: to search for a known domain identifier
+                :param _item: to search for a known domain identifier
                 :param as_class: wether a search should return an image (by default) or class
                 :return: image src, image class, or None if unknown identifier
                 """
                 for identifier, result in (
                     (('fanart', 'fanart.png'), ('imdb', 'imdb16.png'), ('metac', 'metac16.png'),
+                     ('next-episode', 'nextepisode16.png'),
                      ('predb', 'predb16.png'), ('srrdb', 'srrdb16.png'),
                      ('thexem', 'xem.png'), ('tmdb', 'tmdb16.png'), ('trakt', 'trakt16.png'),
                      ('tvdb', 'thetvdb16.png'), ('tvmaze', 'tvmaze16.png')),
                     (('anidb', 'img-anime-16 square-16'), ('github', 'icon16-github'),
                      ('emby', 'sgicon-emby'), ('plex', 'sgicon-plex'))
                 )[as_class]:
-                    if identifier in item:
+                    if identifier in _item:
                         return result
 
             with sg_helpers.DOMAIN_FAILURES.lock:
@@ -6781,6 +6939,21 @@ class Config(MainHandler):
         except (BaseException, Exception):
             t.version = ''
 
+        current_file = zoneinfo.ZONEFILENAME
+        t.tz_fallback = False
+        t.tz_version = None
+        try:
+            if None is not current_file:
+                current_file = ek.ek(os.path.basename, current_file)
+                zonefile = real_path(ek.ek(os.path.join, sickbeard.ZONEINFO_DIR, current_file))
+                if not ek.ek(os.path.isfile, zonefile):
+                    t.tz_fallback = True
+                    zonefile = ek.ek(os.path.join, ek.ek(os.path.dirname, zoneinfo.__file__), current_file)
+                if ek.ek(os.path.isfile, zonefile):
+                    t.tz_version = zoneinfo.ZoneInfoFile(zoneinfo.getzoneinfofile_stream()).metadata['tzversion']
+        except (BaseException, Exception):
+            pass
+
         t.backup_db_path = sickbeard.BACKUP_DB_MAX_COUNT and \
             (sickbeard.BACKUP_DB_PATH or ek.ek(os.path.join, sickbeard.DATA_DIR, 'backup')) or 'Disabled'
 
@@ -6813,8 +6986,6 @@ class ConfigGeneral(Config):
     def export_alt(tvid_prodid=None):
         """ Return alternative release names and numbering as json text"""
 
-        alts = {}
-
         # alternative release names and numbers
         alt_names = scene_exceptions.get_all_scene_exceptions(tvid_prodid)
         alt_numbers = get_scene_numbering_for_show(*TVidProdid(tvid_prodid).tuple)  # arbitrary order
@@ -6911,21 +7082,22 @@ class ConfigGeneral(Config):
     @staticmethod
     def save_add_show_defaults(default_status, any_qualities='', best_qualities='', default_wanted_begin=None,
                                default_wanted_latest=None, default_flatten_folders=False, default_scene=False,
-                               default_subtitles=False, default_anime=False, default_tag=''):
+                               default_subs=False, default_anime=False, default_pause=False, default_tag=''):
 
         any_qualities = ([], any_qualities.split(','))[any(any_qualities)]
         best_qualities = ([], best_qualities.split(','))[any(best_qualities)]
 
-        sickbeard.STATUS_DEFAULT = int(default_status)
         sickbeard.QUALITY_DEFAULT = int(Quality.combineQualities(map_list(int, any_qualities),
                                                                  map_list(int, best_qualities)))
         sickbeard.WANTED_BEGIN_DEFAULT = config.minimax(default_wanted_begin, 0, -1, 10)
         sickbeard.WANTED_LATEST_DEFAULT = config.minimax(default_wanted_latest, 0, -1, 10)
-        sickbeard.FLATTEN_FOLDERS_DEFAULT = config.checkbox_to_value(default_flatten_folders)
+        sickbeard.SHOW_TAG_DEFAULT = default_tag
+        sickbeard.PAUSE_DEFAULT = config.checkbox_to_value(default_pause)
+        sickbeard.STATUS_DEFAULT = int(default_status)
         sickbeard.SCENE_DEFAULT = config.checkbox_to_value(default_scene)
-        sickbeard.SUBTITLES_DEFAULT = config.checkbox_to_value(default_subtitles)
+        sickbeard.SUBTITLES_DEFAULT = config.checkbox_to_value(default_subs)
+        sickbeard.FLATTEN_FOLDERS_DEFAULT = config.checkbox_to_value(default_flatten_folders)
         sickbeard.ANIME_DEFAULT = config.checkbox_to_value(default_anime)
-        sickbeard.SHOW_TAG_DEFAULT = default_tag
 
         sickbeard.save_config()
 
@@ -6999,8 +7171,10 @@ class ConfigGeneral(Config):
                      log_dir=None, web_log=None,
                      indexer_default=None, indexer_timeout=None,
                      show_dirs_with_dots=None,
-                     version_notify=None, auto_update=None, update_interval=None, notify_on_update=None,
-                     update_frequency=None,
+                     update_notify=None, update_auto=None, update_interval=None, notify_on_update=None,
+                     update_packages_notify=None, update_packages_auto=None, update_packages_menu=None,
+                     update_packages_interval=None,
+                     update_frequency=None,  # deprecated 2020.11.07
                      theme_name=None, default_home=None, fanart_limit=None, showlist_tagview=None, show_tags=None,
                      home_search_focus=None, use_imdb_info=None, display_freespace=None, sort_article=None,
                      fuzzy_dating=None, trim_zero=None, date_preset=None, time_preset=None,
@@ -7014,7 +7188,7 @@ class ConfigGeneral(Config):
                      git_path=None, cpu_preset=None, anon_redirect=None, encryption_version=None,
                      proxy_setting=None, proxy_indexers=None, file_logging_preset=None, backup_db_oneday=None):
 
-        # prevent deprecated var issues from existing ui, delete in future, added 2020.11.07
+        # 2020.11.07 prevent deprecated var issues from existing ui, delete in future, added
         if None is update_interval and None is not update_frequency:
             update_interval = update_frequency
 
@@ -7043,11 +7217,16 @@ class ConfigGeneral(Config):
         sickbeard.SHOW_DIRS_WITH_DOTS = config.checkbox_to_value(show_dirs_with_dots)
 
         # Updates
-        config.schedule_version_notify(config.checkbox_to_value(version_notify))
-        sickbeard.AUTO_UPDATE = config.checkbox_to_value(auto_update)
-        config.schedule_update(update_interval)
+        config.schedule_update_software_notify(config.checkbox_to_value(update_notify))
+        sickbeard.UPDATE_AUTO = config.checkbox_to_value(update_auto)
+        config.schedule_update_software(update_interval)
         sickbeard.NOTIFY_ON_UPDATE = config.checkbox_to_value(notify_on_update)
 
+        config.schedule_update_packages_notify(config.checkbox_to_value(update_packages_notify))
+        sickbeard.UPDATE_PACKAGES_AUTO = config.checkbox_to_value(update_packages_auto)
+        sickbeard.UPDATE_PACKAGES_MENU = config.checkbox_to_value(update_packages_menu)
+        config.schedule_update_packages(update_packages_interval)
+
         # Interface
         sickbeard.THEME_NAME = theme_name
         sickbeard.DEFAULT_HOME = default_home
@@ -7136,7 +7315,7 @@ class ConfigGeneral(Config):
             for v in results:
                 logger.log(v, logger.ERROR)
             ui.notifications.error('Error(s) Saving Configuration',
-                                   '<br />\n'.join(results))
+                                   '<br>\n'.join(results))
         else:
             ui.notifications.message('Configuration Saved', ek.ek(os.path.join, sickbeard.CONFIG_FILE))
 
@@ -7155,7 +7334,7 @@ class ConfigGeneral(Config):
             return json.dumps({'result': 'success', 'pulls': []})
         else:
             try:
-                pulls = sickbeard.version_check_scheduler.action.list_remote_pulls()
+                pulls = sickbeard.update_software_scheduler.action.list_remote_pulls()
                 return json.dumps({'result': 'success', 'pulls': pulls})
             except (BaseException, Exception) as e:
                 logger.log(u'exception msg: ' + ex(e), logger.DEBUG)
@@ -7164,7 +7343,7 @@ class ConfigGeneral(Config):
     @staticmethod
     def fetch_branches():
         try:
-            branches = sickbeard.version_check_scheduler.action.list_remote_branches()
+            branches = sickbeard.update_software_scheduler.action.list_remote_branches()
             return json.dumps({'result': 'success', 'branches': branches, 'current': sickbeard.BRANCH or 'master'})
         except (BaseException, Exception) as e:
             logger.log(u'exception msg: ' + ex(e), logger.DEBUG)
@@ -7306,7 +7485,7 @@ class ConfigSearch(Config):
             for x in results:
                 logger.log(x, logger.ERROR)
             ui.notifications.error('Error(s) Saving Configuration',
-                                   '<br />\n'.join(results))
+                                   '<br>\n'.join(results))
         else:
             ui.notifications.message('Configuration Saved', ek.ek(os.path.join, sickbeard.CONFIG_FILE))
 
@@ -7433,7 +7612,7 @@ class ConfigMediaProcess(Config):
             for x in results:
                 logger.log(x, logger.ERROR)
             ui.notifications.error('Error(s) Saving Configuration',
-                                   '<br />\n'.join(results))
+                                   '<br>\n'.join(results))
         else:
             ui.notifications.message('Configuration Saved', ek.ek(os.path.join, sickbeard.CONFIG_FILE))
 
@@ -7499,7 +7678,7 @@ class ConfigMediaProcess(Config):
             if 'win32' == sys.platform:
                 rarfile.UNRAR_TOOL = ek.ek(os.path.join, sickbeard.PROG_DIR, 'lib', 'rarfile', 'UnRAR.exe')
             rar_path = ek.ek(os.path.join, sickbeard.PROG_DIR, 'lib', 'rarfile', 'test.rar')
-            if 'This is only a test.' == decode_str(rarfile.RarFile(rar_path).read(r'test\test.txt')):
+            if 'This is only a test.' == decode_str(rarfile.RarFile(rar_path).read(r'test/test.txt')):
                 return 'supported'
             msg = 'Could not read test file content'
         except (BaseException, Exception) as e:
@@ -7529,7 +7708,7 @@ class ConfigProviders(Config):
         temp_provider = newznab.NewznabProvider(name, config.clean_url(url))
 
         e_p = provider_dict.get(sickbeard.providers.generic_provider_name(temp_provider.get_id()), None) or \
-              provider_url_dict.get(sickbeard.providers.generic_provider_url(temp_provider.url), None)
+            provider_url_dict.get(sickbeard.providers.generic_provider_url(temp_provider.url), None)
 
         if e_p:
             return json.dumps({'error': 'Provider already exists as %s' % e_p.name})
@@ -7537,29 +7716,6 @@ class ConfigProviders(Config):
         return json.dumps({'success': temp_provider.get_id()})
 
     @staticmethod
-    def save_newznab_provider(name, url, key=''):
-        if not name or not url:
-            return '0'
-
-        providerDict = dict(zip([x.name for x in sickbeard.newznabProviderList], sickbeard.newznabProviderList))
-
-        if name in providerDict:
-            if not providerDict[name].default:
-                providerDict[name].name = name
-                providerDict[name].url = config.clean_url(url)
-
-            providerDict[name].key = key
-            # a 0 in the key spot indicates that no key is needed
-            providerDict[name].needs_auth = '0' != key
-
-            return providerDict[name].get_id() + '|' + providerDict[name].config_str()
-
-        else:
-            newProvider = newznab.NewznabProvider(name, url, key=key)
-            sickbeard.newznabProviderList.append(newProvider)
-            return newProvider.get_id() + '|' + newProvider.config_str()
-
-    @staticmethod
     def get_newznab_categories(name, url, key):
         """
         Retrieves a list of possible categories with category id's
@@ -7587,21 +7743,6 @@ class ConfigProviders(Config):
         return json.dumps({'success': True, 'tv_categories': tv_categories, 'state': state, 'error': ''})
 
     @staticmethod
-    def delete_newznab_provider(nnid):
-        providerDict = dict(zip([x.get_id() for x in sickbeard.newznabProviderList], sickbeard.newznabProviderList))
-
-        if nnid not in providerDict or providerDict[nnid].default:
-            return '0'
-
-        # delete it from the list
-        sickbeard.newznabProviderList.remove(providerDict[nnid])
-
-        if nnid in sickbeard.PROVIDER_ORDER:
-            sickbeard.PROVIDER_ORDER.remove(nnid)
-
-        return '1'
-
-    @staticmethod
     def can_add_torrent_rss_provider(name, url, cookies):
         if not name:
             return json.dumps({'error': 'Invalid name specified'})
@@ -7621,42 +7762,6 @@ class ConfigProviders(Config):
             return json.dumps({'error': errMsg})
 
     @staticmethod
-    def save_torrent_rss_provider(name, url, cookies):
-        if not name or not url:
-            return '0'
-
-        providerDict = dict(zip([x.name for x in sickbeard.torrentRssProviderList], sickbeard.torrentRssProviderList))
-
-        if name in providerDict:
-            providerDict[name].name = name
-            providerDict[name].url = config.clean_url(url)
-            providerDict[name].cookies = cookies
-
-            return providerDict[name].get_id() + '|' + providerDict[name].config_str()
-
-        else:
-            newProvider = rsstorrent.TorrentRssProvider(name, url, cookies)
-            sickbeard.torrentRssProviderList.append(newProvider)
-            return newProvider.get_id() + '|' + newProvider.config_str()
-
-    @staticmethod
-    def delete_torrent_rss_provider(provider_id):
-
-        providerDict = dict(
-            zip([x.get_id() for x in sickbeard.torrentRssProviderList], sickbeard.torrentRssProviderList))
-
-        if provider_id not in providerDict:
-            return '0'
-
-        # delete it from the list
-        sickbeard.torrentRssProviderList.remove(providerDict[provider_id])
-
-        if provider_id in sickbeard.PROVIDER_ORDER:
-            sickbeard.PROVIDER_ORDER.remove(provider_id)
-
-        return '1'
-
-    @staticmethod
     def check_providers_ping():
         for p in sickbeard.providers.sortedProviderList():
             if getattr(p, 'ping_iv', None):
@@ -7833,7 +7938,7 @@ class ConfigProviders(Config):
 
         # update torrent source settings
         for torrent_src in [src for src in sickbeard.providers.sortedProviderList()
-                            if sickbeard.GenericProvider.TORRENT == src.providerType]:
+                            if sickbeard.GenericProvider.TORRENT == src.providerType]:  # type: TorrentProvider
             src_id_prefix = torrent_src.get_id() + '_'
 
             attr = 'url_edit'
@@ -7860,9 +7965,9 @@ class ConfigProviders(Config):
                 setattr(torrent_src, attr, config.to_int(str(kwargs.get(src_id_prefix + attr, '')).strip()))
 
             attr = 'filter'
-            if hasattr(torrent_src, attr):
+            if hasattr(torrent_src, attr) and torrent_src.may_filter:
                 setattr(torrent_src, attr,
-                        [k for k in torrent_src.may_filter
+                        [k for k in getattr(torrent_src, 'may_filter', 'nop')
                          if config.checkbox_to_value(kwargs.get('%sfilter_%s' % (src_id_prefix, k)))])
 
             for attr in filter_iter(lambda a: hasattr(torrent_src, a), [
@@ -7883,8 +7988,7 @@ class ConfigProviders(Config):
                         sickbeard.GenericProvider.NZB == src.providerType]:
             src_id_prefix = nzb_src.get_id() + '_'
 
-            attr = 'api_key'
-            if hasattr(nzb_src, attr):
+            for attr in [x for x in ['api_key', 'digest'] if hasattr(nzb_src, x)]:
                 key = str(kwargs.get(src_id_prefix + attr, '')).strip()
                 if not starify(key, True):
                     setattr(nzb_src, attr, key)
@@ -7921,7 +8025,7 @@ class ConfigProviders(Config):
         if 0 < len(results):
             for x in results:
                 logger.log(x, logger.ERROR)
-            ui.notifications.error('Error(s) Saving Configuration', '<br />\n'.join(results))
+            ui.notifications.error('Error(s) Saving Configuration', '<br>\n'.join(results))
         else:
             ui.notifications.message('Configuration Saved', ek.ek(os.path.join, sickbeard.CONFIG_FILE))
 
@@ -8189,7 +8293,7 @@ class ConfigNotifications(Config):
             for x in results:
                 logger.log(x, logger.ERROR)
             ui.notifications.error('Error(s) Saving Configuration',
-                                   '<br />\n'.join(results))
+                                   '<br>\n'.join(results))
         else:
             ui.notifications.message('Configuration Saved', ek.ek(os.path.join, sickbeard.CONFIG_FILE))
 
@@ -8244,7 +8348,7 @@ class ConfigSubtitles(Config):
             for x in results:
                 logger.log(x, logger.ERROR)
             ui.notifications.error('Error(s) Saving Configuration',
-                                   '<br />\n'.join(results))
+                                   '<br>\n'.join(results))
         else:
             ui.notifications.message('Configuration Saved', ek.ek(os.path.join, sickbeard.CONFIG_FILE))
 
@@ -8277,7 +8381,7 @@ class ConfigAnime(Config):
             for x in results:
                 logger.log(x, logger.ERROR)
             ui.notifications.error('Error(s) Saving Configuration',
-                                   '<br />\n'.join(results))
+                                   '<br>\n'.join(results))
         else:
             ui.notifications.message('Configuration Saved', ek.ek(os.path.join, sickbeard.CONFIG_FILE))
 
@@ -8393,7 +8497,7 @@ class EventLogs(MainHandler):
                             final_data += ['<code><span class="prelight">'] + \
                                           ['<span class="prelight-num">%02s)</span> %s' % (n + 1, x)
                                            for n, x in enumerate(normal_data[::-1])] + \
-                                          ['</span></code><br />']
+                                          ['</span></code><br>']
                             num_lines += len(normal_data)
                             normal_data = []
 
diff --git a/sickgear.py b/sickgear.py
index 20e3afe..d11c433 100755
--- a/sickgear.py
+++ b/sickgear.py
@@ -23,7 +23,6 @@ import codecs
 import datetime
 import errno
 import getopt
-import locale
 import os
 import signal
 import sys
@@ -48,6 +47,9 @@ if not any(list(map(lambda v: v[0] <= sys.version_info[:3] <= v[1], versions)))
         lambda r: '%s - %s' % tuple(map(lambda v: str(v).replace(',', '.')[1:-1], r)), versions)))
     sys.exit(1)
 
+sys.path.insert(1, os.path.abspath(os.path.join(os.path.dirname(__file__), 'lib')))
+is_win = 'win' == sys.platform[0:3]
+
 try:
     try:
         py_cache_path = os.path.normpath(os.path.join(os.path.dirname(__file__), '__pycache__'))
@@ -60,31 +62,34 @@ try:
     except (BaseException, Exception):
         pass
     import _cleaner
+    from sickbeard import piper
 except (BaseException, Exception):
     pass
 
 try:
     import Cheetah
-
-    if Cheetah.Version[0] < '2':
-        raise ValueError
-except ValueError:
-    print('Sorry, requires Python module Cheetah 2.1.0 or newer.')
-    sys.exit(1)
 except (BaseException, Exception):
     print('The Python module Cheetah is required')
+    if is_win:
+        print('(1) However, this first run may have just installed it, so try to simply rerun sickgear.py again')
+        print('(2) If this output is a rerun of (1) then open a command line prompt and manually install using...')
+    else:
+        print('Manually install using...')
+    print('cd <sickgear_installed_folder>')
+    print('python -m pip install --user -r requirements.txt')
+    print('python sickgear.py')
     sys.exit(1)
 
 # Compatibility fixes for Windows
-if 'win32' == sys.platform:
+if is_win:
     codecs.register(lambda name: codecs.lookup('utf-8') if name == 'cp65001' else None)
 
 # We only need this for compiling an EXE
 from multiprocessing import freeze_support
 
-sys.path.insert(1, os.path.abspath(os.path.join(os.path.dirname(__file__), 'lib')))
-
 from configobj import ConfigObj
+# noinspection PyPep8Naming
+from encodingKludge import EXIT_BAD_ENCODING, SYS_ENCODING
 from exceptions_helper import ex
 import sickbeard
 from sickbeard import db, logger, name_cache, network_timezones
@@ -92,12 +97,12 @@ from sickbeard.event_queue import Events
 from sickbeard.tv import TVShow
 from sickbeard.webserveInit import WebServer
 
-from six import integer_types, moves, PY2
+from six import integer_types
 
 throwaway = datetime.datetime.strptime('20110101', '%Y%m%d')
 rollback_loaded = None
 
-for signal_type in [signal.SIGTERM, signal.SIGINT] + ([] if 'win32' != sys.platform else [signal.SIGBREAK]):
+for signal_type in [signal.SIGTERM, signal.SIGINT] + ([] if not is_win else [signal.SIGBREAK]):
     signal.signal(signal_type, lambda signum, void: sickbeard.sig_handler(signum=signum, _=void))
 
 
@@ -130,6 +135,7 @@ class SickGear(object):
         """
         print help message for commandline options
         """
+        global is_win
         help_msg = ['']
         help_msg += ['Usage: %s <option> <another option>\n' % sickbeard.MY_FULLNAME]
         help_msg += ['Options:\n']
@@ -143,7 +149,7 @@ class SickGear(object):
         ]:
             help_msg += [help_tmpl % ln]
 
-        if 'win32' == sys.platform:
+        if is_win:
             for ln in [
                 ('-d', '--daemon', 'Running as daemon is not supported on Windows'),
                 ('', '', 'On Windows, --daemon is substituted with: --quiet --nolaunch')
@@ -187,51 +193,29 @@ class SickGear(object):
             pass
 
     def start(self):
+        global is_win
         # do some preliminary stuff
         sickbeard.MY_FULLNAME = os.path.normpath(os.path.abspath(__file__))
         sickbeard.MY_NAME = os.path.basename(sickbeard.MY_FULLNAME)
         sickbeard.PROG_DIR = os.path.dirname(sickbeard.MY_FULLNAME)
         sickbeard.DATA_DIR = sickbeard.PROG_DIR
         sickbeard.MY_ARGS = sys.argv[1:]
-        sickbeard.SYS_ENCODING = None
-
-        try:
-            locale.setlocale(locale.LC_ALL, '')
-        except (locale.Error, IOError):
-            pass
-        try:
-            sickbeard.SYS_ENCODING = locale.getpreferredencoding()
-        except (locale.Error, IOError):
-            pass
-
-        # For OSes that are poorly configured I'll just randomly force UTF-8
-        if not sickbeard.SYS_ENCODING or sickbeard.SYS_ENCODING in ('ANSI_X3.4-1968', 'US-ASCII', 'ASCII'):
-            sickbeard.SYS_ENCODING = 'UTF-8'
-
-        if not hasattr(sys, 'setdefaultencoding'):
-            moves.reload_module(sys)
-
-        if PY2:
-            try:
-                # On non-unicode builds this raises an AttributeError,
-                # if encoding type is not valid it throws a LookupError
-                # noinspection PyUnresolvedReferences
-                sys.setdefaultencoding(sickbeard.SYS_ENCODING)
-            except (BaseException, Exception):
-                print('Sorry, you MUST add the SickGear folder to the PYTHONPATH environment variable')
-                print('or find another way to force Python to use %s for string encoding.' % sickbeard.SYS_ENCODING)
-                sys.exit(1)
+        if EXIT_BAD_ENCODING:
+            print('Sorry, you MUST add the SickGear folder to the PYTHONPATH environment variable')
+            print('or find another way to force Python to use %s for string encoding.' % SYS_ENCODING)
+            sys.exit(1)
+        sickbeard.SYS_ENCODING = SYS_ENCODING
 
         # Need console logging for sickgear.py and SickBeard-console.exe
         self.console_logging = (not hasattr(sys, 'frozen')) or (0 < sickbeard.MY_NAME.lower().find('-console'))
 
         # Rename the main thread
-        threading.currentThread().name = 'MAIN'
+        threading.current_thread().name = 'MAIN'
 
         try:
             opts, args = getopt.getopt(sys.argv[1:], 'hfqdsp::',
                                        ['help', 'forceupdate', 'quiet', 'nolaunch', 'daemon', 'systemd', 'pidfile=',
-                                        'port=', 'datadir=', 'config=', 'noresize'])
+                                        'port=', 'datadir=', 'config=', 'noresize', 'update-restart', 'update-pkg'])
         except getopt.GetoptError:
             sys.exit(self.help_message())
 
@@ -268,11 +252,11 @@ class SickGear(object):
                 self.console_logging = False
                 self.no_launch = True
 
-                if 'win32' == sys.platform:
+                if is_win:
                     self.run_as_daemon = False
 
             # Run as a systemd service
-            if o in ('-s', '--systemd') and 'win32' != sys.platform:
+            if o in ('-s', '--systemd') and not is_win:
                 self.run_as_systemd = True
                 self.run_as_daemon = False
                 self.console_logging = False
@@ -430,6 +414,9 @@ class SickGear(object):
         if sickbeard.LAUNCH_BROWSER and not self.no_launch:
             sickbeard.launch_browser(self.start_port)
 
+        # send pid of sg instance to ui
+        sickbeard.classes.loading_msg.set_msg_progress('Process-id', sickbeard.PID)
+
         # check all db versions
         for d, min_v, max_v, base_v, mo in [
             ('failed.db', sickbeard.failed_db.MIN_DB_VERSION, sickbeard.failed_db.MAX_DB_VERSION,
@@ -516,19 +503,44 @@ class SickGear(object):
             else:
                 logger.log_error_and_exit(u'Restore FAILED!')
 
-        # Build from the DB to start with
-        sickbeard.classes.loading_msg.message = 'Loading shows from db'
-        self.load_shows_from_db()
-        if not db.DBConnection().has_flag('ignore_require_cleaned'):
-            from sickbeard.show_updater import clean_ignore_require_words
-            sickbeard.classes.loading_msg.message = 'Cleaning ignore/require words lists'
-            clean_ignore_require_words()
-            db.DBConnection().set_flag('ignore_require_cleaned')
-
-        # Fire up all our threads
+        update_arg = '--update-restart'
+        manual_update_arg = '--update-pkg'
+        if update_arg not in sickbeard.MY_ARGS and sickbeard.UPDATES_TODO \
+                and (manual_update_arg in sickbeard.MY_ARGS or sickbeard.UPDATE_PACKAGES_AUTO):
+            sickbeard.MEMCACHE['update_restart'] = piper.pip_update(
+                sickbeard.classes.loading_msg, sickbeard.UPDATES_TODO, sickbeard.DATA_DIR)
+            sickbeard.UPDATES_TODO = dict()
+            sickbeard.save_config()
+
+        if manual_update_arg in sickbeard.MY_ARGS:
+            sickbeard.MY_ARGS.remove(manual_update_arg)
+
+        if not sickbeard.MEMCACHE.get('update_restart'):
+            # Build from the DB to start with
+            sickbeard.classes.loading_msg.message = 'Loading shows from db'
+            self.load_shows_from_db()
+            if not db.DBConnection().has_flag('ignore_require_cleaned'):
+                from sickbeard.show_updater import clean_ignore_require_words
+                sickbeard.classes.loading_msg.message = 'Cleaning ignore/require words lists'
+                clean_ignore_require_words()
+                db.DBConnection().set_flag('ignore_require_cleaned')
+
+        # Fire up threads
         sickbeard.classes.loading_msg.message = 'Starting threads'
         sickbeard.start()
 
+        if sickbeard.MEMCACHE.get('update_restart'):
+            sickbeard.MY_ARGS.append(update_arg)
+            sickbeard.classes.loading_msg.message = 'Restarting SickGear after update'
+            time.sleep(3)
+            sickbeard.restart(soft=False)
+            # restart wait loop
+            while True:
+                time.sleep(1)
+
+        if update_arg in sickbeard.MY_ARGS:
+            sickbeard.MY_ARGS.remove(update_arg)
+
         # Build internal name cache
         sickbeard.classes.loading_msg.message = 'Build name cache'
         name_cache.buildNameCache()
@@ -539,7 +551,7 @@ class SickGear(object):
 
         # load all ids from xem
         sickbeard.classes.loading_msg.message = 'Loading xem data'
-        startup_background_tasks = threading.Thread(name='FETCH-XEMDATA', target=sickbeard.scene_exceptions.get_xem_ids)
+        startup_background_tasks = threading.Thread(name='XEMUPDATER', target=sickbeard.scene_exceptions.get_xem_ids)
         startup_background_tasks.start()
 
         sickbeard.classes.loading_msg.message = 'Checking history'
@@ -688,11 +700,9 @@ class SickGear(object):
 
             if sickbeard.events.SystemEvent.RESTART == ev_type:
 
-                install_type = sickbeard.version_check_scheduler.action.install_type
-
                 popen_list = []
 
-                if install_type in ('git', 'source'):
+                if sickbeard.update_software_scheduler.action.install_type in ('git', 'source'):
                     popen_list = [sys.executable, sickbeard.MY_FULLNAME]
 
                 if popen_list: