From 73436a543c135d80850847b9571e653052769aab Mon Sep 17 00:00:00 2001
From: Jacopo De Simoi <jacopods@protonmail.com>
Date: Mon, 8 Jun 2026 09:43:41 -0400
Subject: [PATCH] [htop] Update patches to 3.5.1

---
 ...he-separator-between-columns-larger.patch} |  14 +--
 .../htop/0002-Pad-core-id-with-0s.patch       |   8 +-
 .../0003-Use-filled-square-for-bar-char.patch |   8 +-
 ...cent-color-for-key-and-add-separator.patch |  14 +--
 .../0005-Shorten-labels-in-function-bar.patch |   6 +-
 sys-process/htop/0006-Add-separators.patch    |  36 +++---
 ...-Use-proper-glyphs-to-denote-sorting.patch |   8 +-
 .../0008-Use-accent-color-for-labels.patch    |   8 +-
 ...d-attribute-broken-on-solarized-like.patch |   8 +-
 .../0010-Introduce-highlighted-pairs.patch    |  12 +-
 .../htop/0011-Remove-Bar-borders.patch        |  44 ++++----
 .../0012-Implement-highlight-methods.patch    |  18 +--
 ...0013-Implement-rudimentary-separator.patch |  24 ++--
 .../htop/0014-Put-Kernel-CPU-first.patch      |   6 +-
 ...Avoid-bold-in-solarized-based-themes.patch |  12 +-
 ...ghlighted-background-for-unfocused-s.patch |   8 +-
 .../htop/0017-Put-margin-in-each-column.patch |  46 ++++----
 ...8-Use-regular-highlight-if-unfocused.patch |   8 +-
 ...019-Better-spacing-for-sorted-column.patch |   8 +-
 ...t-does-not-fit-on-my-terminal-anyway.patch |   8 +-
 .../htop/0021-Remove-from-captions.patch      | 104 +++++++++---------
 ...ke-ultra-long-separator-just-in-case.patch |   8 +-
 22 files changed, 200 insertions(+), 216 deletions(-)
 rename sys-process/htop/{0001-Make-the-separator-larger.patch => 0001-Make-the-separator-between-columns-larger.patch} (79%)

diff --git a/sys-process/htop/0001-Make-the-separator-larger.patch b/sys-process/htop/0001-Make-the-separator-between-columns-larger.patch
similarity index 79%
rename from sys-process/htop/0001-Make-the-separator-larger.patch
rename to sys-process/htop/0001-Make-the-separator-between-columns-larger.patch
index 3182c54..d885c33 100644
--- a/sys-process/htop/0001-Make-the-separator-larger.patch
+++ b/sys-process/htop/0001-Make-the-separator-between-columns-larger.patch
@@ -1,14 +1,14 @@
-From 02dbd062099f90386ce601308c3ada1b9f07ab6d Mon Sep 17 00:00:00 2001
+From e9081f792bb1304a6ff475e1dd05779aa9ec0277 Mon Sep 17 00:00:00 2001
 From: Jacopo De Simoi <wilderjds@protonmail.com>
-Date: Mon, 17 Nov 2025 12:46:37 -0500
-Subject: [PATCH 01/22] Make the separator larger
+Date: Thu, 13 Nov 2025 21:02:55 -0500
+Subject: [PATCH 01/22] Make the separator between columns larger
 
 ---
  Header.c | 8 +++++---
  1 file changed, 5 insertions(+), 3 deletions(-)
 
 diff --git a/Header.c b/Header.c
-index 8a9eae34..87cba5cc 100644
+index 7447f718..8f90f2f3 100644
 --- a/Header.c
 +++ b/Header.c
 @@ -194,12 +194,14 @@ void Header_reinit(Header* this) {
@@ -21,8 +21,8 @@ index 8a9eae34..87cba5cc 100644
     for (int y = 0; y < height; y++) {
        mvhline(y, 0, ' ', COLS);
     }
-    const int numCols = HeaderLayout_getColumns(this->headerLayout);
--   const int width = COLS - 2 * pad - (numCols - 1);
+    const size_t numCols = HeaderLayout_getColumns(this->headerLayout);
+-   const int width = COLS - 2 * pad - ((int)numCols - 1);
 +   const int width = COLS - 2 * pad - sep*((int)numCols - 1);
     int x = pad;
     float roundingLoss = 0.0F;
@@ -46,5 +46,5 @@ index 8a9eae34..87cba5cc 100644
  }
  
 -- 
-2.51.0
+2.53.0
 
diff --git a/sys-process/htop/0002-Pad-core-id-with-0s.patch b/sys-process/htop/0002-Pad-core-id-with-0s.patch
index 9f0af76..c91ce02 100644
--- a/sys-process/htop/0002-Pad-core-id-with-0s.patch
+++ b/sys-process/htop/0002-Pad-core-id-with-0s.patch
@@ -1,4 +1,4 @@
-From 472f29d7cd702c98990682b897c45db4b8e6de4d Mon Sep 17 00:00:00 2001
+From 2739e414d4b957671c1ccd130f4d9d8edbfedce0 Mon Sep 17 00:00:00 2001
 From: Jacopo De Simoi <wilderjds@protonmail.com>
 Date: Wed, 25 May 2022 09:29:58 -0400
 Subject: [PATCH 02/22] Pad core id with 0s
@@ -8,10 +8,10 @@ Subject: [PATCH 02/22] Pad core id with 0s
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/CPUMeter.c b/CPUMeter.c
-index 01513503..6ee9bb13 100644
+index 7bc096db..6b5249ca 100644
 --- a/CPUMeter.c
 +++ b/CPUMeter.c
