diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix
index 7db49bc..ac81454 100644
--- a/hosts/desktop/home.nix
+++ b/hosts/desktop/home.nix
@@ -6,12 +6,11 @@
   home.username = "joshuaelm";
   home.homeDirectory = "/home/joshuaelm";
 
-  imports = [ ../../modules/nvim ../../modules/stylix.nix ../../modules/hypr/hyprland_desktop.nix ../../modules/ashell/default.nix ../../modules/waybar/waybar.nix ];
+  imports = [ ../../modules/nvim ../../modules/stylix.nix ../../modules/hypr/hyprland_desktop.nix ../../modules/ashell/default.nix ../../modules/waybar/waybar.nix ../../modules/ashell ];
 
 
   home.packages = [
     pkgs.element-desktop
-    pkgs.waybar
     pkgs.signal-desktop-bin
     pkgs.swaybg
     pkgs.gpu-screen-recorder
diff --git a/hosts/mac-laptop/configuration.nix b/hosts/mac-laptop/configuration.nix
index 27e8779..e61eb39 100644
--- a/hosts/mac-laptop/configuration.nix
+++ b/hosts/mac-laptop/configuration.nix
@@ -115,8 +115,6 @@
     enable = true;
   };
 
-  hardware.asahi.useExperimentalGPUDriver = true;
-  hardware.asahi.experimentalGPUInstallMode = "replace";
 
   # Configure keymap in X11
   services.xserver.xkb = {
@@ -180,7 +178,7 @@
   git
   bibata-cursors
   element-desktop
-  rofi-wayland
+  rofi
   inputs.zen-browser.packages.${pkgs.system}.default
   playerctl
   cava
diff --git a/hosts/mac-laptop/home.nix b/hosts/mac-laptop/home.nix
index 8e7dbe5..5733478 100644
--- a/hosts/mac-laptop/home.nix
+++ b/hosts/mac-laptop/home.nix
@@ -6,12 +6,11 @@
   home.username = "joshuaelm";
   home.homeDirectory = "/home/joshuaelm";
 
-  imports = [ ../../modules/nvim ../../modules/stylix.nix ../../modules/hypr/hyprland_laptop.nix ../../modules/waybar/waybar.nix  ];
+  imports = [ ../../modules/nvim ../../modules/stylix.nix ../../modules/hypr/hyprland_laptop.nix ../../modules/waybar/waybar.nix ../../modules/ashell  ];
 
 
   home.packages = [
     pkgs.element-desktop
-    pkgs.waybar
     pkgs.signal-desktop-bin
     pkgs.supersonic
     pkgs.adw-gtk3
@@ -23,7 +22,6 @@
   programs.cava.enable = true;
   programs.btop.enable = true;
   programs.rofi.enable = true;
-  programs.rofi.package = pkgs.rofi-wayland;
   services.hyprpaper.enable = true;
   wayland.windowManager.hyprland.enable = true;
 
diff --git a/modules/ashell/default.nix b/modules/ashell/default.nix
index 08a8188..2676e5d 100644
--- a/modules/ashell/default.nix
+++ b/modules/ashell/default.nix
@@ -30,7 +30,7 @@
     settings = {
       remove_airplane_btn = true;
       appearance = {
-       style = "Islands";
+       style = "Solid";
       };
     };
   };
diff --git a/modules/hypr/hyprland_desktop.nix b/modules/hypr/hyprland_desktop.nix
index ff38532..1e7c827 100644
--- a/modules/hypr/hyprland_desktop.nix
+++ b/modules/hypr/hyprland_desktop.nix
@@ -14,7 +14,7 @@ monitor = DP-1, highres@highrr, 0x0, 1
 exec-once = hyprctl dispatch workspace 1
 #exec-once = linux-wallpaperengine --screen-root HDMI-A-1 --silent --fps 60 3000562427
 exec-once = hyprlock
-exec-once = waybar
+exec-once = ashell
 exec-once = pw-metadata -n settings 0 clock.force-quantum 2048
 # exec-once = ashell
 exec-once = systemctl --user start hyprpolkitagent
@@ -75,7 +75,7 @@ windowrulev2 = immediate, class:^(cs2)$
 decoration {
     # See https://wiki.hyprland.org/Configuring/Variables/ for more
 
-    rounding = 10
+    rounding = 0
    
     blur {
         enabled = yes
diff --git a/modules/hypr/hyprland_laptop.nix b/modules/hypr/hyprland_laptop.nix
index 5563189..8f0eeda 100644
--- a/modules/hypr/hyprland_laptop.nix
+++ b/modules/hypr/hyprland_laptop.nix
@@ -15,7 +15,7 @@ monitor = eDP-1, highres@highrr, 0x0, 1.6
 exec-once = hyprctl dispatch workspace 1
 #exec-once = linux-wallpaperengine --screen-root HDMI-A-1 --silent --fps 60 3000562427
 exec-once = hyprlock
-exec-once = waybar
+exec-once = ashell
 # exec-once = WGPU_BACKEND=gl ashell 
 exec-once = systemctl --user start hyprpolkitagent
 # See https://wiki.hyprland.org/Configuring/Keywords/ for more
@@ -69,7 +69,7 @@ general {
 decoration {
     # See https://wiki.hyprland.org/Configuring/Variables/ for more
 
-    rounding = 10
+    rounding = 0
    
     blur {
         enabled = yes
@@ -110,10 +110,6 @@ dwindle {
 
 layerrule = unset, overlay
 
-gestures {
-    # See https://wiki.hyprland.org/Configuring/Variables/ for more
-    workspace_swipe = off
-}
 
 misc {
     # See https://wiki.hyprland.org/Configuring/Variables/ for more
diff --git a/modules/waybar/waybar.nix b/modules/waybar/waybar.nix
index 63b63a6..3d16a0a 100644
--- a/modules/waybar/waybar.nix
+++ b/modules/waybar/waybar.nix
@@ -6,7 +6,7 @@
 {
   layer = "top";
   position = "top";
-  margin = "5, 5, 5, 5";
+  #margin = "5, 5, 5, 5";
   modules-left = [ "hyprland/workspaces"];
   modules-center = [ "mpris" ];
   modules-right = [ "cava" "clock" "network" "pulseaudio/slider" "tray" ];
@@ -48,11 +48,11 @@
     * {
       font-family: "Roboto";
       font-size: 17px;
-      border-radius: 10px;
+      border-radius: 0px;
     }
 
     window#waybar {
-      margin: 0 4px;
+      margin: 0 0px;
     }
 
     #network {
@@ -75,7 +75,7 @@
       margin-right: 5px;
     }
 
-    .modules-left {
+    /*.modules-left {
       background: @base02;
       box-shadow: 0px 0px 5px 0px #101010;
     }
@@ -88,7 +88,7 @@
     .modules-right {
       background: @base02;
       box-shadow: 0px 0px 5px 0px #101010;
-    }
+    }*/
 
 
     window > box {
@@ -102,17 +102,19 @@
     #pulseaudio-slider slider {
       min-height: 0px;
       min-width: 0px;
+      border-radius: 10px;
 
     }
 
     #pulseaudio-slider trough {
       min-width: 60px;
       border-radius: 10px;
-      background-color: @base0D
+      background-color: @base0D;
     }
 
     #pulseaudio-slider highlight {
       background-color: @base0C;
+      border-radius: 10px;
     }
   '';
 }