diff --git a/1-install.sh b/1-install.sh
index 4727a87..b71ddfb 100755
--- a/1-install.sh
+++ b/1-install.sh
@@ -66,7 +66,7 @@ done
 echo ""
 echo "-> Install main packages"
 
-packagesPacman=("picom" "alacritty" "rofi" "rofi-calc" "chromium" "scrot" "nitrogen" "dunst" "starship" "slock" "neovim" "mpv" "freerdp" "xfce4-power-manager" "thunar" "mousepad" "ttf-font-awesome" "ttf-fira-sans" "ttf-fira-code" "ttf-firacode-nerd" "figlet" "lxappearance" "breeze" "breeze-gtk" "vlc" "exa" "python-pip" "python-psutil" "python-rich" "python-click" "xdg-desktop-portal-gtk" "pavucontrol" "tumbler");
+packagesPacman=("picom" "alacritty" "rofi" "rofi-calc" "chromium" "scrot" "nitrogen" "dunst" "starship" "slock" "neovim" "mpv" "freerdp" "xfce4-power-manager" "thunar" "mousepad" "ttf-font-awesome" "ttf-fira-sans" "ttf-fira-code" "ttf-firacode-nerd" "figlet" "lxappearance" "breeze" "breeze-gtk" "vlc" "exa" "python-pip" "python-psutil" "python-rich" "python-click" "xdg-desktop-portal-gtk" "pavucontrol" "tumbler" "xautolock");
 
 packagesYay=("brave-bin" "pfetch" "bibata-cursor-theme");
   
diff --git a/2-install-hyprland.sh b/2-install-hyprland.sh
index 943a360..c944fc9 100755
--- a/2-install-hyprland.sh
+++ b/2-install-hyprland.sh
@@ -46,9 +46,9 @@ echo ""
 # ------------------------------------------------------
 echo ""
 echo "-> Install main packages"
-packagesPacman=("waybar" "grim" "slurp");
+packagesPacman=("hyprland" "xdg-desktop-portal-hyprland" "waybar" "grim" "slurp");
 
-packagesYay=("hyprland-git" "swww" "swaylock");
+packagesYay=("swww" "swaylock");
 
 # ------------------------------------------------------
 # Install required packages
diff --git a/alacritty/alacritty.yml b/alacritty/alacritty.yml
index 23f66a7..262c410 100644
--- a/alacritty/alacritty.yml
+++ b/alacritty/alacritty.yml
@@ -167,7 +167,7 @@ font:
     #style: Bold Italic
 
   # Point size
-  size: 11.0
+  size: 12.0
 
   # Offset is the extra space around each character. `offset.y` can be thought
   # of as modifying the line spacing, and `offset.x` as modifying the letter
diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf
index a6dfe5b..a2c0eb1 100644
--- a/hypr/hyprland.conf
+++ b/hypr/hyprland.conf
@@ -24,6 +24,7 @@ exec-once = swww init
 exec-once = ~/dotfiles/scripts/updatewal-swww.sh
 exec-once = dunst
 exec-once = ~/dotfiles/hypr/gtk.sh
+exec-once = ~/dotfiles/scripts/autolock.sh &
 
 # ----------------------------------------------------- 
 # Load pywal color file
