diff --git a/nix/flake.nix b/nix/flake.nix
index cd28995e..2f1ac871 100644
--- a/nix/flake.nix
+++ b/nix/flake.nix
@@ -39,7 +39,7 @@
     };
     userSettings = {
       user = "joey";
-      theme = "nature-blue";
+      theme = "gruvbox-warm";
       wm = "hyprland";
     };
     lib = nixpkgs.lib;
diff --git a/nix/home-manager/app/vscode/vscode.nix b/nix/home-manager/app/vscode/vscode.nix
index 813abb39..2dcf02d6 100644
--- a/nix/home-manager/app/vscode/vscode.nix
+++ b/nix/home-manager/app/vscode/vscode.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, lib, ... }:
 {
   ## Nix LSP
   home.packages = with pkgs; [ nixd ];
@@ -6,6 +6,7 @@
   programs.vscode = {
     enable = true;
     package = pkgs.vscodium;
+    mutableExtensionsDir = true;
     extensions = with pkgs.vscode-extensions; [
       jnoortheen.nix-ide
       continue.continue
@@ -14,6 +15,31 @@
       "nix.serverPath" = "nixd";
       "nix.enableLanguageServer" = true;
       "explorer.confirmDragAndDrop" = false;
+      "workbench.colorTheme" = "Stylix";
+      "editor.fontFamily" = lib.mkForce "'Symbols Nerd Font Mono', 'PowerlineSymbols', 'DejaVu Sans Mono'";
+    };
+    userTasks = {
+      version = "2.0.0";
+      tasks = [
+        {
+          type = "shell";
+          label = "NixOS Rebuild Switch";
+          command = "sudo nixos-rebuild switch --flake ~/Jafner.net/nix";
+          problemMatcher =  [];
+        }
+        {
+          type = "shell";
+          label = "Home-Manager Switch";
+          command = "home-manager switch -b bak --flake ~/Jafner.net/nix";
+          problemMatcher =  [];
+        }
+        {
+          label = "System Rebuild";
+          dependsOn =  ["NixOS Rebuild Switch" "Home-Manager Switch" ];
+          dependsOrder = "sequence";
+          problemMatcher = [];
+        }
+      ];
     };
   };
 }