-@@ -92,7 +92,7 @@ static void CPUMeter_updateValues(Meter* this) {
+@@ -118,7 +118,7 @@ static void CPUMeter_updateValues(Meter* this) {
     if (settings->showCPUFrequency) {
        double cpuFrequency = this->values[CPU_METER_FREQUENCY];
        if (isNonnegative(cpuFrequency)) {
@@ -21,5 +21,5 @@ index 01513503..6ee9bb13 100644
           xSnprintf(cpuFrequencyBuffer, sizeof(cpuFrequencyBuffer), "N/A");
        }
 -- 
-2.51.0
+2.53.0
 
diff --git a/sys-process/htop/0003-Use-filled-square-for-bar-char.patch b/sys-process/htop/0003-Use-filled-square-for-bar-char.patch
index 93c05ec..fee9f5c 100644
--- a/sys-process/htop/0003-Use-filled-square-for-bar-char.patch
+++ b/sys-process/htop/0003-Use-filled-square-for-bar-char.patch
@@ -1,4 +1,4 @@
-From d1c2e7e0556ca290a538f20426f5e14ba5451b95 Mon Sep 17 00:00:00 2001
+From 528e5edab107adc763df69185e454c77a43e1d38 Mon Sep 17 00:00:00 2001
 From: Jacopo De Simoi <wilderjds@protonmail.com>
 Date: Thu, 13 Nov 2025 21:10:06 -0500
 Subject: [PATCH 03/22] Use filled square for bar char
@@ -8,10 +8,10 @@ Subject: [PATCH 03/22] Use filled square for bar char
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Meter.c b/Meter.c
-index 4463a90a..5982b436 100644
+index 05b5a5c5..ce105595 100644
 --- a/Meter.c
 +++ b/Meter.c
-@@ -141,7 +141,7 @@ static void BarMeterMode_draw(Meter* this, int x, int y, int w) {
+@@ -169,7 +169,7 @@ static void BarMeterMode_draw(Meter* this, int x, int y, int w) {
                 assert(i < strlen(BarMeterMode_characters));
                 RichString_setChar(&bar, startPos + j, BarMeterMode_characters[i]);
              } else {
@@ -21,5 +21,5 @@ index 4463a90a..5982b436 100644
           }
        offset = nextOffset;
 -- 
-2.51.0
+2.53.0
 
diff --git a/sys-process/htop/0004-Use-accent-color-for-key-and-add-separator.patch b/sys-process/htop/0004-Use-accent-color-for-key-and-add-separator.patch
index 839b4be..2aab437 100644
--- a/sys-process/htop/0004-Use-accent-color-for-key-and-add-separator.patch
+++ b/sys-process/htop/0004-Use-accent-color-for-key-and-add-separator.patch
@@ -1,4 +1,4 @@
-From 9fd3aa5ffdca50fcf5ce5c696a94e93bd0dfed1c Mon Sep 17 00:00:00 2001
+From 615f75ef43d3bdd6cd511589a558a2e55269d258 Mon Sep 17 00:00:00 2001
 From: Jacopo De Simoi <wilderjds@protonmail.com>
 Date: Thu, 26 May 2022 12:53:08 -0400
 Subject: [PATCH 04/22] Use accent color for key and add separator
@@ -9,10 +9,10 @@ Subject: [PATCH 04/22] Use accent color for key and add separator
  2 files changed, 5 insertions(+), 2 deletions(-)
 
 diff --git a/CRT.c b/CRT.c
-index 9c8b841a..bc26c148 100644
+index e4d2655e..44b9bfb5 100644
 --- a/CRT.c
 +++ b/CRT.c
-@@ -54,6 +54,8 @@ in the source distribution for its full text.
+@@ -56,6 +56,8 @@ in the source distribution for its full text.
  #define Cyan    COLOR_CYAN
  #define White   COLOR_WHITE
  
@@ -21,7 +21,7 @@ index 9c8b841a..bc26c148 100644
  #define ColorPairGrayBlack  ColorPair(Magenta,Magenta)
  #define ColorIndexGrayBlack ColorIndex(Magenta,Magenta)
  
-@@ -117,11 +119,11 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
+@@ -129,11 +131,11 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
     [COLORSCHEME_DEFAULT] = {
        [RESET_COLOR] = ColorPair(White, Black),
        [DEFAULT_COLOR] = ColorPair(White, Black),
@@ -36,10 +36,10 @@ index 9c8b841a..bc26c148 100644
        [PANEL_SELECTION_UNFOCUS] = ColorPair(Black, White),
        [FAILED_SEARCH] = ColorPair(Red, Cyan),
 diff --git a/FunctionBar.c b/FunctionBar.c
-index af4142e9..7111064d 100644
+index 85d081ca..4006a9c7 100644
 --- a/FunctionBar.c
 +++ b/FunctionBar.c
-@@ -101,6 +101,7 @@ int FunctionBar_drawExtra(const FunctionBar* this, const char* buffer, int attr,
+@@ -104,6 +104,7 @@ int FunctionBar_drawExtra(const FunctionBar* this, const char* buffer, int attr,
        attrset(CRT_colors[FUNCTION_KEY]);
        mvaddstr(LINES - 1, x, this->keys.constKeys[i]);
        x += strlen(this->keys.constKeys[i]);
@@ -48,5 +48,5 @@ index af4142e9..7111064d 100644
        mvaddstr(LINES - 1, x, this->functions[i]);
        x += strlen(this->functions[i]);
 -- 
-2.51.0
+2.53.0
 
diff --git a/sys-process/htop/0005-Shorten-labels-in-function-bar.patch b/sys-process/htop/0005-Shorten-labels-in-function-bar.patch
index 8a6f557..9aed664 100644
--- a/sys-process/htop/0005-Shorten-labels-in-function-bar.patch
+++ b/sys-process/htop/0005-Shorten-labels-in-function-bar.patch
@@ -1,4 +1,4 @@
-From aefaf2857be0c92b911233a857f728779b1c7221 Mon Sep 17 00:00:00 2001
+From 0390e0cb86fed4779d7ffacd62fc150a2f13f101 Mon Sep 17 00:00:00 2001
 From: Jacopo De Simoi <wilderjds@protonmail.com>
 Date: Thu, 26 May 2022 13:00:00 -0400
 Subject: [PATCH 05/22] Shorten labels in function bar
@@ -8,7 +8,7 @@ Subject: [PATCH 05/22] Shorten labels in function bar
  1 file changed, 27 insertions(+), 9 deletions(-)
 
 diff --git a/MainPanel.c b/MainPanel.c
-index 7852c08f..1204317e 100644
+index a5602f71..787cde08 100644
 --- a/MainPanel.c
 +++ b/MainPanel.c
 @@ -25,16 +25,34 @@ in the source distribution for its full text.
@@ -56,5 +56,5 @@ index 7852c08f..1204317e 100644
     Panel* super = &this->super;
     pid_t id = ch - 48 + this->idSearch;
 -- 
-2.51.0
+2.53.0
 
diff --git a/sys-process/htop/0006-Add-separators.patch b/sys-process/htop/0006-Add-separators.patch
index a044741..6a56acd 100644
--- a/sys-process/htop/0006-Add-separators.patch
+++ b/sys-process/htop/0006-Add-separators.patch
@@ -1,19 +1,19 @@
-From 6a816953bdba86d9ebbe1884250079fb8816458d Mon Sep 17 00:00:00 2001
+From 09982d5d9a36a67757ede9e86d0bcbdb45540d84 Mon Sep 17 00:00:00 2001
 From: Jacopo De Simoi <wilderjds@protonmail.com>
-Date: Fri, 27 May 2022 10:54:42 -0400
+Date: Sun, 7 Jun 2026 22:22:52 -0400
 Subject: [PATCH 06/22] Add separators
 
 This allows to use neutral highlighting for the top row and the
 function bar.
 ---
- Panel.c | 18 ++++++++++++++++++
- 1 file changed, 18 insertions(+)
+ Panel.c | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
 
 diff --git a/Panel.c b/Panel.c
-index 4784a658..432865f3 100644
+index 6f97e443..4780cc99 100644
 --- a/Panel.c
 +++ b/Panel.c
-@@ -218,6 +218,13 @@ void Panel_splice(Panel* this, Vector* from) {
+@@ -230,6 +230,13 @@ void Panel_splice(Panel* this, Vector* from) {
     this->needsRedraw = true;
  }
  
@@ -25,9 +25,9 @@ index 4784a658..432865f3 100644
 +}
 +
  void Panel_draw(Panel* this, bool force_redraw, bool focus, bool highlightSelected, bool hideFunctionBar) {
-    assert (this != NULL);
+    assert(this != NULL);
  
-@@ -227,9 +234,15 @@ void Panel_draw(Panel* this, bool force_redraw, bool focus, bool highlightSelect
+@@ -239,9 +246,15 @@ void Panel_draw(Panel* this, bool force_redraw, bool focus, bool highlightSelect
     int x = this->x;
     int h = this->h;
  
@@ -43,19 +43,17 @@ index 4784a658..432865f3 100644
     const int header_attr = focus
                           ? CRT_colors[PANEL_HEADER_FOCUS]
                           : CRT_colors[PANEL_HEADER_UNFOCUS];
-@@ -252,6 +265,9 @@ void Panel_draw(Panel* this, bool force_redraw, bool focus, bool highlightSelect
+@@ -260,6 +273,7 @@ void Panel_draw(Panel* this, bool force_redraw, bool focus, bool highlightSelect
+             MINIMUM(headerLen - scrollH, this->w));
+       }
+       attrset(CRT_colors[RESET_COLOR]);
++      draw_separator(y,x,this->w);
+       y++;
        h--;
     }
- 
-+   draw_separator(y,x,this->w);
-+   y++; h--;
-+
-    // ensure scroll area is on screen
-    if (this->scrollV < 0) {
-       this->scrollV = 0;
-@@ -330,6 +346,8 @@ void Panel_draw(Panel* this, bool force_redraw, bool focus, bool highlightSelect
-       RichString_delete(&old);
+@@ -359,6 +373,8 @@ void Panel_draw(Panel* this, bool force_redraw, bool focus, bool highlightSelect
     }
+    RichString_delete(&item);
  
 +   draw_separator(y+h,x,this->w);
 +
@@ -63,5 +61,5 @@ index 4784a658..432865f3 100644
        if (Panel_drawFunctionBarFn(this))
           Panel_drawFunctionBar(this, hideFunctionBar);
 -- 
-2.51.0
+2.53.0
 
diff --git a/sys-process/htop/0007-Use-proper-glyphs-to-denote-sorting.patch b/sys-process/htop/0007-Use-proper-glyphs-to-denote-sorting.patch
index 6fa8b29..00608a8 100644
--- a/sys-process/htop/0007-Use-proper-glyphs-to-denote-sorting.patch
+++ b/sys-process/htop/0007-Use-proper-glyphs-to-denote-sorting.patch
@@ -1,4 +1,4 @@
-From 010042a27391dfa83fc80156a0a59645c94d0d40 Mon Sep 17 00:00:00 2001
+From 067d942ec16a201b31da8a91da481de72017d9a7 Mon Sep 17 00:00:00 2001
 From: Jacopo De Simoi <wilderjds@protonmail.com>
 Date: Fri, 27 May 2022 10:58:11 -0400
 Subject: [PATCH 07/22] Use proper glyphs to denote sorting
@@ -8,10 +8,10 @@ Subject: [PATCH 07/22] Use proper glyphs to denote sorting
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/CRT.c b/CRT.c
-index bc26c148..def4fc1c 100644
+index 44b9bfb5..dd4040a0 100644
 --- a/CRT.c
 +++ b/CRT.c
-@@ -84,8 +84,8 @@ static const char* const CRT_treeStrUtf8[LAST_TREE_STR] = {
+@@ -86,8 +86,8 @@ static const char* const CRT_treeStrUtf8[LAST_TREE_STR] = {
                                       // WITH VERTICAL STROKE' (U+1FBAF, "\xf0\x9f\xae\xaf") when
                                       // Unicode 13 is common
     [TREE_STR_SHUT] = "\xe2\x94\x80", // ─
@@ -23,5 +23,5 @@ index bc26c148..def4fc1c 100644
  
  bool CRT_utf8 = false;
 -- 
-2.51.0
+2.53.0
 
diff --git a/sys-process/htop/0008-Use-accent-color-for-labels.patch b/sys-process/htop/0008-Use-accent-color-for-labels.patch
index b36d205..fb867d9 100644
--- a/sys-process/htop/0008-Use-accent-color-for-labels.patch
+++ b/sys-process/htop/0008-Use-accent-color-for-labels.patch
@@ -1,4 +1,4 @@
-From 839858e37b5444b6cba53f0ffdae32fc92454b5b Mon Sep 17 00:00:00 2001
+From b92fab434ef1517621f445e84964d0871d9bac22 Mon Sep 17 00:00:00 2001
 From: Jacopo De Simoi <wilderjds@protonmail.com>
 Date: Fri, 27 May 2022 10:59:42 -0400
 Subject: [PATCH 08/22] Use accent color for labels
@@ -8,10 +8,10 @@ Subject: [PATCH 08/22] Use accent color for labels
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/CRT.c b/CRT.c
-index def4fc1c..02a85d74 100644
+index dd4040a0..5baad82e 100644
 --- a/CRT.c
 +++ b/CRT.c
-@@ -133,7 +133,7 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
+@@ -145,7 +145,7 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
        [BATTERY] = A_BOLD | ColorPair(Cyan, Black),
        [LARGE_NUMBER] = A_BOLD | ColorPair(Red, Black),
        [METER_SHADOW] = A_BOLD | ColorPairGrayBlack,
@@ -21,5 +21,5 @@ index def4fc1c..02a85d74 100644
        [METER_VALUE_ERROR] = A_BOLD | ColorPair(Red, Black),
        [METER_VALUE_IOREAD] = ColorPair(Green, Black),
 -- 
-2.51.0
+2.53.0
 
diff --git a/sys-process/htop/0009-Remove-bold-attribute-broken-on-solarized-like.patch b/sys-process/htop/0009-Remove-bold-attribute-broken-on-solarized-like.patch
index 15adfee..d3683b9 100644
--- a/sys-process/htop/0009-Remove-bold-attribute-broken-on-solarized-like.patch
+++ b/sys-process/htop/0009-Remove-bold-attribute-broken-on-solarized-like.patch
@@ -1,4 +1,4 @@
-From 4dd31f658dafe38dfd64c361528055783063383a Mon Sep 17 00:00:00 2001
+From ff740390b297eae469192ba394f85f7a6bc9c251 Mon Sep 17 00:00:00 2001
 From: Jacopo De Simoi <wilderjds@protonmail.com>
 Date: Fri, 27 May 2022 11:00:37 -0400
 Subject: [PATCH 09/22] Remove bold attribute (broken on solarized-like)
@@ -8,10 +8,10 @@ Subject: [PATCH 09/22] Remove bold attribute (broken on solarized-like)
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/CRT.c b/CRT.c
-index 02a85d74..3d82a04f 100644
+index 5baad82e..0d4ba952 100644
 --- a/CRT.c
 +++ b/CRT.c
-@@ -151,7 +151,7 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
+@@ -163,7 +163,7 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
        [PROCESS_BASENAME] = A_BOLD | ColorPair(Cyan, Black),
        [PROCESS_TREE] = ColorPair(Cyan, Black),
        [PROCESS_RUN_STATE] = ColorPair(Green, Black),
@@ -21,5 +21,5 @@ index 02a85d74..3d82a04f 100644
        [PROCESS_LOW_PRIORITY] = ColorPair(Green, Black),
        [PROCESS_NEW] = ColorPair(Black, Green),
 -- 
-2.51.0
+2.53.0
 
diff --git a/sys-process/htop/0010-Introduce-highlighted-pairs.patch b/sys-process/htop/0010-Introduce-highlighted-pairs.patch
index 8960bff..56f60b9 100644
--- a/sys-process/htop/0010-Introduce-highlighted-pairs.patch
+++ b/sys-process/htop/0010-Introduce-highlighted-pairs.patch
@@ -1,4 +1,4 @@
-From f4bb25aa2cbae876035dcd9beb6a9569e8171582 Mon Sep 17 00:00:00 2001
+From 97fc82ae9e1039853d82cf2fedd04a7578c35c7c Mon Sep 17 00:00:00 2001
 From: Jacopo De Simoi <wilderjds@protonmail.com>
 Date: Fri, 27 May 2022 11:02:45 -0400
 Subject: [PATCH 10/22] Introduce highlighted pairs
@@ -9,10 +9,10 @@ This only makes sense in solarized-like schemes
  1 file changed, 6 insertions(+), 3 deletions(-)
 
 diff --git a/CRT.c b/CRT.c
-index 3d82a04f..5cec84ab 100644
+index 0d4ba952..2c5d427e 100644
 --- a/CRT.c
 +++ b/CRT.c
-@@ -44,6 +44,7 @@ in the source distribution for its full text.
+@@ -46,6 +46,7 @@ in the source distribution for its full text.
  #define ColorIndex(i,j) ((7-(i))*8+(j))
  
  #define ColorPair(i,j) COLOR_PAIR(ColorIndex(i,j))
@@ -20,7 +20,7 @@ index 3d82a04f..5cec84ab 100644
  
  #define Black   COLOR_BLACK
  #define Red     COLOR_RED
-@@ -119,9 +120,9 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
+@@ -131,9 +132,9 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
     [COLORSCHEME_DEFAULT] = {
        [RESET_COLOR] = ColorPair(White, Black),
        [DEFAULT_COLOR] = ColorPair(White, Black),
@@ -33,7 +33,7 @@ index 3d82a04f..5cec84ab 100644
        [FUNCTION_BAR] = ColorPair(White, Black),
        [FUNCTION_KEY] = ColorPair(Accent, Black),
        [PANEL_SELECTION_FOLLOW] = ColorPair(Black, Yellow),
-@@ -1202,6 +1203,8 @@ void CRT_setColors(int colorScheme) {
+@@ -1354,6 +1355,8 @@ void CRT_setColors(int colorScheme) {
           if (ColorIndex(i, j) != ColorIndexGrayBlack && ColorIndex(i, j) != ColorIndexWhiteDefault) {
              short int bg = (colorScheme != COLORSCHEME_BLACKNIGHT) && (j == 0) ? -1 : j;
              init_pair(ColorIndex(i, j), i, bg);
@@ -43,5 +43,5 @@ index 3d82a04f..5cec84ab 100644
        }
     }
 -- 
-2.51.0
+2.53.0
 
diff --git a/sys-process/htop/0011-Remove-Bar-borders.patch b/sys-process/htop/0011-Remove-Bar-borders.patch
index fb21111..ccba1d1 100644
--- a/sys-process/htop/0011-Remove-Bar-borders.patch
+++ b/sys-process/htop/0011-Remove-Bar-borders.patch
@@ -1,42 +1,38 @@
-From b118cf8c48cae7912a9d7a9eea129e01f75fc684 Mon Sep 17 00:00:00 2001
+From 5ff356fa0e4bdef363b921224680f5e39ddbca19 Mon Sep 17 00:00:00 2001
 From: Jacopo De Simoi <wilderjds@protonmail.com>
-Date: Mon, 17 Nov 2025 12:48:55 -0500
+Date: Thu, 13 Nov 2025 21:26:27 -0500
 Subject: [PATCH 11/22] Remove Bar borders
 
+This is an experiment in Tufte-ism
 ---
- Meter.c | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
+ Meter.c | 7 +------
+ 1 file changed, 1 insertion(+), 6 deletions(-)
 
 diff --git a/Meter.c b/Meter.c
-index 5982b436..e8708a93 100644
+index ce105595..42f6f2da 100644
 --- a/Meter.c
 +++ b/Meter.c
-@@ -80,12 +80,10 @@ static void BarMeterMode_draw(Meter* this, int x, int y, int w) {
-    w -= captionLen;
+@@ -102,11 +102,7 @@ static void BarMeterMode_draw(Meter* this, int x, int y, int w) {
  
     // Draw the bar borders
--   attrset(CRT_colors[BAR_BORDER]);
--   mvaddch(y, x, '[');
--   w--;
--   mvaddch(y, x + MAXIMUM(w, 0), ']');
--   w--;
--   attrset(CRT_colors[RESET_COLOR]);
-+   if (w >= 1) {
+    if (w >= 1) {
+-      x += captionLen;
+-      attrset(CRT_colors[BAR_BORDER]);
+-      mvaddch(y, x, '[');
+-      w--;
+-      mvaddch(y, x + w, ']');
 +      x += captionLen + 1;
-+      w--;
-+   }
- 
-    x++;
+       w--;
+    }
  
-@@ -93,6 +91,8 @@ static void BarMeterMode_draw(Meter* this, int x, int y, int w) {
-       return;
+@@ -120,7 +116,6 @@ static void BarMeterMode_draw(Meter* this, int x, int y, int w) {
+       goto end;
     }
+    attrset(CRT_colors[RESET_COLOR]); // Clear the bold attribute
+-   x++;
  
-+   attrset(CRT_colors[RESET_COLOR]); // Clear the bold attribute
-+
     // The text in the bar is right aligned;
     // Pad with maximal spaces and then calculate needed starting position offset
-    RichString_begin(bar);
 -- 
-2.51.0
+2.53.0
 
diff --git a/sys-process/htop/0012-Implement-highlight-methods.patch b/sys-process/htop/0012-Implement-highlight-methods.patch
index bbcbbcc..55f2aee 100644
--- a/sys-process/htop/0012-Implement-highlight-methods.patch
+++ b/sys-process/htop/0012-Implement-highlight-methods.patch
@@ -1,4 +1,4 @@
-From 47495c0dd0f71693b22cacb1900d431db6d9771c Mon Sep 17 00:00:00 2001
+From c655fb847c8f0e2705165e12738e71c08d1ae643 Mon Sep 17 00:00:00 2001
 From: Jacopo De Simoi <wilderjds@protonmail.com>
 Date: Fri, 27 May 2022 11:09:54 -0400
 Subject: [PATCH 12/22] Implement highlight methods
@@ -10,10 +10,10 @@ Subject: [PATCH 12/22] Implement highlight methods
  3 files changed, 28 insertions(+), 1 deletion(-)
 
 diff --git a/Panel.c b/Panel.c
-index 432865f3..8d6fa17c 100644
+index 4780cc99..1f6b684e 100644
 --- a/Panel.c
 +++ b/Panel.c
-@@ -305,7 +305,7 @@ void Panel_draw(Panel* this, bool force_redraw, bool focus, bool highlightSelect
+@@ -332,7 +332,7 @@ void Panel_draw(Panel* this, bool force_redraw, bool focus, bool highlightSelect
           }
           if (item.highlightAttr) {
              attrset(item.highlightAttr);
@@ -23,10 +23,10 @@ index 432865f3..8d6fa17c 100644
           }
           mvhline(y + line, x, ' ', this->w);
 diff --git a/RichString.c b/RichString.c
-index 390beb07..85e037f2 100644
+index 9e63ee48..0d5f4ae8 100644
 --- a/RichString.c
 +++ b/RichString.c
-@@ -160,6 +160,25 @@ inline void RichString_setAttrn(RichString* this, int attrs, int start, int char
+@@ -171,6 +171,25 @@ inline void RichString_setAttrn(RichString* this, int attrs, size_t start, size_
     }
  }
  
@@ -52,7 +52,7 @@ index 390beb07..85e037f2 100644
  void RichString_appendChr(RichString* this, int attrs, char c, int count) {
     int from = this->chlen;
     int newLen = from + count;
-@@ -242,6 +261,10 @@ void RichString_setAttr(RichString* this, int attrs) {
+@@ -254,6 +273,10 @@ void RichString_setAttr(RichString* this, int attrs) {
     RichString_setAttrn(this, attrs, 0, this->chlen);
  }
  
@@ -64,12 +64,12 @@ index 390beb07..85e037f2 100644
     return RichString_writeFromWide(this, attrs, data, this->chlen, strlen(data));
  }
 diff --git a/RichString.h b/RichString.h
-index 7783378b..cd584398 100644
+index f6eeb902..2a61c91d 100644
 --- a/RichString.h
 +++ b/RichString.h
 @@ -52,10 +52,14 @@ void RichString_rewind(RichString* this, int count);
  
- void RichString_setAttrn(RichString* this, int attrs, int start, int charcount);
+ void RichString_setAttrn(RichString* this, int attrs, size_t start, size_t charcount);
  
 +void RichString_highlightn(RichString* this, int start, int charcount);
 +
@@ -83,5 +83,5 @@ index 7783378b..cd584398 100644
  
  /* All appending and writing functions return the number of written characters (not columns). */
 -- 
-2.51.0
+2.53.0
 
diff --git a/sys-process/htop/0013-Implement-rudimentary-separator.patch b/sys-process/htop/0013-Implement-rudimentary-separator.patch
index 6994cb5..3450fd2 100644
--- a/sys-process/htop/0013-Implement-rudimentary-separator.patch
+++ b/sys-process/htop/0013-Implement-rudimentary-separator.patch
@@ -1,4 +1,4 @@
-From 6c9992fd9f5ac01cee80d8db6200950820a1746e Mon Sep 17 00:00:00 2001
+From e63ac26ee4da1081fde4217705bcb9d9024dcf8d Mon Sep 17 00:00:00 2001
 From: Jacopo De Simoi <wilderjds@protonmail.com>
 Date: Thu, 13 Nov 2025 21:39:16 -0500
 Subject: [PATCH 13/22] Implement rudimentary separator
@@ -10,12 +10,12 @@ Subject: [PATCH 13/22] Implement rudimentary separator
  3 files changed, 44 insertions(+)
 
 diff --git a/Meter.c b/Meter.c
-index e8708a93..df9122da 100644
+index 42f6f2da..5f24798d 100644
 --- a/Meter.c
 +++ b/Meter.c
-@@ -87,6 +87,16 @@ static void BarMeterMode_draw(Meter* this, int x, int y, int w) {
- 
-    x++;
+@@ -112,6 +112,16 @@ static void BarMeterMode_draw(Meter* this, int x, int y, int w) {
+       this->total = MAXIMUM(sum, this->total);
+    }
  
 +    if (caption[0] == 0) {
 +       // This should be a check for being a blank meter
@@ -28,9 +28,9 @@ index e8708a93..df9122da 100644
 +
 +
     if (w < 1) {
-       return;
+       goto end;
     }
-@@ -548,3 +558,34 @@ const MeterClass BlankMeter_class = {
+@@ -611,3 +621,34 @@ const MeterClass BlankMeter_class = {
     .uiName = "Blank",
     .caption = ""
  };
@@ -66,10 +66,10 @@ index e8708a93..df9122da 100644
 +   .caption = ""
 +};
 diff --git a/Meter.h b/Meter.h
-index b53a8232..404dca2f 100644
+index 55288514..863bbd7b 100644
 --- a/Meter.h
 +++ b/Meter.h
-@@ -148,4 +148,6 @@ ListItem* Meter_toListItem(const Meter* this, bool moving);
+@@ -155,4 +155,6 @@ ListItem* Meter_toListItem(const Meter* this, bool moving);
  
  extern const MeterClass BlankMeter_class;
  
@@ -77,10 +77,10 @@ index b53a8232..404dca2f 100644
 +
  #endif
 diff --git a/linux/Platform.c b/linux/Platform.c
-index 5da8bbac..682e4910 100644
+index cecaf3b5..b3107bc3 100644
 --- a/linux/Platform.c
 +++ b/linux/Platform.c
-@@ -238,6 +238,7 @@ const MeterClass* const Platform_meterTypes[] = {
+@@ -257,6 +257,7 @@ const MeterClass* const Platform_meterTypes[] = {
     &LeftCPUs8Meter_class,
     &RightCPUs8Meter_class,
     &BlankMeter_class,
@@ -89,5 +89,5 @@ index 5da8bbac..682e4910 100644
     &PressureStallIOSomeMeter_class,
     &PressureStallIOFullMeter_class,
 -- 
-2.51.0
+2.53.0
 
diff --git a/sys-process/htop/0014-Put-Kernel-CPU-first.patch b/sys-process/htop/0014-Put-Kernel-CPU-first.patch
index e573a0b..742a3fa 100644
--- a/sys-process/htop/0014-Put-Kernel-CPU-first.patch
+++ b/sys-process/htop/0014-Put-Kernel-CPU-first.patch
@@ -1,4 +1,4 @@
-From 0c604a0635b3875efcaa42bafd7a135765e5ad98 Mon Sep 17 00:00:00 2001
+From cd41e4d5f2c3293d74c5bd04e7ea2ed1b6b7b735 Mon Sep 17 00:00:00 2001
 From: Jacopo De Simoi <wilderjds@protonmail.com>
 Date: Mon, 30 May 2022 23:08:47 -0400
 Subject: [PATCH 14/22] Put Kernel CPU first
@@ -8,7 +8,7 @@ Subject: [PATCH 14/22] Put Kernel CPU first
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/CPUMeter.c b/CPUMeter.c
-index 6ee9bb13..07fd5816 100644
+index 6b5249ca..c2ac59f0 100644
 --- a/CPUMeter.c
 +++ b/CPUMeter.c
 @@ -26,9 +26,9 @@ in the source distribution for its full text.
@@ -24,5 +24,5 @@ index 6ee9bb13..07fd5816 100644
     CPU_SOFTIRQ,
     CPU_STEAL,
 -- 
-2.51.0
+2.53.0
 
diff --git a/sys-process/htop/0015-Avoid-bold-in-solarized-based-themes.patch b/sys-process/htop/0015-Avoid-bold-in-solarized-based-themes.patch
index 4f1d463..5a634d8 100644
--- a/sys-process/htop/0015-Avoid-bold-in-solarized-based-themes.patch
+++ b/sys-process/htop/0015-Avoid-bold-in-solarized-based-themes.patch
@@ -1,4 +1,4 @@
-From f0228ab9636a561bc70d2bee0330ad266fc1a39b Mon Sep 17 00:00:00 2001
+From 2a537b46d0cc565df37b21f0ee2ac41e4d861acb Mon Sep 17 00:00:00 2001
 From: Jacopo De Simoi <wilderjds@protonmail.com>
 Date: Sun, 7 May 2023 15:56:42 -0400
 Subject: [PATCH 15/22] Avoid bold in solarized-based themes
@@ -8,10 +8,10 @@ Subject: [PATCH 15/22] Avoid bold in solarized-based themes
  1 file changed, 7 insertions(+), 7 deletions(-)
 
 diff --git a/CRT.c b/CRT.c
-index 5cec84ab..52ee28dc 100644
+index 2c5d427e..1f39c2f4 100644
 --- a/CRT.c
 +++ b/CRT.c
-@@ -146,10 +146,10 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
+@@ -158,10 +158,10 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
        [TASKS_RUNNING] = A_BOLD | ColorPair(Green, Black),
        [PROCESS] = A_NORMAL,
        [PROCESS_SHADOW] = A_BOLD | ColorPairGrayBlack,
@@ -24,7 +24,7 @@ index 5cec84ab..52ee28dc 100644
        [PROCESS_TREE] = ColorPair(Cyan, Black),
        [PROCESS_RUN_STATE] = ColorPair(Green, Black),
        [PROCESS_D_STATE] =  ColorPair(Magenta, Black),
-@@ -158,7 +158,7 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
+@@ -170,7 +170,7 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
        [PROCESS_NEW] = ColorPair(Black, Green),
        [PROCESS_TOMB] = ColorPair(Black, Red),
        [PROCESS_THREAD] = ColorPair(Green, Black),
@@ -33,7 +33,7 @@ index 5cec84ab..52ee28dc 100644
        [PROCESS_COMM] = ColorPair(Magenta, Black),
        [PROCESS_THREAD_COMM] = A_BOLD | ColorPair(Blue, Black),
        [PROCESS_PRIV] = ColorPair(Magenta, Black),
-@@ -178,10 +178,10 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
+@@ -190,10 +190,10 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
        [HUGEPAGE_1] = ColorPair(Green, Black),
        [HUGEPAGE_2] = ColorPair(Yellow, Black),
        [HUGEPAGE_3] = ColorPair(Red, Black),
@@ -49,5 +49,5 @@ index 5cec84ab..52ee28dc 100644
        [HELP_BOLD] = A_BOLD | ColorPair(Cyan, Black),
        [HELP_SHADOW] = A_BOLD | ColorPairGrayBlack,
 -- 
-2.51.0
+2.53.0
 
diff --git a/sys-process/htop/0016-Use-dimmed-on-highlighted-background-for-unfocused-s.patch b/sys-process/htop/0016-Use-dimmed-on-highlighted-background-for-unfocused-s.patch
index 05e7cd0..a18d482 100644
--- a/sys-process/htop/0016-Use-dimmed-on-highlighted-background-for-unfocused-s.patch
+++ b/sys-process/htop/0016-Use-dimmed-on-highlighted-background-for-unfocused-s.patch
@@ -1,4 +1,4 @@
-From 7eaa9ac853fb946a279b088341b180ccc9faf6d7 Mon Sep 17 00:00:00 2001
+From 5386436b6c52aadcc442bf3c520862db9be4ee91 Mon Sep 17 00:00:00 2001
 From: Jacopo De Simoi <wilderjds@protonmail.com>
 Date: Mon, 30 May 2022 23:10:12 -0400
 Subject: [PATCH 16/22] Use dimmed on highlighted background for unfocused
@@ -9,10 +9,10 @@ Subject: [PATCH 16/22] Use dimmed on highlighted background for unfocused
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/CRT.c b/CRT.c
-index 52ee28dc..c00bd09c 100644
+index 1f39c2f4..5846f27c 100644
 --- a/CRT.c
 +++ b/CRT.c
-@@ -126,7 +126,7 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
+@@ -138,7 +138,7 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
        [FUNCTION_BAR] = ColorPair(White, Black),
        [FUNCTION_KEY] = ColorPair(Accent, Black),
        [PANEL_SELECTION_FOLLOW] = ColorPair(Black, Yellow),
@@ -22,5 +22,5 @@ index 52ee28dc..c00bd09c 100644
        [FAILED_READ] = A_BOLD | ColorPair(Red, Black),
        [PAUSED] = A_BOLD | ColorPair(Yellow, Cyan),
 -- 
-2.51.0
+2.53.0
 
diff --git a/sys-process/htop/0017-Put-margin-in-each-column.patch b/sys-process/htop/0017-Put-margin-in-each-column.patch
index 592f6ac..303bb8a 100644
--- a/sys-process/htop/0017-Put-margin-in-each-column.patch
+++ b/sys-process/htop/0017-Put-margin-in-each-column.patch
@@ -1,15 +1,15 @@
-From a649ec55a55d9bb832a7c09470346fe13ea8faf4 Mon Sep 17 00:00:00 2001
+From 693586c2d16ae4597637244b5dde534018601bed Mon Sep 17 00:00:00 2001
 From: Jacopo De Simoi <wilderjds@protonmail.com>
-Date: Mon, 17 Nov 2025 12:50:57 -0500
+Date: Mon, 17 Nov 2025 09:55:12 -0500
 Subject: [PATCH 17/22] Put margin in each column
 
 ---
  Header.c |  2 +-
- Meter.c  | 19 +++++++++++++------
- 2 files changed, 14 insertions(+), 7 deletions(-)
+ Meter.c  | 11 ++++++++---
+ 2 files changed, 9 insertions(+), 4 deletions(-)
 
 diff --git a/Header.c b/Header.c
-index 87cba5cc..5d6d531d 100644
+index 8f90f2f3..760789ce 100644
 --- a/Header.c
 +++ b/Header.c
 @@ -194,7 +194,7 @@ void Header_reinit(Header* this) {
@@ -22,42 +22,34 @@ index 87cba5cc..5d6d531d 100644
     attrset(CRT_colors[RESET_COLOR]);
     for (int y = 0; y < height; y++) {
 diff --git a/Meter.c b/Meter.c
-index df9122da..f1e40afe 100644
+index 5f24798d..2fba5b35 100644
 --- a/Meter.c
 +++ b/Meter.c
-@@ -50,8 +50,11 @@ static inline void Meter_displayBuffer(const Meter* this, RichString* out) {
+@@ -64,9 +64,10 @@ static void TextMeterMode_draw(Meter* this, int x, int y, int w) {
+    assert(w <= INT_MAX - x);
  
- static void TextMeterMode_draw(Meter* this, int x, int y, int w) {
     const char* caption = Meter_getCaption(this);
--   attrset(CRT_colors[METER_TEXT]);
--   mvaddnstr(y, x, caption, w);
+-   if (w > 0) {
+-      attrset(CRT_colors[METER_TEXT]);
+-      mvaddnstr(y, x, caption, w);
 +   if ((w > 0) && (caption[0] != 0)) {
 +       x++; w-=2; //margin
 +       attrset(CRT_colors[METER_TEXT]);
 +       mvaddnstr(y, x, caption, w);
-+   }
+    }
     attrset(CRT_colors[RESET_COLOR]);
  
-    int captionLen = strlen(caption);
-@@ -73,10 +76,14 @@ static const char BarMeterMode_characters[] = "|#*@$%&.";
- static void BarMeterMode_draw(Meter* this, int x, int y, int w) {
+@@ -94,6 +95,10 @@ static void BarMeterMode_draw(Meter* this, int x, int y, int w) {
     // Draw the caption
+    int captionLen = 3;
     const char* caption = Meter_getCaption(this);
--   attrset(CRT_colors[METER_TEXT]);
--   int captionLen = 3;
--   mvaddnstr(y, x, caption, captionLen);
--   x += captionLen;
 +   if (caption[0] != 0) {
 +       x++; w-=2; //margin
 +   }
-+   int captionLen = strlen(caption);
-+   if (w >= captionLen) {
-+      attrset(CRT_colors[METER_TEXT]);
-+      mvaddnstr(y, x, caption, captionLen);
-+   }
-    w -= captionLen;
- 
-    // Draw the bar borders
++
+    if (w >= captionLen) {
+       attrset(CRT_colors[METER_TEXT]);
+       mvaddnstr(y, x, caption, captionLen);
 -- 
-2.51.0
+2.53.0
 
diff --git a/sys-process/htop/0018-Use-regular-highlight-if-unfocused.patch b/sys-process/htop/0018-Use-regular-highlight-if-unfocused.patch
index 7f128db..02dd328 100644
--- a/sys-process/htop/0018-Use-regular-highlight-if-unfocused.patch
+++ b/sys-process/htop/0018-Use-regular-highlight-if-unfocused.patch
@@ -1,4 +1,4 @@
-From eb921819250f8a4114c2cf8fe926932da15dde9f Mon Sep 17 00:00:00 2001
+From c8bd5101f3379546e44dc680b3bb587e3b293444 Mon Sep 17 00:00:00 2001
 From: Jacopo De Simoi <wilderjds@protonmail.com>
 Date: Mon, 30 May 2022 23:12:02 -0400
 Subject: [PATCH 18/22] Use "regular" highlight if unfocused
@@ -8,10 +8,10 @@ Subject: [PATCH 18/22] Use "regular" highlight if unfocused
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/Panel.c b/Panel.c
-index 8d6fa17c..e155625b 100644
+index 1f6b684e..3854ec0c 100644
 --- a/Panel.c
 +++ b/Panel.c
-@@ -305,7 +305,8 @@ void Panel_draw(Panel* this, bool force_redraw, bool focus, bool highlightSelect
+@@ -332,7 +332,8 @@ void Panel_draw(Panel* this, bool force_redraw, bool focus, bool highlightSelect
           }
           if (item.highlightAttr) {
              attrset(item.highlightAttr);
@@ -22,5 +22,5 @@ index 8d6fa17c..e155625b 100644
           }
           mvhline(y + line, x, ' ', this->w);
 -- 
-2.51.0
+2.53.0
 
diff --git a/sys-process/htop/0019-Better-spacing-for-sorted-column.patch b/sys-process/htop/0019-Better-spacing-for-sorted-column.patch
index 9d9ab87..de2fb70 100644
--- a/sys-process/htop/0019-Better-spacing-for-sorted-column.patch
+++ b/sys-process/htop/0019-Better-spacing-for-sorted-column.patch
@@ -1,4 +1,4 @@
-From 4cc02b37ed48c20e9554ce441376fe4cf9a0fd35 Mon Sep 17 00:00:00 2001
+From 96c026e6871ba303f87c3b4de14d92a0c6863582 Mon Sep 17 00:00:00 2001
 From: Jacopo De Simoi <wilderjds@protonmail.com>
 Date: Mon, 17 Nov 2025 09:59:23 -0500
 Subject: [PATCH 19/22] Better spacing for sorted column
@@ -8,10 +8,10 @@ Subject: [PATCH 19/22] Better spacing for sorted column
  1 file changed, 1 insertion(+)
 
 diff --git a/Table.c b/Table.c
-index 42aab427..00cd088e 100644
+index 8f0903c5..e7544da5 100644
 --- a/Table.c
 +++ b/Table.c
-@@ -311,6 +311,7 @@ void Table_printHeader(const Settings* settings, RichString* header) {
+@@ -390,6 +390,7 @@ void Table_printHeader(const Settings* settings, RichString* header) {
           RichString_appendWide(header,
                                  CRT_colors[PANEL_SELECTION_FOCUS],
                                  CRT_treeStr[ascending ? TREE_STR_ASC : TREE_STR_DESC]);
@@ -20,5 +20,5 @@ index 42aab427..00cd088e 100644
        if (COMM == fields[i] && settings->showMergedCommand) {
           RichString_appendAscii(header, color, "(merged)");
 -- 
-2.51.0
+2.53.0
 
diff --git a/sys-process/htop/0020-Shorten-string-it-does-not-fit-on-my-terminal-anyway.patch b/sys-process/htop/0020-Shorten-string-it-does-not-fit-on-my-terminal-anyway.patch
index b89440a..1b7df80 100644
--- a/sys-process/htop/0020-Shorten-string-it-does-not-fit-on-my-terminal-anyway.patch
+++ b/sys-process/htop/0020-Shorten-string-it-does-not-fit-on-my-terminal-anyway.patch
@@ -1,4 +1,4 @@
-From f69cce0f72ca91081c83cc2b31f2347d4c6bccba Mon Sep 17 00:00:00 2001
+From 0824d7ef3a845cd364ce1a6841656a6a195d6dbc Mon Sep 17 00:00:00 2001
 From: Jacopo De Simoi <wilderjds@protonmail.com>
 Date: Mon, 30 May 2022 23:13:24 -0400
 Subject: [PATCH 20/22] Shorten string (it does not fit on my terminal anyways)
@@ -8,10 +8,10 @@ Subject: [PATCH 20/22] Shorten string (it does not fit on my terminal anyways)
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/TasksMeter.c b/TasksMeter.c
-index fc1e4b0e..7cb8254e 100644
+index f522b753..6d797894 100644
 --- a/TasksMeter.c
 +++ b/TasksMeter.c
-@@ -61,7 +61,7 @@ static void TasksMeter_display(const Object* cast, RichString* out) {
+@@ -60,7 +60,7 @@ static void TasksMeter_display(const Object* cast, RichString* out) {
     RichString_appendAscii(out, CRT_colors[METER_TEXT], "; ");
     len = xSnprintf(buffer, sizeof(buffer), "%d", (int)this->values[3]);
     RichString_appendnAscii(out, CRT_colors[TASKS_RUNNING], buffer, len);
@@ -21,5 +21,5 @@ index fc1e4b0e..7cb8254e 100644
  
  const MeterClass TasksMeter_class = {
 -- 
-2.51.0
+2.53.0
 
diff --git a/sys-process/htop/0021-Remove-from-captions.patch b/sys-process/htop/0021-Remove-from-captions.patch
index 36b85d8..14fde71 100644
--- a/sys-process/htop/0021-Remove-from-captions.patch
+++ b/sys-process/htop/0021-Remove-from-captions.patch
@@ -1,60 +1,36 @@
-From e9223b3f615cbde162de845b4237c296b6ab46cf Mon Sep 17 00:00:00 2001
+From 6e0e34b3895a7cda2e876de289c6f66a9be9e82a Mon Sep 17 00:00:00 2001
 From: Jacopo De Simoi <wilderjds@protonmail.com>
-Date: Mon, 17 Nov 2025 12:52:14 -0500
-Subject: [PATCH 21/22] Remove ':" from captions
+Date: Sun, 7 Jun 2026 22:24:49 -0400
+Subject: [PATCH 21/22] Remove ':' from captions
 
 ---
  BatteryMeter.c     | 2 +-
- ClockMeter.c       | 2 +-
- DateMeter.c        | 2 +-
  DateTimeMeter.c    | 2 +-
- DiskIOMeter.c      | 2 +-
+ DiskIOMeter.c      | 6 +++---
  HostnameMeter.c    | 2 +-
  LoadAverageMeter.c | 4 ++--
  NetworkIOMeter.c   | 2 +-
  SysArchMeter.c     | 2 +-
  TasksMeter.c       | 2 +-
  UptimeMeter.c      | 2 +-
- 11 files changed, 12 insertions(+), 12 deletions(-)
+ 9 files changed, 12 insertions(+), 12 deletions(-)
 
 diff --git a/BatteryMeter.c b/BatteryMeter.c
-index 001249d4..8e2d714f 100644
+index 7ab1bac9..1e3c36d2 100644
 --- a/BatteryMeter.c
 +++ b/BatteryMeter.c
-@@ -68,5 +68,5 @@ const MeterClass BatteryMeter_class = {
+@@ -69,5 +69,5 @@ const MeterClass BatteryMeter_class = {
     .attributes = BatteryMeter_attributes,
     .name = "Battery",
     .uiName = "Battery",
 -   .caption = "Battery: "
 +   .caption = "Battery "
  };
-diff --git a/ClockMeter.c b/ClockMeter.c
-index 9c70b24f..e6bd3741 100644
---- a/ClockMeter.c
-+++ b/ClockMeter.c
-@@ -42,5 +42,5 @@ const MeterClass ClockMeter_class = {
-    .attributes = ClockMeter_attributes,
-    .name = "Clock",
-    .uiName = "Clock",
--   .caption = "Time: ",
-+   .caption = "Time ",
- };
-diff --git a/DateMeter.c b/DateMeter.c
-index 02aaabfb..f8678e52 100644
---- a/DateMeter.c
-+++ b/DateMeter.c
-@@ -42,5 +42,5 @@ const MeterClass DateMeter_class = {
-    .attributes = DateMeter_attributes,
-    .name = "Date",
-    .uiName = "Date",
--   .caption = "Date: ",
-+   .caption = "Date ",
- };
 diff --git a/DateTimeMeter.c b/DateTimeMeter.c
-index c4ec0def..5dd19b49 100644
+index 20422d1f..1ec69979 100644
 --- a/DateTimeMeter.c
 +++ b/DateTimeMeter.c
-@@ -42,5 +42,5 @@ const MeterClass DateTimeMeter_class = {
+@@ -88,5 +88,5 @@ const MeterClass DateTimeMeter_class = {
     .attributes = DateTimeMeter_attributes,
     .name = "DateTime",
     .uiName = "Date and Time",
@@ -62,16 +38,36 @@ index c4ec0def..5dd19b49 100644
 +   .caption = "Date & Time ",
  };
 diff --git a/DiskIOMeter.c b/DiskIOMeter.c
-index 4bb689fa..ba6b5449 100644
+index 264074aa..8ea4787f 100644
 --- a/DiskIOMeter.c
 +++ b/DiskIOMeter.c
-@@ -162,5 +162,5 @@ const MeterClass DiskIOMeter_class = {
-    .attributes = DiskIOMeter_attributes,
+@@ -318,7 +318,7 @@ const MeterClass DiskIORateMeter_class = {
+    .name = "DiskIORate",
+    .uiName = "Disk IO Rate",
+    .description = "Disk IO read & write bytes per second",
+-   .caption = "Dsk: "
++   .caption = "Dsk "
+ };
+ 
+ const MeterClass DiskIOTimeMeter_class = {
+@@ -337,7 +337,7 @@ const MeterClass DiskIOTimeMeter_class = {
+    .name = "DiskIOTime",
+    .uiName = "Disk IO Time",
+    .description = "Disk percent time busy",
+-   .caption = "Dsk: "
++   .caption = "Dsk "
+ };
+ 
+ const MeterClass DiskIOMeter_class = {
+@@ -353,7 +353,7 @@ const MeterClass DiskIOMeter_class = {
     .name = "DiskIO",
     .uiName = "Disk IO",
--   .caption = "Disk IO: "
-+   .caption = "Disk IO "
- };
+    .description = "Disk IO rate & time combined display",
+-   .caption = "Dsk: ",
++   .caption = "Dsk ",
+    .draw = DiskIOMeter_draw,
+    .init = DiskIOMeter_init,
+    .updateMode = DiskIOMeter_updateMode,
 diff --git a/HostnameMeter.c b/HostnameMeter.c
 index e8b2befb..91c7f638 100644
 --- a/HostnameMeter.c
@@ -84,10 +80,10 @@ index e8b2befb..91c7f638 100644
 +   .caption = "Hostname ",
  };
 diff --git a/LoadAverageMeter.c b/LoadAverageMeter.c
-index 6bf13a03..bec53222 100644
+index a0b05f2b..8cd352d7 100644
 --- a/LoadAverageMeter.c
 +++ b/LoadAverageMeter.c
-@@ -116,7 +116,7 @@ const MeterClass LoadAverageMeter_class = {
+@@ -117,7 +117,7 @@ const MeterClass LoadAverageMeter_class = {
     .name = "LoadAverage",
     .uiName = "Load average",
     .description = "Load averages: 1 minute, 5 minutes, 15 minutes",
@@ -96,7 +92,7 @@ index 6bf13a03..bec53222 100644
  };
  
  const MeterClass LoadMeter_class = {
-@@ -134,5 +134,5 @@ const MeterClass LoadMeter_class = {
+@@ -136,5 +136,5 @@ const MeterClass LoadMeter_class = {
     .name = "Load",
     .uiName = "Load",
     .description = "Load: average of ready processes in the last minute",
@@ -104,21 +100,21 @@ index 6bf13a03..bec53222 100644
 +   .caption = "Load "
  };
 diff --git a/NetworkIOMeter.c b/NetworkIOMeter.c
-index 784c90ac..fc819ebc 100644
+index a4e1bec8..e3bfaf90 100644
 --- a/NetworkIOMeter.c
 +++ b/NetworkIOMeter.c
-@@ -175,5 +175,5 @@ const MeterClass NetworkIOMeter_class = {
-    .attributes = NetworkIOMeter_attributes,
+@@ -179,5 +179,5 @@ const MeterClass NetworkIOMeter_class = {
     .name = "NetworkIO",
     .uiName = "Network IO",
--   .caption = "Network: "
-+   .caption = "Network "
+    .description = "Network bytes & packets received/sent per second",
+-   .caption = "Net: "
++   .caption = "Net "
  };
 diff --git a/SysArchMeter.c b/SysArchMeter.c
-index ab2112c6..2e52302f 100644
+index 35ce5409..2e17e26c 100644
 --- a/SysArchMeter.c
 +++ b/SysArchMeter.c
-@@ -41,5 +41,5 @@ const MeterClass SysArchMeter_class = {
+@@ -38,5 +38,5 @@ const MeterClass SysArchMeter_class = {
     .attributes = SysArchMeter_attributes,
     .name = "System",
     .uiName = "System",
@@ -126,7 +122,7 @@ index ab2112c6..2e52302f 100644
 +   .caption = "System ",
  };
 diff --git a/TasksMeter.c b/TasksMeter.c
-index 7cb8254e..43334de0 100644
+index 6d797894..f7890deb 100644
 --- a/TasksMeter.c
 +++ b/TasksMeter.c
 @@ -78,5 +78,5 @@ const MeterClass TasksMeter_class = {
@@ -137,16 +133,18 @@ index 7cb8254e..43334de0 100644
 +   .caption = "Tasks "
  };
 diff --git a/UptimeMeter.c b/UptimeMeter.c
-index 1f4f1bbb..dcb7e319 100644
+index 43ae2cef..12a201c5 100644
 --- a/UptimeMeter.c
 +++ b/UptimeMeter.c
-@@ -56,5 +56,5 @@ const MeterClass UptimeMeter_class = {
+@@ -57,7 +57,7 @@ const MeterClass UptimeMeter_class = {
     .attributes = UptimeMeter_attributes,
     .name = "Uptime",
     .uiName = "Uptime",
 -   .caption = "Uptime: "
 +   .caption = "Uptime "
  };
+ 
+ 
 -- 
-2.51.0
+2.53.0
 
diff --git a/sys-process/htop/0022-Make-ultra-long-separator-just-in-case.patch b/sys-process/htop/0022-Make-ultra-long-separator-just-in-case.patch
index c575a01..be4c37d 100644
--- a/sys-process/htop/0022-Make-ultra-long-separator-just-in-case.patch
+++ b/sys-process/htop/0022-Make-ultra-long-separator-just-in-case.patch
@@ -1,4 +1,4 @@
-From 2ab1671373bb5a1d29b2fe152537f69bf9e3e475 Mon Sep 17 00:00:00 2001
+From 714e82d60aa3e3fcbd97113006e4ae33d5c28aa7 Mon Sep 17 00:00:00 2001
 From: Jacopo De Simoi <wilderjds@protonmail.com>
 Date: Wed, 28 Sep 2022 15:19:08 -0400
 Subject: [PATCH 22/22] Make ultra-long separator just in case
@@ -8,10 +8,10 @@ Subject: [PATCH 22/22] Make ultra-long separator just in case
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Meter.c b/Meter.c
-index f1e40afe..d698e250 100644
+index 2fba5b35..69383ddc 100644
 --- a/Meter.c
 +++ b/Meter.c
-@@ -573,7 +573,7 @@ static void SeparatorMeter_updateValues(Meter* this) {
+@@ -634,7 +634,7 @@ static void SeparatorMeter_updateValues(Meter* this) {
  
  static void SeparatorMeter_display(const Object* cast, RichString* out) {
        RichString_writeWide(out, CRT_colors[DEFAULT_COLOR],
@@ -21,5 +21,5 @@ index f1e40afe..d698e250 100644
  
  static const int SeparatorMeter_attributes[] = {
 -- 
-2.51.0
+2.53.0