@@ -55,14 +56,11 @@ input {
 # General window layout and colors
 # ----------------------------------------------------- 
 general {
-    gaps_in = 10
-    gaps_out = 20
+    gaps_in = 7
+    gaps_out = 14
     border_size = 3
-    # Single Color for active window
-    col.active_border = rgba(ffffffee)
-    # Color Gradient for active window
-    # col.active_border = $color11 $background $background $color14 45deg    
-    col.inactive_border = $color11
+    col.active_border = $color11
+    col.inactive_border = rgba(ffffffff)
     layout = dwindle
 }
 
@@ -73,13 +71,15 @@ decoration {
     rounding = 10
     blur {
         enabled = true
-        size = 3
-        passes = 1
+        size = 6
+        passes = 2
         new_optimizations = on
-        blurls = waybar
+        ignore_opacity = true
+        xray = true
+        # blurls = waybar
     }
     active_opacity = 1.0
-    inactive_opacity = 0.9
+    inactive_opacity = 0.8
     fullscreen_opacity = 1.0
 
     drop_shadow = true
diff --git a/scripts/autolock.sh b/scripts/autolock.sh
new file mode 100755
index 0000000..acb9e2c
--- /dev/null
+++ b/scripts/autolock.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+#     _         _        _            _     
+#    / \  _   _| |_ ___ | | ___   ___| | __ 
+#   / _ \| | | | __/ _ \| |/ _ \ / __| |/ / 
+#  / ___ \ |_| | || (_) | | (_) | (__|   <  
+# /_/   \_\__,_|\__\___/|_|\___/ \___|_|\_\ 
+#                                           
+# by Stephan Raabe (2023) 
+# ----------------------------------------------------- 
+
+pkill xautolock
+
+xautolock -time 10 -locker "swaylock -i ~/.cache/current_wallpaper.jpg" -notify 30 -notifier "notify-send 'Screen will be locked soon.' 'Locking screen in 30 seconds'"
diff --git a/scripts/updatewal-swww.sh b/scripts/updatewal-swww.sh
index 81c3d7d..d0821ef 100755
--- a/scripts/updatewal-swww.sh
+++ b/scripts/updatewal-swww.sh
@@ -23,6 +23,7 @@ source "$HOME/.cache/wal/colors.sh"
 # Copy color file to waybar folder
 # ----------------------------------------------------- 
 cp ~/.cache/wal/colors-waybar.css ~/dotfiles/waybar/
+cp $wallpaper ~/.cache/current_wallpaper.jpg
 
 # ----------------------------------------------------- 
 # get wallpaper iamge name
diff --git a/scripts/wallpaper-swww.sh b/scripts/wallpaper-swww.sh
index 0fe648a..2afbd78 100755
--- a/scripts/wallpaper-swww.sh
+++ b/scripts/wallpaper-swww.sh
@@ -31,7 +31,8 @@ if [ "$selected" ]; then
     # Copy color file to waybar folder
     # ----------------------------------------------------- 
     cp ~/.cache/wal/colors-waybar.css ~/dotfiles/waybar/
-    
+    cp $wallpaper ~/.cache/current_wallpaper.jpg   
+
     newwall=$(echo $wallpaper | sed "s|$HOME/wallpaper/||g")
 
     # ----------------------------------------------------- 
diff --git a/waybar/colors-waybar.css b/waybar/colors-waybar.css
index 2a57899..2a27d52 100644
--- a/waybar/colors-waybar.css
+++ b/waybar/colors-waybar.css
@@ -1,20 +1,20 @@
-@define-color foreground #c0c1c1;
-@define-color background #06090a;
-@define-color cursor #c0c1c1;
+@define-color foreground #bfbfc0;
+@define-color background #000204;
+@define-color cursor #bfbfc0;
 
-@define-color color0 #06090a;
-@define-color color1 #536768;
-@define-color color2 #656D6A;
-@define-color color3 #868570;
-@define-color color4 #798D85;
-@define-color color5 #98A19D;
-@define-color color6 #D7DADA;
-@define-color color7 #c0c1c1;
-@define-color color8 #444647;
-@define-color color9 #536768;
-@define-color color10 #656D6A;
-@define-color color11 #868570;
-@define-color color12 #798D85;
-@define-color color13 #98A19D;
-@define-color color14 #D7DADA;
-@define-color color15 #c0c1c1;
+@define-color color0 #000204;
+@define-color color1 #26506F;
+@define-color color2 #496773;
+@define-color color3 #0F588A;
+@define-color color4 #186DA7;
+@define-color color5 #157DBF;
+@define-color color6 #2597DB;
+@define-color color7 #bfbfc0;
+@define-color color8 #3f4142;
+@define-color color9 #26506F;
+@define-color color10 #496773;
+@define-color color11 #0F588A;
+@define-color color12 #186DA7;
+@define-color color13 #157DBF;
+@define-color color14 #2597DB;
+@define-color color15 #bfbfc0;
diff --git a/waybar/config b/waybar/config
index ce34d63..e2004ac 100644
--- a/waybar/config
+++ b/waybar/config
@@ -10,28 +10,29 @@
 //
 {
     "layer": "top",
-    "height": 30,
-    "spacing": 4,
-    "margin-top": 0,
+    "height": 16,
+    "margin-top": 14,
+    "margin-bottom": 0,
     "margin-left": 0,
-    "margin-right": 0,
+    "margin-right": 0,    
+    "spacing": 0,
     "include": ["~/dotfiles/waybar/modules.json"],
     "modules-left": [
         "custom/appmenu", 
         "custom/brave",
+        "hyprland/window"
     ],
     "modules-center": [
-        "wlr/workspaces",
+        "wlr/workspaces"
     ],
     "modules-right": [
-        "keyboard-state", 
-        "pulseaudio", 
+        "keyboard-state",
+        "pulseaudio",
         "disk",
         "cpu", 
         "memory", 
         "battery", 
-        "clock", 
-        "custom/exit", 
-        "tray"
+        "custom/exit",
+        "clock"
     ],
 }
diff --git a/waybar/modules.json b/waybar/modules.json
index 53c44e5..50ed193 100644
--- a/waybar/modules.json
+++ b/waybar/modules.json
@@ -16,9 +16,9 @@
         "all-outputs": true,
         "format": "{icon}",
         "format-icons": {
-			"urgent": "",
-			"active":  "",
-			"default": "",
+			"urgent": "",
+			"active": "",
+			"default": "",
             "sort-by-number": true
         }
     },
@@ -27,7 +27,7 @@
     "custom/youtube": {
         "format": " {}",
         "exec": "python ~/private/youtube.py",
-        "interval": "300",
+        "restart-interval": 60,
         "on-click": "brave https://studio.youtube.com",
         "tooltip": false
     },
@@ -41,7 +41,7 @@
 
     // Teams Launcher
     "custom/teams": {
-        "format": "",
+        "format": "",
         "on-click": "brave --app=https://teams.microsoft.com/go",
         "tooltip": false
     },
@@ -76,7 +76,7 @@
 
     // Rofi Application Launcher
     "custom/appmenu": {
-        "format": " ",
+        "format": "Apps",
         "on-click": "~/dotfiles/scripts/applauncher.sh",
         "tooltip": false
     },
@@ -114,19 +114,18 @@
 
     // CPU
     "cpu": {
-        "format": "  {usage}%",
-        "tooltip": false
+        "format": "/ {usage}% ",
     },
 
     // Memory
     "memory": {
-        "format": "  {}%"
+        "format": "/ {}% "
     },
 
     // Harddisc space used
     "disk": {
         "interval": 30,
-        "format": " {percentage_used}%",
+        "format": "   {percentage_used}% ",
         "path": "/"
     }, 
 
@@ -170,8 +169,6 @@
     "user": {
         "format": "{user}",
         "interval": 60,
-        "height": 30,
-        "width": 30,
         "icon": false,
     }
 }