\ No newline at end of file
diff --git a/nix/home-manager/wm/hyprland/hyprland.nix b/nix/home-manager/wm/hyprland/hyprland.nix
index 95bf99dd..83fea357 100644
--- a/nix/home-manager/wm/hyprland/hyprland.nix
+++ b/nix/home-manager/wm/hyprland/hyprland.nix
@@ -6,13 +6,19 @@
     plugins = [];
     settings = {
       monitor = ",1920x1080@60,0x0,1";
-
+      # Declare default applications
       "$terminal" = "kitty";
       "$fileManager" = "dolphin";
-      "$bar" = "killall .waybar-wrapped; waybar --style ~/.config/waybar/waybar.css";
+      "$browser" = "flatpak run io.github.zen_browser.zen";
+      "$bar" = "killall .waybar-wrapped; waybar"; #"$bar" = "killall .waybar-wrapped; waybar --style ~/.config/waybar/waybar.css";
       "$menu" = "wofi --show drun";
       "$notifd" = "mako";
       "$wallpaperd" = "swww-daemon";
+      "$screenshot" = "grimblast copy area";
+
+      # Scripted actions
+      "$commandRebuildNix" = "$terminal sudo nixos-rebuild switch --flake ~/Jafner.net/nix";
+      "$commandRebuildHomeManager" = "$terminal home-manager switch -b bak --flake ~/Jafner.net/nix";
 
       exec-once = [
         "$terminal"
@@ -38,7 +44,7 @@
       decoration = {
         rounding = "10";
         active_opacity = "1.0";
-        inactive_opacity = "0.9";
+        inactive_opacity = "0.99";
         drop_shadow = true;
         shadow_range = "4";
         shadow_render_power = "3";
@@ -105,6 +111,10 @@
         "$mainMod, R, exec, $menu"
         "$mainMod, P, pseudo,"
         "$mainMod, J, togglesplit,"
+        "$mainMod CTRL, S, exec, $screenshot"
+        "$mainMod CTRL, Z, exec, $browser"
+        "$mainMod CTRL ALT, N, exec, $commandRebuildNix"
+        "$mainMod CTRL ALT, H, exec, $commandRebuildHomeManager"
         "$mainMod, left, movefocus, l"
         "$mainMod, right, movefocus, r"
         "$mainMod, up, movefocus, u"
diff --git a/nix/home-manager/wm/hyprland/waybar.nix b/nix/home-manager/wm/hyprland/waybar.nix
index 0ee891b4..c28d2f14 100644
--- a/nix/home-manager/wm/hyprland/waybar.nix
+++ b/nix/home-manager/wm/hyprland/waybar.nix
@@ -8,8 +8,8 @@
         position = "top";
         height = 30;
         spacing = 30;
-        margin-left = 40;
-        margin-right = 40;
+        margin-left = 0;
+        margin-right = 0;
         modules-left = [ "custom/appmenu" "wlr/taskbar" "hyprland/window" "tray" ];
         modules-center = [ "hyprland/workspaces" ];
         modules-right = [
@@ -49,11 +49,11 @@
           separate-outputs = true;
         };
         "custom/appmenu" = {
-          format = " ";
+          format = "     "; # Manual padding to move it further from left edge
           on-click = "wofi --show drun";
         };
         "custom/exit" = {
-          format = " ";
+          format = "     "; # Manual padding to move it further from right edge
           on-click = "wlogout";
           tooltip-format = "Power Menu";
         };
@@ -109,7 +109,7 @@
           format = ''{volume}% {icon} {format_source}'';
           format-bluetooth = ''{volume}% {icon} {format_source}'';
           format-bluetooth-muted = ''{icon} {format_source}'';
-          format-muted = '' {format_source}'';
+          format-muted = ''{format_source}'';
           format-source = ''{volume}% '';
           format-source-muted = '' '';
           format-icons = {
@@ -143,8 +143,8 @@
   #   with '-c ~/.config/waybar/waybar.css', which will add our snippets
   #   and then source the original, default '~/.config/waybar/style.css' 
   #   created by Stylix.
-  home.file."waybar.css" = {
-    target = ".config/waybar/waybar.css";
-    source = ./waybar.css;
-  };
+  # home.file."waybar.css" = {
+  #   target = ".config/waybar/waybar.css";
+  #   source = ./waybar.css;
+  # };
 }
diff --git a/nix/home-manager/wm/hyprland/wm.nix b/nix/home-manager/wm/hyprland/wm.nix
index e4639c6e..6fd0e184 100644
--- a/nix/home-manager/wm/hyprland/wm.nix
+++ b/nix/home-manager/wm/hyprland/wm.nix
@@ -12,7 +12,7 @@
     dolphin
     power-profiles-daemon
     pavucontrol
-    grim slurp
+    grimblast
   ];
  
 }
diff --git a/nix/nixos/fonts.nix b/nix/nixos/fonts.nix
index c1648d56..ce0f9c81 100644
--- a/nix/nixos/fonts.nix
+++ b/nix/nixos/fonts.nix
@@ -1,9 +1,10 @@
 { pkgs, ... }: {
   fonts.packages = with pkgs; [
-    noto-fonts noto-fonts-cjk noto-fonts-emoji
-    liberation_ttf
-    fira-code fira-code-symbols
     font-awesome
-    nerdfonts
-  ];
+    noto-fonts 
+    noto-fonts-cjk 
+    noto-fonts-emoji
+    powerline-symbols
+    (pkgs.nerdfonts.override {fonts = ["NerdFontsSymbolsOnly"];})  
+  ];  
 }