diff --git a/dot_config/ghostty/config b/dot_config/ghostty/config
index b60a616..1b4e269 100644
--- a/dot_config/ghostty/config
+++ b/dot_config/ghostty/config
@@ -6,9 +6,10 @@ font-feature=-dlig
 font-family = Hack Nerd Font Mono
 
 background-opacity=0.75
+background-opacity-cells = true
 background-blur=true
 
-# shell-integration-features = ssh-terminfo,ssh-env
+shell-integration-features = ssh-terminfo,ssh-env
 
 keybind = cmd+t=unbind
 keybind = cmd+n=unbind
@@ -22,3 +23,11 @@ keybind = alt+left=unbind
 keybind = alt+right=unbind
 
 keybind = ctrl+v=paste_from_clipboard
+
+window-padding-x = 0
+window-padding-y = 0
+window-padding-balance = true
+window-padding-color = extend-always
+window-vsync = false
+
+shell-integration = zsh
diff --git a/dot_config/hypr/config/binds.conf b/dot_config/hypr/config/binds.conf
index ab665ab..075b7d6 100644
--- a/dot_config/hypr/config/binds.conf
+++ b/dot_config/hypr/config/binds.conf
@@ -38,7 +38,7 @@ bindl=, XF86AudioPrev, exec, playerctl previous
 # also make sure you created a directory called screenshots in Pictures/ otherwise the screenshots won't appear anywhere
 bind = $mainMod, S, exec, grim -o DP-3 "${HOME}/Pictures/screenshots/screenshot-$(date +%F-%T).png"
 # screenshot + crop keybind
-bind = $mainMod SHIFT, S, exec, grim -g "$(slurp)" - | swappy -f - 
+bind = $mainMod SHIFT, S, exec, grim -g "$(slurp)" - | wl-copy 
 
 # Move focus with mainMod + arrow keys
 # Maybe H J K L
diff --git a/dot_config/hypr/config/general.conf b/dot_config/hypr/config/general.conf
index 6b49bf5..ff5b967 100644
--- a/dot_config/hypr/config/general.conf
+++ b/dot_config/hypr/config/general.conf
@@ -4,8 +4,8 @@ monitor=DP-6,1920x1200@60,auto-left,1,transform,1
 workspace=DP-6,6
 
 general { 
-    gaps_in = 2
-    gaps_out = 10
+    gaps_in = 0
+    gaps_out = 0
 
     border_size = 1 
 
diff --git a/dot_config/waybar/config b/dot_config/waybar/config
index a9f29cc..c89753d 100644
--- a/dot_config/waybar/config
+++ b/dot_config/waybar/config
@@ -5,7 +5,7 @@
 
   "modules-left": ["hyprland/workspaces"],
   "modules-center": ["hyprland/window"],
-  "modules-right": ["cpu", "memory", "network", "pulseaudio", "clock"],
+  "modules-right": ["cpu", "memory", "network", "privacy", "pulseaudio", "clock"],
 
   "hyprland/workspaces": {
     "disable-scroll": true,
@@ -31,8 +31,6 @@
 
   "network": {
     "format": " {bandwidthDownBits}  {bandwidthUpBits}",
-    // "format-wifi": " {essid}",
-    // "format-ethernet": "󰈀 eth",
     "format-disconnected": "⚠ offline",
     "interval": 5
   },
@@ -40,11 +38,35 @@
   "pulseaudio": {
     "format": " {volume}%",
     "format-muted": " muted",
-    "on-click": "pavucontrol"
+    "on-click": "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
   },
 
   "clock": {
-    "format": " {:%H:%M}",
-    "tooltip-format": "{:%Y-%m-%d %H:%M:%S}"
+    "interval": 60,
+    "timezone": "Europe/Berlin",
+    "format": "{:%a %d.%m %R }",
+    "tooltip-format": "<tt><big>{calendar}</big></tt>",
+    "calendar": {
+      "mode"          : "month",
+      "mode-mon-col"  : 3,
+      "weeks-pos"     : "right",
+      "on-scroll"     : 1,
+      "on-click-right": "mode",
+      "format": {
+        "months":     "<span color='#cba6f7'><b>{}</b></span>",
+        "days":       "<span color='#cdd6f4'><b>{}</b></span>",
+        "weeks":      "<span color='#94e2d5'>W{}</span>",
+        "weekdays":   "<span color='#f9e2af'><b>{}</b></span>",
+        "today":      "<span color='#f5e0dc'><b><u>{}</u></b></span>"
+        }
+    },
+    "actions":  {
+      "on-click-right": "mode",
+    }
+  },
+
+  "privacy": {
+    "icon-size": 16,
+    "spacing": 5
   }
 }
diff --git a/dot_config/waybar/style.css b/dot_config/waybar/style.css
index 67a2939..552f612 100644
--- a/dot_config/waybar/style.css
+++ b/dot_config/waybar/style.css
@@ -16,7 +16,12 @@ window#waybar {
   color: #6c7086;
 }
 
+#workspaces button.visible {
+  color: #cdd6f4;
+}
+
 #workspaces button.active {
+  background: #313244;
   color: #89b4fa;
 }
 
@@ -28,7 +33,7 @@ window#waybar {
   color: #a6adc8;
 }
 
-#cpu, #memory, #network, #pulseaudio, #clock {
+#cpu, #memory, #network, #pulseaudio, #clock, #tray {
   padding: 0 10px;
 }