diff --git a/waybar/myconfig b/waybar/myconfig
index 96105c2..4c09a71 100644
--- a/waybar/myconfig
+++ b/waybar/myconfig
@@ -10,36 +10,33 @@
 //
 {
     "layer": "top",
-    "height": 30,
-    "spacing": 4,
-    "margin-top": 0,
+    "height": 16,
+    "margin-top": 14,
+    "margin-bottom": 0,
     "margin-left": 0,
-    "margin-right": 0,
+    "margin-right": 0,    
+    "spacing": 0,
     "include": ["~/dotfiles/waybar/modules.json"],
     "modules-left": [
         "custom/appmenu", 
-        "custom/brave",
         "custom/outlook",
         "custom/teams",
-        "custom/calculator",
         "custom/chatgpt",
-        "custom/lookingglass"
-        // "hyprland/window"
+        "custom/lookingglass",
+        "hyprland/window"
     ],
     "modules-center": [
-        "wlr/workspaces",
+        "wlr/workspaces"
     ],
     "modules-right": [
         "custom/youtube",
-        "keyboard-state", 
-        "pulseaudio", 
+        "keyboard-state",
+        "pulseaudio",
         "disk",
         "cpu", 
         "memory", 
         "battery", 
-        "clock", 
-        "user",
         "custom/exit",
-        "tray"
+        "clock"
     ],
 }
diff --git a/waybar/style.css b/waybar/style.css
index d252c45..361aaf8 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -21,61 +21,76 @@
 
 * {
     font-family: "Fira Sans Semibold", FontAwesome, Roboto, Helvetica, Arial, sans-serif;
-    font-size: 14px;
-    border-radius: 20px;
+    border: none;
+    border-radius: 0px;
 }
 
 window#waybar {
     background-color: rgba(0,0,0,0.8);
-    /* border-bottom: 3px solid rgba(100, 114, 125, 0.5); */
+    border-bottom: 0px solid #ffffff;
     /* color: #FFFFFF; */
     background: transparent;
     transition-property: background-color;
     transition-duration: .5s;
