diff --git a/content/accessibility.md b/content/accessibility.md
index d9567e3da9..0da1628c97 100644
--- a/content/accessibility.md
+++ b/content/accessibility.md
@@ -11,7 +11,7 @@ facebookImage: /_social/article
 twitterImage: /_social/article
 
 hidden: false
-section: software
+section: pop
 tableOfContents: true
 ---
 
diff --git a/content/add-a-printer-pop.md b/content/add-a-printer-pop.md
index 6883063c0d..32afa4a4e4 100644
--- a/content/add-a-printer-pop.md
+++ b/content/add-a-printer-pop.md
@@ -12,7 +12,7 @@ facebookImage: /_social/article
 twitterImage: /_social/article
 
 hidden: false
-section: hardware
+section: pop
 tableOfContents: true
 ---
 
diff --git a/content/add-a-printer-ubuntu.md b/content/add-a-printer-ubuntu.md
index b72a42e0f5..9103cb7376 100644
--- a/content/add-a-printer-ubuntu.md
+++ b/content/add-a-printer-ubuntu.md
@@ -12,7 +12,7 @@ facebookImage: /_social/article
 twitterImage: /_social/article
 
 hidden: false
-section: hardware
+section: ubuntu
 tableOfContents: true
 ---
 
diff --git a/content/ar-sandbox.md b/content/ar-sandbox.md
index e8d522b1dc..6d9c0eda20 100644
--- a/content/ar-sandbox.md
+++ b/content/ar-sandbox.md
@@ -1,5 +1,5 @@
 ---
-title: AR Sandbox
+title: Augmented Reality Sandbox
 description: Calibrate and use your new AR Sandbox
 keywords:
  - AR
@@ -11,7 +11,7 @@ facebookImage: /_social/article
 twitterImage: /_social/article
 
 hidden: false
-section: hardware
+section: case-studies
 tableOfContents: true
 ---
 
diff --git a/content/bash-scripting-basics.md b/content/bash-scripting-basics.md
index 88caccc56b..219ccff988 100644
--- a/content/bash-scripting-basics.md
+++ b/content/bash-scripting-basics.md
@@ -10,7 +10,7 @@ facebookImage: /_social/article
 twitterImage: /_social/article
 
 hidden: false
-section: about-your-os
+section: switching
 tableOfContents: true
 ---
 
diff --git a/content/boot-menu.md b/content/boot-menu.md
index 1674386f4f..354549216b 100644
--- a/content/boot-menu.md
+++ b/content/boot-menu.md
@@ -12,7 +12,7 @@ facebookImage: /_social/article
 twitterImage: /_social/article
 
 hidden: false
-section: software
+section: about-your-computer
 tableOfContents: true
 ---
 
diff --git a/content/codecs.md b/content/codecs.md
index b378a4d81d..d615e6964d 100644
--- a/content/codecs.md
+++ b/content/codecs.md
@@ -1,7 +1,7 @@
 ---
 title: Watch Videos and Play Music (MP3, DVD, etc.)
 description: >
-  Proprietary multimedia formats, such as MP3 files and DVD decoders, aren't included by default. To enable playback of these media, please see this document.
+  Enable playback of proprietary multimedia formats, such as MP3 files.
 keywords:
   - Support
   - multimedia
diff --git a/content/customize-dock.md b/content/customize-dock.md
index 2529e680c2..68159f8c6c 100644
--- a/content/customize-dock.md
+++ b/content/customize-dock.md
@@ -1,7 +1,7 @@
 ---
 title: Dock (Move or Customize)
 description: >
-  How to move the Dock to different areas of the screen and customize other settings.
+  Move the Dock to different areas of the screen and customize.
 keywords:
   - Launcher
   - Bottom
@@ -16,7 +16,7 @@ facebookImage: /_social/article
 twitterImage: /_social/article
 
 hidden: false
-section: software
+section: pop
 tableOfContents: true
 
 redirect_from:
diff --git a/content/customize-gnome.md b/content/customize-gnome.md
index 1311983601..d9b2f24e10 100644
--- a/content/customize-gnome.md
+++ b/content/customize-gnome.md
@@ -1,7 +1,7 @@
 ---
-title: Pop!_OS Customization
+title: Pop!_OS 22.04 Customization
 description: >
-  Pop with the GNOME desktop is highly customizable!  See here to get started making your desktop just right for you.
+  Pop 22.04 with the GNOME desktop is highly customizable!
 keywords:
   - Pop_OS!
   - GNOME
@@ -14,7 +14,7 @@ facebookImage: /_social/article
 twitterImage: /_social/article
 
 hidden: false
-section: software
+section: Pop
 tableOfContents: true
 ---
 
diff --git a/content/desktop-environment.md b/content/desktop-environment.md
index 83d31888b1..253ff39275 100644
--- a/content/desktop-environment.md
+++ b/content/desktop-environment.md
@@ -1,7 +1,7 @@
 ---
-title: Desktop Environment (Change)
+title: Change Desktop Environment (Pop!_OS 22.04)
 description: >
-  Pop!_OS Comes with GNOME by default.  Follow these instructions to install additional desktop environments.
+  Pop!_OS 22.04 Comes with GNOME by default.  Follow these instructions to install additional desktop environments.
 keywords:
   - desktop environment
   - MATE
@@ -15,7 +15,7 @@ facebookImage: /_social/article
 twitterImage: /_social/article
 
 hidden: false
-section: software
+section: pop
 tableOfContents: true
 ---
 
diff --git a/content/desktop-zoom.md b/content/desktop-zoom.md
index af2376bb80..2aacb3ba78 100644
--- a/content/desktop-zoom.md
+++ b/content/desktop-zoom.md
@@ -1,7 +1,7 @@
 ---
 title: Zoom-in or Enlarge Desktop
 description: >
-  Zooming in or enlarging your desktop interface can be done through the Settings panel.
+  Zoom in or enlarge your desktop interface.
 keywords:
   - zoom desktop
   - zoom in
@@ -13,7 +13,7 @@ facebookImage: /_social/article
 twitterImage: /_social/article
 
 hidden: false
-section: software-accessibility
+section: pop
 ---
 
 ## Zoom in or Enlarge Desktop
diff --git a/content/difference-between-pop-ubuntu.md b/content/difference-between-pop-ubuntu.md
index 53c2366fec..36ef234b46 100644
--- a/content/difference-between-pop-ubuntu.md
+++ b/content/difference-between-pop-ubuntu.md
@@ -13,7 +13,7 @@ facebookImage: /_social/article
 twitterImage: /_social/article
 
 hidden: false
-section: about-your-os
+section: switching
 tableOfContents: true
 ---
 
diff --git a/content/extra-drive.md b/content/extra-drive.md
index 6e96cf8e74..d3ddf01ba2 100644
--- a/content/extra-drive.md
+++ b/content/extra-drive.md
@@ -1,7 +1,7 @@
 ---
 title: Auto-Mount Second Hard Drive(s)
 description: >
-  If you ordered your computer with additional storage, it comes pre-formatted and ready for use. For instructions on automatically mounting an additional hard drive, check out this extra drive documentation.
+  Automatically mount additional hard drives.
 keywords:
   - extra drive
   - mount
@@ -14,7 +14,7 @@ facebookImage: /_social/article
 twitterImage: /_social/article
 
 hidden: false
-section: software
+section: about-your-computer
 tableOfContents: true
 
 redirect_from:
diff --git a/content/fan-noise.md b/content/fan-noise.md
index 55d3c415a9..f275462644 100644
--- a/content/fan-noise.md
+++ b/content/fan-noise.md
@@ -10,7 +10,7 @@ facebookImage: /_social/article
 twitterImage: /_social/article
 
 hidden: false
-section: software
+section: about-your-computer
 tableOfContents: true
 ---
 
