diff --git a/hosts/remote/tuisto/packages.nix b/hosts/remote/tuisto/packages.nix
index 1c6fb70..376e6a8 100644
--- a/hosts/remote/tuisto/packages.nix
+++ b/hosts/remote/tuisto/packages.nix
@@ -17,50 +17,29 @@
   ];
   
   
-  environment.systemPackages = with pkgs;
-  [
+  environment.systemPackages = with pkgs; [
     adw-gtk3                  # GTK3 libadwaita Theme ported to GTK-3
     appimage-run              # Appimage Runner
-    bibletime                 # Bible Study Tool
-    bleachbit                 # PC Cleaner
     btop                      # Resource Monitor
-    calibre                   # eBook Library
     cpu-x                     # PC Information
-    crow-translate            # Language Translator
-    dino                      # XMPP Client
     dconf                     # Gnome Configuration
-    easytag                   # Music Tag Editor
-    freetube                  # YouTube Front-End
-    gImageReader              # Tesseract-OCR Front-End
     gnome.gnome-tweaks        # Gnome Customization Tool  
     git                       # Distributed Version Control System
-    gpodder                   # Podcast Manager
     gsmartcontrol             # Disk Health Inspection Tool
     hplip                     # HP Print Drivers
     i2c-tools                 # Network Utilities
     inetutils                 # Network Utilities
     libsForQt5.kolourpaint    # Painting Application
-    mpv                       # Media Player
     neofetch                  # System Information
+    nitch                     # Nim System Fetch
     ntfs3g                    # FUSE Client
-    onlyoffice-bin            # Office Suite
     p7zip                     # File Archiver
     papirus-icon-theme        # Icons
-    pdfarranger               # PDF Arranger
     phinger-cursors           # Cursor Theme
     powertop                  # Power Manager
     protonup                  # Proton Installer
-    retroarchFull             # Multi-Platform Emulator
-    smplayer                  # Media Player
-    solaar                    # Logitech Unifying Receiver
-    speedcrunch               # Calculator
-    strawberry                # Media Player
     syncthing                 # File Synchronization
     tldr                      # Simplified man pages
-    tixati                    # Torrent Application
-    ventoy-bin                # USB Boot App
-    veracrypt                 # Filesystem Encryption
-    vscodium                  # Code Editor
     waydroid                  # Android Emulator
   ];
 }
diff --git a/users/admin/home-manager.nix b/users/admin/home-manager.nix
index 8d9b10b..245db0f 100644
--- a/users/admin/home-manager.nix
+++ b/users/admin/home-manager.nix
@@ -2,12 +2,31 @@
 
 {
   home-manager.users.admin = { pkgs, ... }: {
-     home.packages = with pkgs; [
+    home.packages = with pkgs; [
       adobe-reader              # PDF Reader (for government forms mainly)
+      bibletime                 # Bible Study Tool
+      bleachbit                 # PC Cleaner
+      calibre                   # eBook Library
+      crow-translate            # Language Translator
+      dino                      # XMPP Client
+      easytag                   # Music Tag Editor
+      freetube                  # YouTube Front-End
+      gImageReader              # Tesseract-OCR Front-End
+      gpodder                   # Podcast Manager
       keepassxc                 # GUI Password Manager with Cryptography
       kitty                     # Terminal Emulator
-      nitch                     # Nim System Fetch
+      mpv                       # Media Player
+      onlyoffice-bin            # Office Suite
+      pdfarranger               # PDF Arranger
+      retroarchFull             # Multi-Platform Emulator
       rili                      # Children's Train Game
+      smplayer                  # Media Player
+      solaar                    # Logitech Unifying Receiver
+      speedcrunch               # Calculator
+      strawberry                # Media Player
+      ventoy-bin                # USB Boot App
+      veracrypt                 # Filesystem Encryption
+      vscodium                  # Code Editor
       xorg.xkill                # Kill Windows w/ Mouse
     ];
 
@@ -20,24 +39,14 @@
         bierner.markdown-emoji
         bierner.emojisense
         bierner.markdown-mermaid
-        #dendron.dendron
-        #dendron.dendron-markdown-preview-enhanced
-        #dendron.dendron-paste-image
         donjayamanne.githistory
         file-icons.file-icons
         foam.foam-vscode
-        #garlicbreadcleric.pandoc-markdown-syntax
-        #goodbaikin.org-preview
-        #pkief.markdown-checkbox
-        #mathiassoeholm.markdown-link-updater
-        #nimsaem.nimvscode
-        #skn0tt.markdown-link-expander
         jnoortheen.nix-ide
         piousdeer.adwaita-theme
         shd101wyy.markdown-preview-enhanced
         svsool.markdown-memo
         yzhang.markdown-all-in-one
-        #vscode-org-mode.org-mode
       ];
   };