-    border-radius: 20;
 }
 
-/*
-button {
-    box-shadow: inset 0 -3px transparent; 
-    border: none;
-    border-radius: 0;
-}
-*/
-
 /* -----------------------------------------------------
  * Workspaces 
  * ----------------------------------------------------- */
 
+#workspaces {
+    background: #FFFFFF;
+    margin: 5px 5px 5px 5px;
+    padding: 4px 1px;
+    border-radius: 12px;
+    font-weight: normal;
+    font-style: normal;
+    opacity:0.8;
+}
+
 #workspaces button {
     padding: 0px 10px;
-    border-radius: 10px;
-    border:0;
-    margin:0;
-    font-weight:bold;
+    margin: 0px 3px;
+    border-radius: 12px;
     color: @color11;
+    background-color: @color11;
+    transition: all 0.3s ease-in-out;
+    opacity:0.4;
+    font-size:13px;
 }
 
 #workspaces button.active {
-    color: #FFFFFF;
-    border-radius: 15px;
-    font-weight:bold;
-    border:0;
+    color: #cdd6f4;
+    background-color: @color11;
+    border-radius: 10px;
+    min-width: 30px;
+    background-size: 400% 400%;
+    transition: all 0.3s ease-in-out;
+    opacity:1.0;
 }
 
 #workspaces button:hover {
-	color: @color11;
-	border-radius: 15px;
-    border:0;
-}
-#workspaces button.focused {
-	color: @color11;
-	border-radius: 15px;
-    font-weight:bold;
+    background-color: @color1;
+    color: #cdd6f4;
+    border-radius: 10px;
+    min-width: 30px;
+    background-size: 400% 400%;
 }
 
-#workspaces button.urgent {
-    background-color: #eb4d4b;
+/* -----------------------------------------------------
+ * Tooltips
+ * ----------------------------------------------------- */
+
+tooltip {
+    border-radius: 10px;
+    background-color: #FFFFFF;
+    opacity:0.8;
+    padding:20px;
+    margin:0px;
+}
+
+tooltip label {
+    color: @color11;
 }
 
 #mode {
@@ -99,21 +114,13 @@ button {
 #idle_inhibitor,
 #scratchpad,
 #language,
-#custom-youtube,
 #user,
+#window,
 #mpd {
-    margin: 6px 10px 6px 0px;
+    margin: 0px 20px 0px 10px;
     padding: 0 0px;
     color: #FFFFFF;
-    font-size:16;
-}
-
-#window,
-#workspaces {
-    margin: 4 10px 5 10px;
-    background-color:#000000;
-    opacity:0.5;
-    padding:0;
+    font-size:16px;
 }
 
 .modules-left > widget:first-child > #workspaces {
@@ -125,24 +132,44 @@ button {
 }
 
 #custom-appmenu {
-    margin-left:16;
-    font-size:16;
-    font-weight:bold;
+    background-color: #FFFFFF;
+    font-size: 18px;
+    color: @background;
+    border-radius: 12px;
+    padding: 2px 10px 0px 10px;
+    margin: 5px 10px 5px 20px;
+    opacity:0.8;
 }
 
-#custom-appmenu, #custom-brave, #custom-outlook, #custom-teams, #custom-chatgpt, #custom-calculator, #custom-lookingglass {
+#disk,#memory,#cpu {
+    margin:0px;
+
+    padding:0px;
+}
+
+#custom-youtube, #custom-brave, #custom-outlook, #custom-teams, #custom-chatgpt, #custom-calculator, #custom-lookingglass {
     margin-right:10px;
     font-size:16px;
 }
 
+#user {
+    margin-right:10px;
+    font-size:20px;
+}
+
 #custom-exit {
-    margin-right: 10px;
-    font-size:14px;
+    margin: 0px 10px 0px 10px;
+    font-size:20px;
 }
 
 #clock {
-    background-color: transparent;
-    font-size:16;
+    background-color: #FFFFFF;
+    font-size: 18px;
+    color: @background;
+    border-radius: 12px;
+    padding: 2px 10px 0px 10px;
+    margin: 5px 20px 5px 10px;
+    opacity:0.8;
 }
 
 #battery {
@@ -311,10 +338,4 @@ label:focus {
     margin:0;
 }
 
-#scratchpad {
-    background: rgba(0, 0, 0, 0.2);
-}
 
-#scratchpad.empty {
-	background-color: transparent;
-}