diff --git a/content/finding-command-help.md b/content/finding-command-help.md
index 349cefd37a..1c83d7cf70 100644
--- a/content/finding-command-help.md
+++ b/content/finding-command-help.md
@@ -14,7 +14,7 @@ facebookImage: /_social/article
 twitterImage: /_social/article
 
 hidden: false
-section: about-your-os
+section: switching
 tableOfContents: true
 ---
 
diff --git a/content/fix-raw-image-previews.md b/content/fix-raw-image-previews.md
index edeb0d1817..8af1b05fd1 100644
--- a/content/fix-raw-image-previews.md
+++ b/content/fix-raw-image-previews.md
@@ -1,5 +1,5 @@
 ---
-title: Fix Raw Image Previews
+title: Raw Image Previews
 description: >
    Add a custom thumbnail generator to display thumbnails for raw image in Files.
 keywords:
@@ -12,7 +12,7 @@ facebookImage: /_social/article
 twitterImage: /_social/article
 
 hidden: false
-section: software-troubleshooting
+section: media
 tableOfContents: true
 ---
 
diff --git a/content/flash-firmware-from-usb.md b/content/flash-firmware-from-usb.md
index 6d280469c0..59f1455a1d 100644
--- a/content/flash-firmware-from-usb.md
+++ b/content/flash-firmware-from-usb.md
@@ -11,7 +11,7 @@ facebookImage: /_social/article
 twitterImage: /_social/article
 
 hidden: false
-section: software-troubleshooting
+section: about-your-computer
 tableOfContents: true
 ---
 
diff --git a/content/graphics-switch-pop.md b/content/graphics-switch-pop.md
index abf69d6f47..a235d99b08 100644
--- a/content/graphics-switch-pop.md
+++ b/content/graphics-switch-pop.md
@@ -17,7 +17,7 @@ facebookImage: /_social/article
 twitterImage: /_social/article
 
 hidden: false
-section: software
+section: about-your-computer
 tableOfContents: true
 ---
 
diff --git a/content/hdmi-audio.md b/content/hdmi-audio.md
index 6b0515607f..803487c842 100644
--- a/content/hdmi-audio.md
+++ b/content/hdmi-audio.md
@@ -1,7 +1,7 @@
 ---
 title: HDMI Audio Configuration
 description: >
-  Here is how to play audio over an HDMI or DisplayPort connection.
+  Play audio over an HDMI or DisplayPort connection.
 keywords:
   - hdmi
   - audio settings
@@ -12,7 +12,7 @@ facebookImage: /_social/article
 twitterImage: /_social/article
 
 hidden: false
-section: software
+section: media
 tableOfContents: true
 ---
 
diff --git a/content/hidpi-multi-monitor.md b/content/hidpi-multi-monitor.md
index f30467ca43..3ca5df576d 100644
--- a/content/hidpi-multi-monitor.md
+++ b/content/hidpi-multi-monitor.md
@@ -1,7 +1,7 @@
 ---
 title: HiDPI Multi-Monitor Support
 description: >
-  Mixing HiDPI and LoDpi displays can be complicated.  Learn what to do and how System76 automates this for you!
+  Mixing HiDPI and LoDpi displays on multiple monitors.
 keywords:
   - hidpi
   - system76 driver
@@ -15,7 +15,7 @@ facebookImage: /_social/article
 twitterImage: /_social/article
 
 hidden: false
-section: software
+section: media
 tableOfContents: true
 ---
 
diff --git a/content/intel-me.md b/content/intel-me.md
index 0ce2d689c6..fd6d35a80c 100644
--- a/content/intel-me.md
+++ b/content/intel-me.md
@@ -1,7 +1,7 @@
 ---
 title: What is the Intel Management Engine?
 description: >
-    This article describes the Intel Management Engine, scenarios in which the IME is disabled, and how to manually disable on systems running coreboot.
+    How to manually disable on systems running coreboot.
 keywords:
   - Firmware
   - Intel ME
@@ -13,7 +13,7 @@ facebookImage: /_social/article
 twitterImage: /_social/article
 
 hidden: false
