diff --git a/README.md b/README.md
index cceb9bf..ad2c951 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ These files are for the systems themselves such as my custom desktop, Thinkpad X
 | Hostname   | About | Role | Architecture    |
 | ----------:| -----:| ----:| ---------------:|
 | `shepard`  | System76 nebula49 | 🖥️ | `x86_64-linux`  |
-| `edi`      | custom build for homelab stuff | ☁️ | `x86_64-linux`  |
+| `edi`      | Home Server | ☁️ | `x86_64-linux`  |
 | `garrus`   | System76 Lemur Pro (lemp13) | 💻 | `x86_64-linux`  |
 | `drack`    | Thinkpad X13s | 💻 | `aarch64-linux` |
 | `jaal`     | PineBook Pro | 💻 | `aarch64-linux` |
@@ -40,9 +40,12 @@ These files are for the systems themselves such as my custom desktop, Thinkpad X
 
 | Service   | Replacement |
 | ---------:| -----------:|
-| Immich | Google Photos |
-| Navidrome | Google Music |
-| Jellyfin | Netflix |
+| `Immich` | `Google Photos` |
+| `Navidrome` | `Google Music` |
+| `Jellyfin` | `Netflix` |
+| `Audiobookshelf` | `Audible` |
+| `Kavita` | `Google Play Books` |
+| `Forgejo` | `GitHub` |
 
 ### Desktop Nix files: (nix-configs/desktops/)
 
diff --git a/configuration.nix b/configuration.nix
index c9a14eb..df3e347 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -60,9 +60,9 @@
    environment.systemPackages = 
       with pkgs; 
       [
+         # nixpkgs CLI tools
          avahi
          dmidecode
-         firefox
          freshfetch
          git
          git-lfs         
@@ -73,8 +73,13 @@
          unzip
          wget
          xz
+         zellij
          zlib
+         
+         # GUI tools
+         firefox
 
+         # Flake CLI tools
          inputs.pinix.packages.${system}.default
          ]; 
  
diff --git a/desktops/cosmic.nix b/desktops/cosmic.nix
index 9b15a62..8baf49b 100644
--- a/desktops/cosmic.nix
+++ b/desktops/cosmic.nix
@@ -2,9 +2,8 @@
 
 {
   # COSMIC
-  services.xserver = {
-    enable = true;
-    displayManager.gdm.enable = true;
+  services = {
+    displayManager.cosmic-greeter.enable = true;
     desktopManager.cosmic.enable = true;
   };