From edc31073e36c635271f270aa44adc9ac8c731943 Mon Sep 17 00:00:00 2001
From: Jacopo De Simoi <jacopods@protonmail.com>
Date: Mon, 17 Nov 2025 12:56:27 -0500
Subject: [PATCH] Patch the right version

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

diff --git a/sys-process/htop/0001-Make-the-separator-between-columns-larger.patch b/sys-process/htop/0001-Make-the-separator-between-columns-larger.patch
deleted file mode 100644
index 1c620d1..0000000
--- a/sys-process/htop/0001-Make-the-separator-between-columns-larger.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From ab439368d73236c2f1927ddd2e1f6d4b62eac6eb Mon Sep 17 00:00:00 2001
-From: Jacopo De Simoi <wilderjds@protonmail.com>
-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 7447f718..8f90f2f3 100644
---- a/Header.c
-+++ b/Header.c
-@@ -194,12 +194,14 @@ void Header_reinit(Header* this) {
- void Header_draw(const Header* this) {
-    const int height = this->height;
-    const int pad = this->pad;
-+   const int sep = 3;
-+
-    attrset(CRT_colors[RESET_COLOR]);
-    for (int y = 0; y < height; y++) {
-       mvhline(y, 0, ' ', COLS);
-    }
-    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;
- 
-@@ -222,7 +224,7 @@ void Header_draw(const Header* this) {
-             except for multi column meters. */
-          if (meter->mode == TEXT_METERMODE && !Meter_isMultiColumn(meter)) {
-             for (int j = 1; j < meter->columnWidthCount; j++) {
--               actualWidth++; /* separator column */
-+               actualWidth+=sep; /* separator column */
-                actualWidth += (float)width * HeaderLayout_layouts[this->headerLayout].widths[col + j] / 100.0F;
-             }
-          }
-@@ -233,7 +235,7 @@ void Header_draw(const Header* this) {
-       }
- 
-       x += floorf(colWidth);
--      x++; /* separator column */
-+      x+= sep; /* separator column */
-    }
- }
- 
--- 
-2.51.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 1e9ba53..9f0af76 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 4a73d8e15c53f19eb17bad8c3e56ba797ebe30a3 Mon Sep 17 00:00:00 2001
+From 472f29d7cd702c98990682b897c45db4b8e6de4d 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,7 +8,7 @@ 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 40eaac10..6fdeb48b 100644
+index 01513503..6ee9bb13 100644
 --- a/CPUMeter.c
 +++ b/CPUMeter.c
 @@ -92,7 +92,7 @@ static void CPUMeter_updateValues(Meter* this) {
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 34877ea..93c05ec 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 7ca257d269245b91c7e811134f94f26a0fbc7b99 Mon Sep 17 00:00:00 2001
+From d1c2e7e0556ca290a538f20426f5e14ba5451b95 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 4f8f7667..331ef303 100644
+index 4463a90a..5982b436 100644
 --- a/Meter.c
 +++ b/Meter.c
-@@ -168,7 +168,7 @@ static void BarMeterMode_draw(Meter* this, int x, int y, int w) {
+@@ -141,7 +141,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 {
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 94cb37f..839b4be 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 ccab854b3aa26ebf8e014cb3aba92f295ff7157c Mon Sep 17 00:00:00 2001
+From 9fd3aa5ffdca50fcf5ce5c696a94e93bd0dfed1c 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 c92c1043..6f9f3b16 100644
+index 9c8b841a..bc26c148 100644
 --- a/CRT.c
 +++ b/CRT.c
-@@ -55,6 +55,8 @@ in the source distribution for its full text.
+@@ -54,6 +54,8 @@ in the source distribution for its full text.
  #define Cyan    COLOR_CYAN
  #define White   COLOR_WHITE
  
@@ -21,7 +21,7 @@ index c92c1043..6f9f3b16 100644
  #define ColorPairGrayBlack  ColorPair(Magenta,Magenta)
  #define ColorIndexGrayBlack ColorIndex(Magenta,Magenta)
  
-@@ -128,11 +130,11 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
+@@ -117,11 +119,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 c92c1043..6f9f3b16 100644
        [PANEL_SELECTION_UNFOCUS] = ColorPair(Black, White),
        [FAILED_SEARCH] = ColorPair(Red, Cyan),
 diff --git a/FunctionBar.c b/FunctionBar.c
-index 765fc4f7..e46f5136 100644
+index af4142e9..7111064d 100644
 --- a/FunctionBar.c
 +++ b/FunctionBar.c
-@@ -103,6 +103,7 @@ int FunctionBar_drawExtra(const FunctionBar* this, const char* buffer, int attr,
+@@ -101,6 +101,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]);
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 a23b494..8a6f557 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 9d35af61018a5dc1b0e6ce5a700dbdc08a231edf Mon Sep 17 00:00:00 2001
+From aefaf2857be0c92b911233a857f728779b1c7221 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 f82439d2..0e4721e0 100644
+index 7852c08f..1204317e 100644
 --- a/MainPanel.c
 +++ b/MainPanel.c
 @@ -25,16 +25,34 @@ in the source distribution for its full text.
diff --git a/sys-process/htop/0006-Add-separators.patch b/sys-process/htop/0006-Add-separators.patch
index 615afe3..a044741 100644
--- a/sys-process/htop/0006-Add-separators.patch
+++ b/sys-process/htop/0006-Add-separators.patch
@@ -1,4 +1,4 @@
-From ba44e8ffd3e7fc6590b7cb40a9d2563514a56142 Mon Sep 17 00:00:00 2001
+From 6a816953bdba86d9ebbe1884250079fb8816458d Mon Sep 17 00:00:00 2001
 From: Jacopo De Simoi <wilderjds@protonmail.com>
 Date: Fri, 27 May 2022 10:54:42 -0400
 Subject: [PATCH 06/22] Add separators
@@ -10,10 +10,10 @@ function bar.
  1 file changed, 18 insertions(+)
 
 diff --git a/Panel.c b/Panel.c
-index f0c38af6..fd37e416 100644
+index 4784a658..432865f3 100644
 --- a/Panel.c
 +++ b/Panel.c
-@@ -219,6 +219,13 @@ void Panel_splice(Panel* this, Vector* from) {
+@@ -218,6 +218,13 @@ void Panel_splice(Panel* this, Vector* from) {
     this->needsRedraw = true;
  }
  
@@ -27,7 +27,7 @@ index f0c38af6..fd37e416 100644
  void Panel_draw(Panel* this, bool force_redraw, bool focus, bool highlightSelected, bool hideFunctionBar) {
     assert (this != NULL);
  
-@@ -228,9 +235,15 @@ void Panel_draw(Panel* this, bool force_redraw, bool focus, bool highlightSelect
+@@ -227,9 +234,15 @@ void Panel_draw(Panel* this, bool force_redraw, bool focus, bool highlightSelect
     int x = this->x;
     int h = this->h;
  
@@ -43,7 +43,7 @@ index f0c38af6..fd37e416 100644
     const int header_attr = focus
                           ? CRT_colors[PANEL_HEADER_FOCUS]
                           : CRT_colors[PANEL_HEADER_UNFOCUS];
-@@ -253,6 +266,9 @@ void Panel_draw(Panel* this, bool force_redraw, bool focus, bool highlightSelect
+@@ -252,6 +265,9 @@ void Panel_draw(Panel* this, bool force_redraw, bool focus, bool highlightSelect
        h--;
     }
  
@@ -53,7 +53,7 @@ index f0c38af6..fd37e416 100644
     // ensure scroll area is on screen
     if (this->scrollV < 0) {
        this->scrollV = 0;
-@@ -331,6 +347,8 @@ void Panel_draw(Panel* this, bool force_redraw, bool focus, bool highlightSelect
+@@ -330,6 +346,8 @@ void Panel_draw(Panel* this, bool force_redraw, bool focus, bool highlightSelect
        RichString_delete(&old);
     }
  
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 1e20c32..6fa8b29 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 bc00da18c58a6842421a757c3e795f4b587b9415 Mon Sep 17 00:00:00 2001
+From 010042a27391dfa83fc80156a0a59645c94d0d40 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 6f9f3b16..1f2a0fc9 100644
+index bc26c148..def4fc1c 100644
 --- a/CRT.c
 +++ b/CRT.c
-@@ -85,8 +85,8 @@ static const char* const CRT_treeStrUtf8[LAST_TREE_STR] = {
+@@ -84,8 +84,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", // ─
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 575b319..b36d205 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 26232c296aabf06dfe3c8f2f3a57348617dbc3ad Mon Sep 17 00:00:00 2001
+From 839858e37b5444b6cba53f0ffdae32fc92454b5b 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 1f2a0fc9..8e4de503 100644
+index def4fc1c..02a85d74 100644
 --- a/CRT.c
 +++ b/CRT.c
-@@ -144,7 +144,7 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
+@@ -133,7 +133,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,
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 3b18656..15adfee 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 f49606a2dca4a6e29a5b01551c0556cb28ac400f Mon Sep 17 00:00:00 2001
+From 4dd31f658dafe38dfd64c361528055783063383a 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 8e4de503..10e85485 100644
+index 02a85d74..3d82a04f 100644
 --- a/CRT.c
 +++ b/CRT.c
-@@ -162,7 +162,7 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
+@@ -151,7 +151,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),
diff --git a/sys-process/htop/0010-Introduce-highlighted-pairs.patch b/sys-process/htop/0010-Introduce-highlighted-pairs.patch
index a154c62..8960bff 100644
--- a/sys-process/htop/0010-Introduce-highlighted-pairs.patch
+++ b/sys-process/htop/0010-Introduce-highlighted-pairs.patch
@@ -1,4 +1,4 @@
-From b2cc1850060ea96b73b5de8bf9df2918ea3c501f Mon Sep 17 00:00:00 2001
+From f4bb25aa2cbae876035dcd9beb6a9569e8171582 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 10e85485..b0fa39cd 100644
+index 3d82a04f..5cec84ab 100644
 --- a/CRT.c
 +++ b/CRT.c
-@@ -45,6 +45,7 @@ in the source distribution for its full text.
+@@ -44,6 +44,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 10e85485..b0fa39cd 100644
  
  #define Black   COLOR_BLACK
  #define Red     COLOR_RED
-@@ -130,9 +131,9 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
+@@ -119,9 +120,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 10e85485..b0fa39cd 100644
        [FUNCTION_BAR] = ColorPair(White, Black),
        [FUNCTION_KEY] = ColorPair(Accent, Black),
        [PANEL_SELECTION_FOLLOW] = ColorPair(Black, Yellow),
-@@ -1338,6 +1339,8 @@ void CRT_setColors(int colorScheme) {
+@@ -1202,6 +1203,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);
diff --git a/sys-process/htop/0011-Remove-Bar-borders.patch b/sys-process/htop/0011-Remove-Bar-borders.patch
index 7f96928..fb21111 100644
--- a/sys-process/htop/0011-Remove-Bar-borders.patch
+++ b/sys-process/htop/0011-Remove-Bar-borders.patch
@@ -1,38 +1,42 @@
-From 228f7448a37f4f3988fddd0255e44a680a547b14 Mon Sep 17 00:00:00 2001
+From b118cf8c48cae7912a9d7a9eea129e01f75fc684 Mon Sep 17 00:00:00 2001
 From: Jacopo De Simoi <wilderjds@protonmail.com>
-Date: Thu, 13 Nov 2025 21:26:27 -0500
+Date: Mon, 17 Nov 2025 12:48:55 -0500
 Subject: [PATCH 11/22] Remove Bar borders
 
-This is an experiment in Tufte-ism
 ---
- Meter.c | 7 +------
- 1 file changed, 1 insertion(+), 6 deletions(-)
+ Meter.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/Meter.c b/Meter.c
-index 331ef303..cb08f152 100644
+index 5982b436..e8708a93 100644
 --- a/Meter.c
 +++ b/Meter.c
-@@ -101,11 +101,7 @@ static void BarMeterMode_draw(Meter* this, int x, int y, int w) {
+@@ -80,12 +80,10 @@ static void BarMeterMode_draw(Meter* this, int x, int y, int w) {
+    w -= captionLen;
  
     // Draw the bar borders
-    if (w >= 1) {
--      x += captionLen;
--      attrset(CRT_colors[BAR_BORDER]);
--      mvaddch(y, x, '[');
--      w--;
--      mvaddch(y, x + w, ']');
+-   attrset(CRT_colors[BAR_BORDER]);
+-   mvaddch(y, x, '[');
+-   w--;
+-   mvaddch(y, x + MAXIMUM(w, 0), ']');
+-   w--;
+-   attrset(CRT_colors[RESET_COLOR]);
++   if (w >= 1) {
 +      x += captionLen + 1;
-       w--;
-    }
++      w--;
++   }
+ 
+    x++;
  
-@@ -119,7 +115,6 @@ static void BarMeterMode_draw(Meter* this, int x, int y, int w) {
-       goto end;
+@@ -93,6 +91,8 @@ static void BarMeterMode_draw(Meter* this, int x, int y, int w) {
+       return;
     }
-    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
 
diff --git a/sys-process/htop/0012-Implement-highlight-methods.patch b/sys-process/htop/0012-Implement-highlight-methods.patch
index 98fc6bc..bbcbbcc 100644
--- a/sys-process/htop/0012-Implement-highlight-methods.patch
+++ b/sys-process/htop/0012-Implement-highlight-methods.patch
@@ -1,4 +1,4 @@
-From 9ad0e22be9db595d39e9ec3f6e8471f4d4382ef4 Mon Sep 17 00:00:00 2001
+From 47495c0dd0f71693b22cacb1900d431db6d9771c 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 fd37e416..6f2e14cc 100644
+index 432865f3..8d6fa17c 100644
 --- a/Panel.c
 +++ b/Panel.c
-@@ -306,7 +306,7 @@ void Panel_draw(Panel* this, bool force_redraw, bool focus, bool highlightSelect
+@@ -305,7 +305,7 @@ void Panel_draw(Panel* this, bool force_redraw, bool focus, bool highlightSelect
           }
           if (item.highlightAttr) {
              attrset(item.highlightAttr);
@@ -23,10 +23,10 @@ index fd37e416..6f2e14cc 100644
           }
           mvhline(y + line, x, ' ', this->w);
 diff --git a/RichString.c b/RichString.c
-index fcb4e358..52e7a099 100644
+index 390beb07..85e037f2 100644
 --- a/RichString.c
 +++ b/RichString.c
-@@ -160,6 +160,25 @@ inline void RichString_setAttrn(RichString* this, int attrs, size_t start, size_
+@@ -160,6 +160,25 @@ inline void RichString_setAttrn(RichString* this, int attrs, int start, int char
     }
  }
  
@@ -52,7 +52,7 @@ index fcb4e358..52e7a099 100644
  void RichString_appendChr(RichString* this, int attrs, char c, int count) {
     int from = this->chlen;
     int newLen = from + count;
-@@ -243,6 +262,10 @@ void RichString_setAttr(RichString* this, int attrs) {
+@@ -242,6 +261,10 @@ void RichString_setAttr(RichString* this, int attrs) {
     RichString_setAttrn(this, attrs, 0, this->chlen);
  }
  
@@ -64,12 +64,12 @@ index fcb4e358..52e7a099 100644
     return RichString_writeFromWide(this, attrs, data, this->chlen, strlen(data));
  }
 diff --git a/RichString.h b/RichString.h
-index f6eeb902..2a61c91d 100644
+index 7783378b..cd584398 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, size_t start, size_t charcount);
+ void RichString_setAttrn(RichString* this, int attrs, int start, int charcount);
  
 +void RichString_highlightn(RichString* this, int start, int charcount);
 +
diff --git a/sys-process/htop/0013-Implement-rudimentary-separator.patch b/sys-process/htop/0013-Implement-rudimentary-separator.patch
index b44b3e5..6994cb5 100644
--- a/sys-process/htop/0013-Implement-rudimentary-separator.patch
+++ b/sys-process/htop/0013-Implement-rudimentary-separator.patch
@@ -1,4 +1,4 @@
-From ddd7754ecd1eda821a6f928e6528649707a087a3 Mon Sep 17 00:00:00 2001
+From 6c9992fd9f5ac01cee80d8db6200950820a1746e 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 cb08f152..5a823d66 100644
+index e8708a93..df9122da 100644
 --- a/Meter.c
 +++ b/Meter.c
-@@ -111,6 +111,16 @@ static void BarMeterMode_draw(Meter* this, int x, int y, int w) {
-       this->total = MAXIMUM(sum, this->total);
-    }
+@@ -87,6 +87,16 @@ static void BarMeterMode_draw(Meter* this, int x, int y, int w) {
+ 
+    x++;
  
 +    if (caption[0] == 0) {
 +       // This should be a check for being a blank meter
@@ -28,9 +28,9 @@ index cb08f152..5a823d66 100644
 +
 +
     if (w < 1) {
-       goto end;
+       return;
     }
-@@ -610,3 +620,34 @@ const MeterClass BlankMeter_class = {
+@@ -548,3 +558,34 @@ const MeterClass BlankMeter_class = {
     .uiName = "Blank",
     .caption = ""
  };
@@ -66,10 +66,10 @@ index cb08f152..5a823d66 100644
 +   .caption = ""
 +};
 diff --git a/Meter.h b/Meter.h
-index d81e8d8b..6564880e 100644
+index b53a8232..404dca2f 100644
 --- a/Meter.h
 +++ b/Meter.h
-@@ -155,4 +155,6 @@ ListItem* Meter_toListItem(const Meter* this, bool moving);
+@@ -148,4 +148,6 @@ ListItem* Meter_toListItem(const Meter* this, bool moving);
  
  extern const MeterClass BlankMeter_class;
  
@@ -77,7 +77,7 @@ index d81e8d8b..6564880e 100644
 +
  #endif
 diff --git a/linux/Platform.c b/linux/Platform.c
-index a0bfbfa9..975b5cb0 100644
+index 5da8bbac..682e4910 100644
 --- a/linux/Platform.c
 +++ b/linux/Platform.c
 @@ -238,6 +238,7 @@ const MeterClass* const Platform_meterTypes[] = {
diff --git a/sys-process/htop/0014-Put-Kernel-CPU-first.patch b/sys-process/htop/0014-Put-Kernel-CPU-first.patch
index d3c4787..e573a0b 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 3501705c0c0db188575c74d3cd1dc95ee3bc8235 Mon Sep 17 00:00:00 2001
+From 0c604a0635b3875efcaa42bafd7a135765e5ad98 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 6fdeb48b..90e7353d 100644
+index 6ee9bb13..07fd5816 100644
 --- a/CPUMeter.c
 +++ b/CPUMeter.c
 @@ -26,9 +26,9 @@ in the source distribution for its full text.
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 5b37763..4f1d463 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 040927bdc39048ef004985b157d68b50c6d4ace2 Mon Sep 17 00:00:00 2001
+From f0228ab9636a561bc70d2bee0330ad266fc1a39b 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 b0fa39cd..9c6a3dbf 100644
+index 5cec84ab..52ee28dc 100644
 --- a/CRT.c
 +++ b/CRT.c
-@@ -157,10 +157,10 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
+@@ -146,10 +146,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 b0fa39cd..9c6a3dbf 100644
        [PROCESS_TREE] = ColorPair(Cyan, Black),
        [PROCESS_RUN_STATE] = ColorPair(Green, Black),
        [PROCESS_D_STATE] =  ColorPair(Magenta, Black),
-@@ -169,7 +169,7 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
+@@ -158,7 +158,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 b0fa39cd..9c6a3dbf 100644
        [PROCESS_COMM] = ColorPair(Magenta, Black),
        [PROCESS_THREAD_COMM] = A_BOLD | ColorPair(Blue, Black),
        [PROCESS_PRIV] = ColorPair(Magenta, Black),
-@@ -189,10 +189,10 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
+@@ -178,10 +178,10 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
        [HUGEPAGE_1] = ColorPair(Green, Black),
        [HUGEPAGE_2] = ColorPair(Yellow, Black),
        [HUGEPAGE_3] = ColorPair(Red, Black),
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 41ec5d3..05e7cd0 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 83472f671f654ef6fe8d3dce5a4b4c6036f119f2 Mon Sep 17 00:00:00 2001
+From 7eaa9ac853fb946a279b088341b180ccc9faf6d7 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 9c6a3dbf..d84acf2c 100644
+index 52ee28dc..c00bd09c 100644
 --- a/CRT.c
 +++ b/CRT.c
-@@ -137,7 +137,7 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
+@@ -126,7 +126,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),
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 2cc3605..592f6ac 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 879fc4e51d18957f0b0f2cd2c137fd9ce3a34fc1 Mon Sep 17 00:00:00 2001
+From a649ec55a55d9bb832a7c09470346fe13ea8faf4 Mon Sep 17 00:00:00 2001
 From: Jacopo De Simoi <wilderjds@protonmail.com>
-Date: Mon, 17 Nov 2025 09:55:12 -0500
+Date: Mon, 17 Nov 2025 12:50:57 -0500
 Subject: [PATCH 17/22] Put margin in each column
 
 ---
  Header.c |  2 +-
- Meter.c  | 11 ++++++++---
- 2 files changed, 9 insertions(+), 4 deletions(-)
+ Meter.c  | 19 +++++++++++++------
+ 2 files changed, 14 insertions(+), 7 deletions(-)
 
 diff --git a/Header.c b/Header.c
-index 8f90f2f3..760789ce 100644
+index 87cba5cc..5d6d531d 100644
 --- a/Header.c
 +++ b/Header.c
 @@ -194,7 +194,7 @@ void Header_reinit(Header* this) {
@@ -22,34 +22,42 @@ index 8f90f2f3..760789ce 100644
     attrset(CRT_colors[RESET_COLOR]);
     for (int y = 0; y < height; y++) {
 diff --git a/Meter.c b/Meter.c
-index 5a823d66..b3f15759 100644
+index df9122da..f1e40afe 100644
 --- a/Meter.c
 +++ b/Meter.c
-@@ -63,9 +63,10 @@ static void TextMeterMode_draw(Meter* this, int x, int y, int w) {
-    assert(w <= INT_MAX - x);
+@@ -50,8 +50,11 @@ static inline void Meter_displayBuffer(const Meter* this, RichString* out) {
  
+ static void TextMeterMode_draw(Meter* this, int x, int y, int w) {
     const char* caption = Meter_getCaption(this);
--   if (w > 0) {
--      attrset(CRT_colors[METER_TEXT]);
--      mvaddnstr(y, x, caption, w);
+-   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]);
  
-@@ -93,6 +94,10 @@ static void BarMeterMode_draw(Meter* this, int x, int y, int w) {
+    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) {
     // 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
 +   }
-+
-    if (w >= captionLen) {
-       attrset(CRT_colors[METER_TEXT]);
-       mvaddnstr(y, x, caption, captionLen);
++   int captionLen = strlen(caption);
++   if (w >= captionLen) {
++      attrset(CRT_colors[METER_TEXT]);
++      mvaddnstr(y, x, caption, captionLen);
++   }
+    w -= captionLen;
+ 
+    // Draw the bar borders
 -- 
 2.51.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 8bef438..7f128db 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 6b072ad0dbe16f7ffef34a6c6d4ec537148da06f Mon Sep 17 00:00:00 2001
+From eb921819250f8a4114c2cf8fe926932da15dde9f 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 6f2e14cc..1644e4f4 100644
+index 8d6fa17c..e155625b 100644
 --- a/Panel.c
 +++ b/Panel.c
-@@ -306,7 +306,8 @@ void Panel_draw(Panel* this, bool force_redraw, bool focus, bool highlightSelect
+@@ -305,7 +305,8 @@ void Panel_draw(Panel* this, bool force_redraw, bool focus, bool highlightSelect
           }
           if (item.highlightAttr) {
              attrset(item.highlightAttr);
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 f11695a..9d9ab87 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 869c68863a88ef64de37a4d45997256a4a461d88 Mon Sep 17 00:00:00 2001
+From 4cc02b37ed48c20e9554ce441376fe4cf9a0fd35 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,7 +8,7 @@ Subject: [PATCH 19/22] Better spacing for sorted column
  1 file changed, 1 insertion(+)
 
 diff --git a/Table.c b/Table.c
-index 9bedfc70..03cc7711 100644
+index 42aab427..00cd088e 100644
 --- a/Table.c
 +++ b/Table.c
 @@ -311,6 +311,7 @@ void Table_printHeader(const Settings* settings, RichString* header) {
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 a8fe552..b89440a 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 1d71c67f19cd3b596ffc12c26a63a11bfe4d4886 Mon Sep 17 00:00:00 2001
+From f69cce0f72ca91081c83cc2b31f2347d4c6bccba 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 f522b753..6d797894 100644
+index fc1e4b0e..7cb8254e 100644
 --- a/TasksMeter.c
 +++ b/TasksMeter.c
-@@ -60,7 +60,7 @@ static void TasksMeter_display(const Object* cast, RichString* out) {
+@@ -61,7 +61,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);
diff --git a/sys-process/htop/0021-Remove-from-captions.patch b/sys-process/htop/0021-Remove-from-captions.patch
index 7a20e33..36b85d8 100644
--- a/sys-process/htop/0021-Remove-from-captions.patch
+++ b/sys-process/htop/0021-Remove-from-captions.patch
@@ -1,27 +1,27 @@
-From 9629d4c287b9ef301245e5701bff0c28dfe795b7 Mon Sep 17 00:00:00 2001
+From e9223b3f615cbde162de845b4237c296b6ab46cf Mon Sep 17 00:00:00 2001
 From: Jacopo De Simoi <wilderjds@protonmail.com>
-Date: Mon, 17 Nov 2025 10:02:29 -0500
-Subject: [PATCH 21/22] Remove ':' from captions
+Date: Mon, 17 Nov 2025 12:52:14 -0500
+Subject: [PATCH 21/22] Remove ':" from captions
 
 ---
  BatteryMeter.c     | 2 +-
  ClockMeter.c       | 2 +-
  DateMeter.c        | 2 +-
  DateTimeMeter.c    | 2 +-
- DiskIOMeter.c      | 6 +++---
+ DiskIOMeter.c      | 2 +-
  HostnameMeter.c    | 2 +-
  LoadAverageMeter.c | 4 ++--
  NetworkIOMeter.c   | 2 +-
  SysArchMeter.c     | 2 +-
  TasksMeter.c       | 2 +-
  UptimeMeter.c      | 2 +-
- 11 files changed, 14 insertions(+), 14 deletions(-)
+ 11 files changed, 12 insertions(+), 12 deletions(-)
 
 diff --git a/BatteryMeter.c b/BatteryMeter.c
-index 7ab1bac9..1e3c36d2 100644
+index 001249d4..8e2d714f 100644
 --- a/BatteryMeter.c
 +++ b/BatteryMeter.c
-@@ -69,5 +69,5 @@ const MeterClass BatteryMeter_class = {
+@@ -68,5 +68,5 @@ const MeterClass BatteryMeter_class = {
     .attributes = BatteryMeter_attributes,
     .name = "Battery",
     .uiName = "Battery",
@@ -62,36 +62,16 @@ index c4ec0def..5dd19b49 100644
 +   .caption = "Date & Time ",
  };
 diff --git a/DiskIOMeter.c b/DiskIOMeter.c
-index 264074aa..8ea4787f 100644
+index 4bb689fa..ba6b5449 100644
 --- a/DiskIOMeter.c
 +++ b/DiskIOMeter.c
-@@ -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 = {
+@@ -162,5 +162,5 @@ const MeterClass DiskIOMeter_class = {
+    .attributes = DiskIOMeter_attributes,
     .name = "DiskIO",
     .uiName = "Disk IO",
-    .description = "Disk IO rate & time combined display",
--   .caption = "Dsk: ",
-+   .caption = "Dsk ",
-    .draw = DiskIOMeter_draw,
-    .init = DiskIOMeter_init,
-    .updateMode = DiskIOMeter_updateMode,
+-   .caption = "Disk IO: "
++   .caption = "Disk IO "
+ };
 diff --git a/HostnameMeter.c b/HostnameMeter.c
 index e8b2befb..91c7f638 100644
 --- a/HostnameMeter.c
@@ -104,10 +84,10 @@ index e8b2befb..91c7f638 100644
 +   .caption = "Hostname ",
  };
 diff --git a/LoadAverageMeter.c b/LoadAverageMeter.c
-index a0b05f2b..8cd352d7 100644
+index 6bf13a03..bec53222 100644
 --- a/LoadAverageMeter.c
 +++ b/LoadAverageMeter.c
-@@ -117,7 +117,7 @@ const MeterClass LoadAverageMeter_class = {
+@@ -116,7 +116,7 @@ const MeterClass LoadAverageMeter_class = {
     .name = "LoadAverage",
     .uiName = "Load average",
     .description = "Load averages: 1 minute, 5 minutes, 15 minutes",
@@ -116,7 +96,7 @@ index a0b05f2b..8cd352d7 100644
  };
  
  const MeterClass LoadMeter_class = {
-@@ -136,5 +136,5 @@ const MeterClass LoadMeter_class = {
+@@ -134,5 +134,5 @@ const MeterClass LoadMeter_class = {
     .name = "Load",
     .uiName = "Load",
     .description = "Load: average of ready processes in the last minute",
@@ -124,10 +104,10 @@ index a0b05f2b..8cd352d7 100644
 +   .caption = "Load "
  };
 diff --git a/NetworkIOMeter.c b/NetworkIOMeter.c
-index c5719ba1..869ed1f9 100644
+index 784c90ac..fc819ebc 100644
 --- a/NetworkIOMeter.c
 +++ b/NetworkIOMeter.c
-@@ -178,5 +178,5 @@ const MeterClass NetworkIOMeter_class = {
+@@ -175,5 +175,5 @@ const MeterClass NetworkIOMeter_class = {
     .attributes = NetworkIOMeter_attributes,
     .name = "NetworkIO",
     .uiName = "Network IO",
@@ -135,7 +115,7 @@ index c5719ba1..869ed1f9 100644
 +   .caption = "Network "
  };
 diff --git a/SysArchMeter.c b/SysArchMeter.c
-index 3c1f2796..529304c1 100644
+index ab2112c6..2e52302f 100644
 --- a/SysArchMeter.c
 +++ b/SysArchMeter.c
 @@ -41,5 +41,5 @@ const MeterClass SysArchMeter_class = {
@@ -146,7 +126,7 @@ index 3c1f2796..529304c1 100644
 +   .caption = "System ",
  };
 diff --git a/TasksMeter.c b/TasksMeter.c
-index 6d797894..f7890deb 100644
+index 7cb8254e..43334de0 100644
 --- a/TasksMeter.c
 +++ b/TasksMeter.c
 @@ -78,5 +78,5 @@ const MeterClass TasksMeter_class = {
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 5050fc7..c575a01 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 4638e3658b387eac29fa38d76fcda027f68a3fb1 Mon Sep 17 00:00:00 2001
+From 2ab1671373bb5a1d29b2fe152537f69bf9e3e475 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 b3f15759..b76df3d1 100644
+index f1e40afe..d698e250 100644
 --- a/Meter.c
 +++ b/Meter.c
-@@ -633,7 +633,7 @@ static void SeparatorMeter_updateValues(Meter* this) {
+@@ -573,7 +573,7 @@ static void SeparatorMeter_updateValues(Meter* this) {
  
  static void SeparatorMeter_display(const Object* cast, RichString* out) {
        RichString_writeWide(out, CRT_colors[DEFAULT_COLOR],