-section: software
+section: about-your-computer
 tableOfContents: true
 ---
 
diff --git a/content/laptop-battery-thresholds.md b/content/laptop-battery-thresholds.md
index 657ec404f5..cb1ebbc445 100644
--- a/content/laptop-battery-thresholds.md
+++ b/content/laptop-battery-thresholds.md
@@ -12,7 +12,7 @@ facebookImage: /_social/article
 twitterImage: /_social/article
 
 hidden: false
-section: hardware
+section: about-your-computer
 tableOfContents: true
 ---
 
diff --git a/content/launch-keyboard.md b/content/launch-keyboard.md
index d90b80c016..041d9b43a5 100644
--- a/content/launch-keyboard.md
+++ b/content/launch-keyboard.md
@@ -15,7 +15,7 @@ facebookImage: /_social/article
 twitterImage: /_social/article
 
 hidden: false
-section: software
+section: about-your-computer
 tableOfContents: true
 ---
 
diff --git a/content/launch_2-firmware-update.md b/content/launch_2-firmware-update.md
index 9381d409bc..5ee981dba0 100644
--- a/content/launch_2-firmware-update.md
+++ b/content/launch_2-firmware-update.md
@@ -1,7 +1,7 @@
 ---
 title: Manual steps to update firmware on Launch and Launch Heavy keyboards
 description: >
-  Launch firmware before version 0.12.20 will need these manual steps to make sure they can reliably upgrade firmware with `fwupd`
+  Launch firmware before version 0.12.20 requires these steps to upgrade firmware with `fwupd`
 keywords:
   - Firmware
   - Open Firmware
@@ -13,7 +13,7 @@ facebookImage: /_social/article
 twitterImage: /_social/article
 
 hidden: false
-section: software-troubleshooting
+section: about-your-computer
 tableOfContents: true
 ---
 
diff --git a/content/linux-gaming.md b/content/linux-gaming.md
index e481cf055c..3b5fb36c78 100644
--- a/content/linux-gaming.md
+++ b/content/linux-gaming.md
@@ -1,7 +1,7 @@
 ---
 title: Gaming on Pop!_OS
 description: >
-   Want to game on your super awesome new System76 machine?  Take a look at these instructions to set your system up for gaming!
+   Set your system up for gaming!
 keywords:
   - gaming
   - support
diff --git a/content/log-files.md b/content/log-files.md
index b32afa6ce2..a3380b637b 100644
--- a/content/log-files.md
+++ b/content/log-files.md
@@ -13,7 +13,7 @@ facebookImage: /_social/article
 twitterImage: /_social/article
 
 hidden: false
-section: software-troubleshooting
+section: about-your-computer
 tableOfContents: true
 ---
 
diff --git a/content/manage-repos-pop.md b/content/manage-repos-pop.md
index 7d2ef7cd3b..48d210aa26 100644
--- a/content/manage-repos-pop.md
+++ b/content/manage-repos-pop.md
@@ -20,7 +20,7 @@ facebookImage: /_social/article
 twitterImage: /_social/article
 
 hidden: false
-section: software
+section: pop
 tableOfContents: true
 ---
 
diff --git a/content/new-web-infrastructure.md b/content/new-web-infrastructure.md
index 7addf8d295..a4e5f04d46 100644
--- a/content/new-web-infrastructure.md
+++ b/content/new-web-infrastructure.md
@@ -15,7 +15,7 @@ facebookImage: /_social/article
 twitterImage: /_social/article
 
 hidden: false
-section: repairs-returns
+section: about-your-computer
 tableOfContents: true
 ---
 
diff --git a/content/open-firmware-smmstore.md b/content/open-firmware-smmstore.md
index 1947220cb7..3be720a71b 100644
--- a/content/open-firmware-smmstore.md
+++ b/content/open-firmware-smmstore.md
@@ -12,7 +12,7 @@ facebookImage: /_social/article
 twitterImage: /_social/article
 
 hidden: false
-section: software-troubleshooting
+section: about-your-computer
 tableOfContents: true
 ---
 
