diff --git a/machines/universeair/sketchybar.nix b/machines/universeair/sketchybar.nix
index 555258a..0bcc8c8 100644
--- a/machines/universeair/sketchybar.nix
+++ b/machines/universeair/sketchybar.nix
@@ -1,4 +1,7 @@
 {config, pkgs, lib, ...}: {
+  environment.systemPackages = with pkgs; [
+    sketchybar
+  ];
   services.sketchybar = {
     enable = true;
     config = ''
diff --git a/machines/universeair/yabai.nix b/machines/universeair/yabai.nix
index ee7b2e8..e1da76b 100644
--- a/machines/universeair/yabai.nix
+++ b/machines/universeair/yabai.nix
@@ -1,7 +1,11 @@
 {config, pkgs, lib, ...}: {
   imports = [
     # Custom Bar
-    ./sketchybar.nix
+    # ./sketchybar.nix
+    # TODO: Customize Bar Later
+  ];
+  environment.systemPackages = with pkgs; [
+    yabai
   ];
   services.yabai = {
     enable = true;