diff --git a/bundles/htop/files/htoprc.global b/bundles/htop/files/htoprc.global
new file mode 100644
index 0000000..159bd07
--- /dev/null
+++ b/bundles/htop/files/htoprc.global
@@ -0,0 +1,39 @@
+# Beware! This file is rewritten by htop when settings are changed in the interface.
+# The parser is also very primitive, and not human-friendly.
+fields=0 48 17 18 38 39 40 2 46 47 49 1
+sort_key=46
+sort_direction=-1
+tree_sort_key=0
+tree_sort_direction=1
+hide_kernel_threads=0
+hide_userland_threads=0
+shadow_other_users=0
+show_thread_names=0
+show_program_path=1
+highlight_base_name=0
+highlight_megabytes=1
+highlight_threads=1
+highlight_changes=0
+highlight_changes_delay_secs=5
+find_comm_in_cmdline=1
+strip_exe_from_cmdline=1
+show_merged_command=0
+tree_view=0
+tree_view_always_by_pid=0
+header_margin=1
+detailed_cpu_time=0
+cpu_count_from_one=1
+show_cpu_usage=0
+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=Hostname Tasks DiskIO NetworkIO Blank CPU Memory Swap Blank LeftCPUs${cpus_per_row}
+left_meter_modes=2 2 2 2 2 1 1 1 2 1
+right_meters=CPU Blank PressureStallCPUSome PressureStallMemorySome PressureStallIOSome Blank RightCPUs${cpus_per_row}
+right_meter_modes=3 2 1 1 1 2 1
+hide_function_bar=0
diff --git a/bundles/htop/items.py b/bundles/htop/items.py
new file mode 100644
index 0000000..0ad878c
--- /dev/null
+++ b/bundles/htop/items.py
@@ -0,0 +1,8 @@
+files = {
+    '/etc/htoprc.global': {
+        'content_type': 'mako',
+        'context': {
+            'cpus_per_row': 4 if node.metadata.get('vm/threads', node.metadata.get('vm/cores', 1)) > 8 else 2,
+        },
+    },
+}
diff --git a/bundles/htop/metadata.py b/bundles/htop/metadata.py
new file mode 100644
index 0000000..61f46bd
--- /dev/null
+++ b/bundles/htop/metadata.py
@@ -0,0 +1,7 @@
+defaults = {
+    'apt': {
+        'packages': {
+            'htop': {},
+        },
+    },
+}
diff --git a/bundles/zsh/files/zprofile b/bundles/zsh/files/zprofile
index 358ac29..aa9f911 100644
--- a/bundles/zsh/files/zprofile
+++ b/bundles/zsh/files/zprofile
@@ -9,10 +9,8 @@
 alias s='sudo su - root -s /usr/bin/zsh'
 
 function hhtop {
-    # mkdir -p ~/.config/htop
-    # cp /etc/htoprc.global ~/.config/htop/htoprc
-    # cp /etc/htoprc.global ~/.htoprc
-    rm -rf ~/.config/htop ~/.htoprc
+    mkdir -p ~/.config/htop
+    cp /etc/htoprc.global ~/.config/htop/htoprc
     htop
 }
 
diff --git a/groups/os/linux.py b/groups/os/linux.py
index 64ca998..17c658d 100644
--- a/groups/os/linux.py
+++ b/groups/os/linux.py
@@ -5,6 +5,7 @@
     'bundles': [
         'hostname',
         'hosts',
+        'htop',
         'locale',
         'network',
         'ssh',