diff --git a/content/open-firmware-systems.md b/content/open-firmware-systems.md
index 1334c2b317..31bbffeaae 100644
--- a/content/open-firmware-systems.md
+++ b/content/open-firmware-systems.md
@@ -9,7 +9,7 @@ facebookImage: /_social/article
 twitterImage: /_social/article
 
 hidden: false
-section: general-hardware-info
+section: about-your-computer
 tableOfContents: true
 ---
 
diff --git a/content/other-accounts.md b/content/other-accounts.md
index 0ca451a1a9..a6221bfcf4 100644
--- a/content/other-accounts.md
+++ b/content/other-accounts.md
@@ -12,7 +12,7 @@ facebookImage: /_social/article
 twitterImage: /_social/article
 
 hidden: false
-section: software
+section: pop
 tableOfContents: true
 ---
 
diff --git a/content/pop-basics.md b/content/pop-basics.md
index cf6681ff6b..8239e67f83 100644
--- a/content/pop-basics.md
+++ b/content/pop-basics.md
@@ -1,7 +1,7 @@
 ---
 title: Pop!_OS Basics
 description: >
-  Learn how to navigate your new Pop!_OS desktop environment with a few easy tips.
+  Learn how to navigate your new Pop!_OS desktop environment.
 keywords:
   - Support
   - Pop!
diff --git a/content/pop-cosmic-keyboard-shortcuts.md b/content/pop-cosmic-keyboard-shortcuts.md
index 1ad270fe5b..8dc4744d50 100644
--- a/content/pop-cosmic-keyboard-shortcuts.md
+++ b/content/pop-cosmic-keyboard-shortcuts.md
@@ -1,5 +1,5 @@
 ---
-title: Pop!_OS New COSMIC Keyboard Shortcuts
+title: Pop!_OS 24.04 LTS COSMIC Keyboard Shortcuts
 description: Learn how master using COSMIC with your keyboard.
 keywords:
   - keyboard
diff --git a/content/pop-keyboard-shortcuts.md b/content/pop-keyboard-shortcuts.md
index b32872d8f6..f21e48d30b 100644
--- a/content/pop-keyboard-shortcuts.md
+++ b/content/pop-keyboard-shortcuts.md
@@ -1,5 +1,5 @@
 ---
-title: Pop!_OS Keyboard Shortcuts
+title: Pop!_OS 22.04 LTS Keyboard Shortcuts
 description: Learn how master using Pop!_OS with your keyboard.
 keywords:
   - keyboard
diff --git a/content/pop-recovery.md b/content/pop-recovery.md
index 2415c4a900..9b84cdb489 100644
--- a/content/pop-recovery.md
+++ b/content/pop-recovery.md
@@ -15,7 +15,7 @@ facebookImage: /_social/article
 twitterImage: /_social/article
 
 hidden: false
-section: software-troubleshooting
+section: pop
 tableOfContents: true
 ---
 
diff --git a/content/ppa-third-party.md b/content/ppa-third-party.md
index 8bcafedd0f..31da7fe117 100644
--- a/content/ppa-third-party.md
+++ b/content/ppa-third-party.md
@@ -1,7 +1,7 @@
 ---
 title: Keep PPAs Enabled when Upgrading Releases
 description: >
-  Upgrading to a new releases disables PPAs and third party repos.  Learn how to keep your PPA or third party repo enabled during upgrades.
+  How to keep your PPA or third party repo enabled during upgrades.
 keywords:
   - ppa
   - disabled
diff --git a/content/reboxing.md b/content/reboxing.md
index 4fec7802a0..73102b76f8 100644
--- a/content/reboxing.md
+++ b/content/reboxing.md
@@ -11,7 +11,7 @@ facebookImage: /_social/article
 twitterImage: /_social/article
 
 hidden: false
-section: repairs-returns
+section: about-your-computer
 tableOfContents: true
 ---
 
