diff --git a/config/cli/focal/main/sources/apt/zfs.gpg b/config/cli/focal/main/sources/apt/zfs.gpg
deleted file mode 100644
index a23a797ba4..0000000000
Binary files a/config/cli/focal/main/sources/apt/zfs.gpg and /dev/null differ
diff --git a/config/cli/focal/main/sources/apt/zfs.source b/config/cli/focal/main/sources/apt/zfs.source
deleted file mode 100644
index 31f52a9130..0000000000
--- a/config/cli/focal/main/sources/apt/zfs.source
+++ /dev/null
@@ -1 +0,0 @@
-deb [signed-by=/usr/share/keyrings/zfs.gpg] https://ppa.launchpadcontent.net/jonathonf/zfs/ubuntu/ focal main
diff --git a/config/cli/jammy/main/sources/apt/zfs.gpg b/config/cli/jammy/main/sources/apt/zfs.gpg
deleted file mode 100644
index a23a797ba4..0000000000
Binary files a/config/cli/jammy/main/sources/apt/zfs.gpg and /dev/null differ
diff --git a/config/cli/jammy/main/sources/apt/zfs.source b/config/cli/jammy/main/sources/apt/zfs.source
deleted file mode 100644
index 524d9acc94..0000000000
--- a/config/cli/jammy/main/sources/apt/zfs.source
+++ /dev/null
@@ -1 +0,0 @@
-deb [signed-by=/usr/share/keyrings/zfs.gpg] https://ppa.launchpadcontent.net/jonathonf/zfs/ubuntu/ jammy main
diff --git a/config/cli/kinetic/main/sources/apt/zfs.gpg b/config/cli/kinetic/main/sources/apt/zfs.gpg
deleted file mode 120000
index 8ddbbfdd84..0000000000
--- a/config/cli/kinetic/main/sources/apt/zfs.gpg
+++ /dev/null
@@ -1 +0,0 @@
-../../../../jammy/main/sources/apt/zfs.gpg
\ No newline at end of file
diff --git a/config/cli/kinetic/main/sources/apt/zfs.source b/config/cli/kinetic/main/sources/apt/zfs.source
deleted file mode 100644
index 524d9acc94..0000000000
--- a/config/cli/kinetic/main/sources/apt/zfs.source
+++ /dev/null
@@ -1 +0,0 @@
-deb [signed-by=/usr/share/keyrings/zfs.gpg] https://ppa.launchpadcontent.net/jonathonf/zfs/ubuntu/ jammy main
diff --git a/packages/bsp/common/etc/skel/.config/htop/htoprc b/packages/bsp/common/etc/skel/.config/htop/htoprc
index 3622c61cdc..716479ac8c 100644
--- a/packages/bsp/common/etc/skel/.config/htop/htoprc
+++ b/packages/bsp/common/etc/skel/.config/htop/htoprc
@@ -3,7 +3,8 @@
 fields=0 48 17 18 38 39 40 2 46 47 49 1
 sort_key=1
 sort_direction=1
-hide_threads=0
+tree_sort_key=0
+tree_sort_direction=1
 hide_kernel_threads=1
 hide_userland_threads=0
 shadow_other_users=0
@@ -12,29 +13,27 @@ show_program_path=1
 highlight_base_name=0
 highlight_megabytes=1
 highlight_threads=1
-tree_view=0
+highlight_changes=0
+highlight_changes_delay_secs=5
+find_comm_in_cmdline=1
+strip_exe_from_cmdline=1
+show_merged_command=0
+tree_view=1
+tree_view_always_by_pid=0
 header_margin=1
 detailed_cpu_time=0
-cpu_count_from_zero=0
+cpu_count_from_one=1
+show_cpu_usage=1
+show_cpu_frequency=0
+show_cpu_temperature=0
+degree_fahrenheit=0
 update_process_names=0
 account_guest_in_cpu_meter=0
 color_scheme=0
+enable_mouse=1
 delay=15
-left_meters=AllCPUs Memory Swap CpuFreq CpuTemp
-left_meter_modes=1 1 1 2 2
-right_meters=OSversion Hostname Tasks LoadAverage Uptime
-right_meter_modes=2 2 2 2 2
-# SBC hardware and Kernel specific path.
-# Editable manually.
-BoardName=
-CpuFreq_handler=
-CpuTemp_handler=
-CpuVCore_l_handler=
-CpuVCore_b_handler=
-GpuVCore_handler=
-GpuTemp_handler=
-# Wlan / Eth alias
-eth0_alias=
-eth1_alias=
-wlan0_alias=
-wlan1_alias=
+left_meters=AllCPUs2 Blank Memory Zram Swap
+left_meter_modes=1 2 1 1 1
+right_meters=Hostname Tasks LoadAverage DiskIO NetworkIO Uptime Systemd
+right_meter_modes=2 2 2 2 2 2 2
+hide_function_bar=0