diff --git a/content/serval-dac.md b/content/serval-dac.md
index d09659bec6..b0728c78ff 100644
--- a/content/serval-dac.md
+++ b/content/serval-dac.md
@@ -15,7 +15,7 @@ facebookImage: /_social/article
 twitterImage: /_social/article
 
 hidden: false
-section: hardware-troubleshooting
+section: about-your-computer
 tableOfContents: true
 ---
 
diff --git a/content/shipping.md b/content/shipping.md
index 3db4c9fb0c..78f547a2e1 100644
--- a/content/shipping.md
+++ b/content/shipping.md
@@ -11,7 +11,7 @@ facebookImage: /_social/article
 twitterImage: /_social/article
 
 hidden: false
-section: repairs-returns
+section: about-your-computer
 tableOfContents: true
 ---
 
diff --git a/content/system-firmware.md b/content/system-firmware.md
index d2325c4579..18f30b7ba5 100644
--- a/content/system-firmware.md
+++ b/content/system-firmware.md
@@ -12,7 +12,7 @@ facebookImage: /_social/article
 twitterImage: /_social/article
 
 hidden: false
-section: software
+section: about-your-computer
 tableOfContents: true
 ---
 
diff --git a/content/system76-driver.md b/content/system76-driver.md
index 35963b041b..af470e8fa1 100644
--- a/content/system76-driver.md
+++ b/content/system76-driver.md
@@ -12,7 +12,7 @@ facebookImage: /_social/article
 twitterImage: /_social/article
 
 hidden: false
-section: software
+section: about-your-computer
 tableOfContents: true
 ---
 
diff --git a/content/terminal-basics.md b/content/terminal-basics.md
index 9ab37d7c34..bcd3875740 100644
--- a/content/terminal-basics.md
+++ b/content/terminal-basics.md
@@ -13,7 +13,7 @@ facebookImage: /_social/article
 twitterImage: /_social/article
 
 hidden: false
-section: about-your-os
+section: switching
 tableOfContents: true
 ---
 
diff --git a/content/thelio-power-button.md b/content/thelio-power-button.md
index 555d820a10..023ec272f3 100644
--- a/content/thelio-power-button.md
+++ b/content/thelio-power-button.md
@@ -11,7 +11,7 @@ facebookImage: /_social/article
 twitterImage: /_social/article
 
 hidden: false
-section: hardware
+section: about-your-computer
 tableOfContents: true
 ---
 
diff --git a/content/transition-firmware.md b/content/transition-firmware.md
index c69ad42e74..57bf5197cd 100644
--- a/content/transition-firmware.md
+++ b/content/transition-firmware.md
@@ -9,7 +9,7 @@ facebookImage: /_social/article
 twitterImage: /_social/article
 
 hidden: false
-section: software
+section: about-your-computer
 tableOfContents: true
 ---
 
diff --git a/content/upgrade-pop.md b/content/upgrade-pop.md
index 0171830542..bde6d68a0a 100644
--- a/content/upgrade-pop.md
+++ b/content/upgrade-pop.md
@@ -1,7 +1,7 @@
 ---
 title: Upgrade Pop!_OS
 description: >
-  Get the newest version of Pop!_OS on your computer! Check out our upgrade directions.
+  Upgrade to the newest version of Pop!_OS on your computer!
 keywords:
   - Pop!_OS 17.10
   - Pop!_OS 18.04
@@ -26,7 +26,7 @@ facebookImage: /_social/article
 twitterImage: /_social/article
 
 hidden: false
-section: software
+section: pop
 tableOfContents: true
 ---
 
diff --git a/content/use-amd-fsr.md b/content/use-amd-fsr.md
index 7c5f066ee0..2f8bcd9da7 100644
--- a/content/use-amd-fsr.md
+++ b/content/use-amd-fsr.md
@@ -1,7 +1,7 @@
 ---
 title: Use AMD FidelityFX SuperResolution (FSR) on Pop!_OS
 description: >
-   Want to use AMD's FidelityFX SuperResolution to increase your gaming performance?  Take a look at these instructions to set your games up for FSR!
+   Use AMD's FidelityFX SuperResolution to increase gaming performance.
 keywords:
   - gaming
   - support
diff --git a/content/use-vpn-software.md b/content/use-vpn-software.md
index 09232a5f7b..25eceb0313 100644
--- a/content/use-vpn-software.md
+++ b/content/use-vpn-software.md
@@ -1,7 +1,7 @@
 ---
 title: Install and Use VPNs
 description: >
-  This page will go over setting up and using OpenVPN to browse the internet more securely in places like airports, cafe shops and more.
+  Set up and use OpenVPN to browse the internet more securely in places like airports, cafe shops and more.
 keywords:
   - OpenVPN
   - Security
diff --git a/content/using-flatpak.md b/content/using-flatpak.md
index c5909f9978..f113770fcf 100644
--- a/content/using-flatpak.md
+++ b/content/using-flatpak.md
@@ -18,7 +18,7 @@ facebookImage: /_social/article
 twitterImage: /_social/article
 
 hidden: false
-section: software
+section: pop
 tableOfContents: true
 ---
 
diff --git a/content/virtualization.md b/content/virtualization.md
index 76a96c85aa..07450134dd 100644
--- a/content/virtualization.md
+++ b/content/virtualization.md
@@ -17,7 +17,7 @@ facebookImage: /_social/article
 twitterImage: /_social/article
 
 hidden: false
-section: software
+section: switching
 tableOfContents: true
 ---
 
diff --git a/pages/index.vue b/pages/index.vue
index 2b895e4d2f..d010d9c983 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -106,11 +106,11 @@
       <div class="px-4 py-3 flex flex-col bg-white rounded-lg">
         <div class="mx-4 my-4 md:min-h-[4rem]">
           <h2 class="sys-article-h3">
-            Support Documentation
+            Service Manuals
           </h2>
 
           <p class="text-lg my-4 text-warm-gray-600">
-            Search helpful documentation for answers to a variety of questions or issues.
+            Detailed parts and repair information for System76 hardware.
           </p>
         </div>
 
@@ -134,43 +134,6 @@
             </nuxt-link>
           </li>
 
-          <li>
-            <nuxt-link
-              to="#troubleshoot"
-              class="flex items-center px-4 py-3 transition duration-150 ease-in-out rounded-md group hover:bg-gray-100 focus:outline-none focus:ring-2 focus:ring-orange-500"
-            >
-              <div class="flex items-center justify-center flex-shrink-0 w-10 h-10 rounded-full bg-warm-gray-600 text-white sm:h-12 sm:w-12 transition duration-150 ease-in-out group-hover:bg-orange-500 group-focus:bg-orange-500">
-                <font-awesome-icon icon="search" />
-              </div>
-              <div class="ml-4">
-                <p class="font-bold text-warm-gray-800">
-                  Troubleshoot
-                </p>
-                <p class="text-warm-gray-600">
-                  Detailed solutions for prominent issues.
-                </p>
-              </div>
-            </nuxt-link>
-          </li>
-
-          <li>
-            <nuxt-link
-              to="#tune"
-              class="flex items-center px-4 py-3 transition duration-150 ease-in-out rounded-md group hover:bg-gray-100 focus:outline-none focus:ring-2 focus:ring-orange-500"
-            >
-              <div class="flex items-center justify-center flex-shrink-0 w-10 h-10 rounded-full bg-warm-gray-600 text-white sm:h-12 sm:w-12 transition duration-150 ease-in-out group-hover:bg-orange-500 group-focus:bg-orange-500">
-                <font-awesome-icon icon="wrench" />
-              </div>
-              <div class="ml-4">
-                <p class="font-bold text-warm-gray-800">
-                  Tune
-                </p>
-                <p class="text-warm-gray-600">
-                  Information on how to upgrade, maintain, and customize your system.
-                </p>
-              </div>
-            </nuxt-link>
-          </li>
         </ul>
       </div>
 
@@ -186,24 +149,6 @@
         </div>
 
         <ul class="space-y-2 md:space-y-4">
-          <li>
-            <a
-              href="/articles/before-you-open-a-support-ticket"
-              class="flex items-center px-4 py-3 transition duration-150 ease-in-out rounded-md group hover:bg-gray-100 focus:outline-none focus:ring-2 focus:ring-orange-500"
-            >
-              <div class="flex items-center justify-center flex-shrink-0 w-10 h-10 rounded-full bg-warm-gray-600 text-white sm:h-12 sm:w-12 transition duration-150 ease-in-out group-hover:bg-orange-500 group-focus:bg-orange-500">
-                <font-awesome-icon icon="bolt" />
-              </div>
-              <div class="ml-4">
-                <p class="font-bold text-warm-gray-800">
-                  Before You Open a Ticket
-                </p>
-                <p class="text-warm-gray-600">
-                  A troubleshooting triage to help you self-diagnose a variety of issues.
-                </p>
-              </div>
-            </a>
-          </li>
 
           <li>
             <a
@@ -305,65 +250,39 @@ export default {
     search: '',
     results: [],
 
-    listings: [{
-      title: 'Troubleshoot',
-      section: 'troubleshoot',
-      listings: [{
-        title: 'Software Troubleshooting',
-        section: 'software-troubleshooting'
-      }, {
-        title: 'Network Troubleshooting',
-        section: 'network-troubleshooting'
-      }, {
-        title: 'Hardware Troubleshooting',
-        section: 'hardware-troubleshooting'
-      }, {
-        title: 'Repairs and Returns',
-        section: 'repairs-returns'
-      }]
-    }, {
-      title: 'Tune',
-      section: 'tune',
-      listings: [{
-        title: 'Software',
-        section: 'software'
-      }, {
-        title: 'Hardware',
-        section: 'hardware'
-      }]
-    }, {
-      title: 'Learn',
-      section: 'learn',
-      listings: [{
-        title: 'Switching To Linux',
-        section: 'switching'
-      }, {
-        title: 'About Your Computer',
-        section: 'about-your-computer'
-      }, {
-        title: 'About Your Operating System',
-        section: 'about-your-os'
-      }, {
-        title: 'About Pop!_OS',
-        section: 'pop'
-      }, {
-        title: 'About Ubuntu',
-        section: 'ubuntu'
-      }, {
-        title: 'Media',
-        section: 'media'
-      }, {
-        title: 'General Hardware Information',
-        section: 'general-hardware-info'
-      }]
-    }, {
-      title: 'Community Articles',
-      description: 'The following documents have been graciously submitted by community members. They have not been checked for accuracy, completeness, or style. Please contact the contributors through their GitHub accounts for any questions.',
-      section: 'community'
-    }, {
-      title: 'Case Studies',
-      section: 'case-studies'
-    }]
+    listings: [
+      {
+        listings: [
+          { title: 'Getting Started with Pop!_OS', section: 'pop' },
+          { title: 'System76 Hardware', section: 'about-your-computer' },
+          { title: 'Media', section: 'media' },
+          { title: 'Software Troubleshooting', section: 'software-troubleshooting' },
+          { title: 'Network Troubleshooting', section: 'network-troubleshooting' },
+          { title: 'Hardware Troubleshooting', section: 'hardware-troubleshooting' }
+        ]
+      },
+      {
+        listings: [
+          { title: 'Software Installation and Tips', section: 'software' },
+          { title: 'Hardware Configuration', section: 'hardware' }
+        ]
+      },
+      {
+        listings: [
+          { title: 'Switching To Linux', section: 'switching' },
+          { title: 'Getting Started with Ubuntu', section: 'ubuntu' }
+        ]
+      },
+      {
+        title: 'Community Articles',
+        description: 'The following documents have been graciously submitted by community members. They have not been checked for accuracy, completeness, or style. Please contact the contributors through their GitHub accounts for any questions.',
+        section: 'community'
+      },
+      {
+        title: 'Case Studies',
+        section: 'case-studies'
+      }
+    ]
   }),
 
   async fetch () {