diff --git a/hypr/hyprpaper.conf b/hypr/hyprpaper.conf
index f11b6a9..86489ff 100644
--- a/hypr/hyprpaper.conf
+++ b/hypr/hyprpaper.conf
@@ -1,5 +1,5 @@
 preload = ~/wallpapers/forest-view.jpg
-preload = ~/wallpapers/the-golden-sun.png
+preload = ~/wallpapers/forest-view.jpg
 
 wallpaper = eDP-1,~/wallpapers/forest-view.jpg
-wallpaper = ,~/wallpapers/the-golden-sun.png
+wallpaper = ,~/wallpapers/forest-view.jpg
diff --git a/hypr/keymap.conf b/hypr/keymap.conf
index 4ceea9b..ed0cbbb 100644
--- a/hypr/keymap.conf
+++ b/hypr/keymap.conf
@@ -79,9 +79,13 @@ bind=, XF86AudioPrev, exec, playerctl previous
 #
 bind=,XF86PowerOff, exec, wlogout
 # Laptop lid switch
-bindl=,switch:on:Lid Switch,exec,swaylock
+bindl=,switch:on:Lid Switch,exec, sh ./scripts/lock.sh
 bindl=,switch:off:Lid Switch,exec,hyprctl keyword monitor "eDP-1, 3000x2000@60,0x0,auto"
 bindl=,switch:on:Lid Switch,exec,hyprctl keyword monitor "eDP-1, disable"
 # Screen brightness
 bind=,XF86MonBrightnessDown,exec,brightnessctl set 5%-
 bind=,XF86MonBrightnessUp,exec,brightnessctl set +5%
+
+# screenshot
+bind =, Print, exec, grim -g "$(slurp -d)" - | wl-copy
+bind = SHIFT, Print, exec, hyprpicker -a
diff --git a/hypr/rice.conf b/hypr/rice.conf
index 6f68abe..5901398 100644
--- a/hypr/rice.conf
+++ b/hypr/rice.conf
@@ -5,9 +5,9 @@
 general {
   gaps_in=10
   gaps_out=0
-  border_size=3
-  col.inactive_border=rgba(f7768eff) rgba(73dacaff) 45deg
-  col.active_border=rgba(73dacaff) rgba(f7768eff) 45deg
+  border_size=2
+  col.inactive_border=rgba(f7768eff) rgba(bb9af7ff) 45deg
+  col.active_border=rgba(bb9af7ff) rgba(f7768eff) 45deg
   no_border_on_floating = false
   layout = dwindle
 }
@@ -110,11 +110,10 @@ windowrule = float, confirmreset
 windowrule = float, title:Open File
 windowrule = float, title:branchdialog
 windowrule = float, Lxappearance
-windowrule = float, wofi
+#windowrulev2 = rounding 0 override, class:(wofi)
+windowrule = float, class:(wofi)
 windowrule = float,viewnior
 # windowrule = float,feh
-windowrule = float, pavucontrol-qt
-windowrule = float, pavucontrol
 windowrulev2 = tile, title:^(.*)(Godot)(.*)$
 # windowrule = float, file-roller
 windowrule = fullscreen, wlogout
@@ -136,3 +135,10 @@ windowrulev2 = workspace 3, title:^(Spotify)(.*)$
 windowrulev2 = workspace 3, class:^(Slack)$
 windowrulev2 = workspace special, class:^(thunar)$
 windowrulev2 = workspace special, class:^(YouTube Music)$
+
+# Screen share settings
+windowrulev2 = opacity 0.0 override,class:^(xwaylandvideobridge)$
+windowrulev2 = noanim,class:^(xwaylandvideobridge)$
+windowrulev2 = noinitialfocus,class:^(xwaylandvideobridge)$
+windowrulev2 = maxsize 1 1,class:^(xwaylandvideobridge)$
+windowrulev2 = noblur,class:^(xwaylandvideobridge)$
diff --git a/hypr/scripts/lock.sh b/hypr/scripts/lock.sh
new file mode 100644
index 0000000..21fa841
--- /dev/null
+++ b/hypr/scripts/lock.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+# Split the string into an array at spaces
+read -ra words <<<"$(xrandr | grep " connected" | awk '{print $1}')"
+
+# Count the length of the array
+length=${#words[@]}
+
+if [ -z "$length" ]; then
+	exec swaylock
+fi
diff --git a/waybar/config b/waybar/config
index 1b9626e..7c30a6a 100644
--- a/waybar/config
+++ b/waybar/config
@@ -9,26 +9,29 @@
 
     "modules-left": [
         "hyprland/workspaces",
+        "custom/separator",
+        "custom/weather",
+        "custom/separator",
+        "memory",
+        "custom/separator",
+        "cpu"
     ],
  
     "modules-center": [
-        "clock",
+        "clock"
     ],
 
     "modules-right": [
-        "tray",
-        // "idle_inhibitor",
-        "memory",
-        "cpu",
-        // "custom/keyboard-layout",
-        //"custom/PBPbattery",
-        // "backlight#icon",
+        
         "backlight#value",
+        "custom/separator",
         "pulseaudio",
         "pulseaudio#microphone",
+        "custom/separator",
         "network",
         "battery",
-        "custom/power",
+        "custom/separator",
+        "custom/power"
     ],
 
     // Modules
@@ -55,11 +58,6 @@
         "format-icons": ["", "", "", "", ""]
     },
 
-    "custom/PBPbattery": {
-        "exec": "sh ~/.config/waybar/scripts/PBPbattery.sh",
-        "format": "{}",
-    },
-
     "clock": {
         "interval": 10,
         // "format-alt": " {:%e %b %Y}", // Icon: calendar-alt
@@ -69,29 +67,18 @@
 
     "cpu": {
         "interval": 5,
-        "format": "  {usage}% ({load})", // Icon: microchip
+        "format": "  {usage}% ({load})", // Icon: nf-oct-cpu
         "states": {
             "warning": 70,
             "critical": 90,
         },
-        "on-click": "alacritty -e 'btm'",
-    },
-
-    "custom/keyboard-layout": {
-        "exec": "swaymsg -t get_inputs | grep -m1 'xkb_active_layout_name' | cut -d '\"' -f4",
-        // Interval set only as a fallback, as the value is updated by signal
-        "interval": 30,
-        "format": "  {}", // Icon: keyboard
-        // Signal sent by Sway key binding (~/.config/sway/key-bindings)
-        "signal": 1, // SIGHUP
-        "tooltip": false,
-        "on-click": "sh ~/.config/waybar/scripts/keyhint.sh",
+        "on-click": "alacritty -e 'glances'",
     },
 
     "memory": {
         "interval": 5,
-        "format": "  {}%", // Icon: memory
-        "on-click": "alacritty -e 'btm'", 
+        "format": "  {}%", // Icon: nf-cod-graph
+        "on-click": "alacritty -e 'glances'", 
         "states": {
             "warning": 70,
             "critical": 90
@@ -100,8 +87,8 @@
 
     "network": {
         "interval": 5,
-        "format-wifi": " ", // Icon: wifi
-        "format-ethernet": " ", // Icon: ethernet
+        "format-wifi": "", // Icon: wifi
+        "format-ethernet": "", // Icon: ethernet
         "format-disconnected": "⚠  Disconnected",
         "tooltip-format": "{ifname}: {ipaddr}",
         "on-click": "alacritty -e 'nmtui'",
@@ -123,10 +110,30 @@
         "max-length": 120
     },
 
-    "hyrpland/workspaces": {
+    "hyprland/workspaces": {
+        // "on-scroll-up": "hyprctl dispatch workspace e+1",
+        // "on-scroll-down": "hyprctl dispatch workspace e-1",
         "format": "{icon}",
-        "on-scroll-up": "hyprctl dispatch workspace e+1",
-        "on-scroll-down": "hyprctl dispatch workspace e-1"
+        "format-icons": {
+            "1": "Ⅰ",
+            "2": "Ⅱ",
+            "3": "Ⅲ",
+            "4": "Ⅳ",
+            "5": "Ⅴ",
+            "6": "Ⅵ",
+            "7": "Ⅶ",
+            "8": "Ⅷ",
+            "9": "Ⅸ",
+            "10": "Ⅹ",
+            //"active": "α",
+            // "default": "1"
+            // "persistent": ""
+        },
+        "all-outputs": true,
+        "persistent_workspaces": {
+            "*": 5
+        }
+    
     },
 
     "pulseaudio": {
@@ -138,16 +145,16 @@
         "format-icons": {
             "headphone": "󰋋",
             "hands-free": "וֹ",
-            "headset": "  ",
+            "headset": " 󰥰 ",
             "phone": "",
             "portable": "",
             "car": "",
             "default": [""]
         },
-        "on-click": "pactl set-sink-mute @DEFAULT_SINK@ toggle",
+        "on-click": "pamixer -t",
         "on-click-right": "pavucontrol",
-        "on-scroll-up": "pactl set-sink-volume @DEFAULT_SINK@ +2%",
-        "on-scroll-down": "pactl set-sink-volume @DEFAULT_SINK@ -2%",
+        "on-scroll-up": "pamixer -i 2",
+        "on-scroll-down": "pamixer -d 2"
     },
 
     "pulseaudio#microphone": {
@@ -164,7 +171,7 @@
     // to use the weather module replace <your_location> with your city or town
     // note: do not use spaces: new york would be newyork
     "custom/weather": {
-        "exec": "sh ~/.config/waybar/scripts/weather.sh tampa", 
+        "exec": "sh ~/.config/waybar/scripts/weather.sh 'Vännäs'", 
         "return-type": "json",
         "interval": 600,
     },
@@ -187,45 +194,15 @@
          "on-scroll-up": "brightnessctl -c backlight set +1%"
     },
 
-    "custom/firefox": {
-        "format": " ",
-        "on-click": "exec firefox",
-        "tooltip": false
-    },
-
-    "custom/terminal": {
-        "format": " ",
-        "on-click": "exec alacritty",
-        "tooltip": false
-    },
-
-    "custom/files": {
-        "format": " ",
-        "on-click": "exec nautilus",
-        "tooltip": false
-    },
-
-    "custom/launcher": {
-        "format":" ",
-        "on-click": "exec wofi -c ~/.config/wofi/config -I",
-        "tooltip": false,
-    },
-
     "custom/power": {
         "format":"⏻",
         "on-click": "exec wlogout",
-        "tooltip": false,
+        "tooltip": false
     },
 
-    "custom/media": {
-        "format": "{icon} {}",
-        "return-type": "json",
-        "max-length": 40,
-        "format-icons": {
-            "spotify": "",
-            "default": "󰗃"
-        },
-        "escape": true,
-        "exec": "/usr/bin/python3 $HOME/.config/waybar/scripts/mediaplayer.py 2> /dev/null" // Script in resources folder
+    "custom/separator": {
+        "format": "•",
+        "interval": "once",
+        "tooltip": false
     }
 }
diff --git a/waybar/scripts/weather.sh b/waybar/scripts/weather.sh
index b03cd1c..e5e8491 100755
--- a/waybar/scripts/weather.sh
+++ b/waybar/scripts/weather.sh
@@ -2,12 +2,8 @@
 
 LOC="$1"
 # HTML encode string as %20
-LOCATION=$(sed -e "s/ /%20/g" <<<"$LOC")
-content=$(curl -sS "https://thisdavej.azurewebsites.net/api/weather/current?loc=$LOCATION&deg=C")
-ICON=$(curl -s 'https://wttr.in/?format=1' | sed 's/[+0-9a-cA-Z°-]//g' )
+TEMP=$(curl -s 'https://wttr.in/'${LOC}'?format=%t\n&m')
+ICON=$(curl -s 'https://wttr.in/'${LOC}'?format=1' | grep -o '^\S*' )
 # echo $ICON
-TEMP=$(echo $content | jq -r '. | "\(.temperature)°\(.degType)"' | sed 's/"//g')
-TOOLTIP=$(echo $content | jq -r '. | "\(.temperature)°\(.degType)\n\(.skytext)"' | sed 's/"//g')
-CLASS=$(echo $content | jq .skytext)
-echo '{"text": "'$TEMP'", "tooltip": "'$ICON $TOOLTIP $LOC'", "class": '$CLASS' }'
+echo '{"text": "'$TEMP'", "tooltip": "'$ICON' '$LOC'", "class": "weather" }'
 
diff --git a/waybar/style.css b/waybar/style.css
index 1005a4b..0a956bc 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -9,7 +9,11 @@
 /* -----------------------------------------------------------------------------
  * Keyframes
  * -------------------------------------------------------------------------- */
-
+ @define-color magenta #9d7cd8;
+ @define-color magenta_2 #ff007c;
+ @define-color bg_highlight #292e42;
+ @define-color blue_1 #65bcff;
+ @define-color bg #222436;
 /*
 Arc-Dark Color Scheme
 */
@@ -41,25 +45,25 @@ Arc-Dark Color Scheme
 
 /* Reset all styles */
 * {
+
     border: none;
     border-radius: 0;
     min-height: 0;
-    margin: 1px;
+    margin: 0px;
     padding: 0;
-    color: #66ACED;
+    /* color: @blue_1; */
 }
 
 
 /* The whole bar */
 window#waybar {
     /* color: #dfdfdf; */
-    /* background-color: rgba(0,0,0,0.8); */
-    /* background-color: rgba(8,0,37,0.85); */
     background-color: rgba(0,0,0,0);
+    /* background-color: @bg; */
     /* font-family: JetBrains Mono Nerd Font; */
     font-family: Intel One Mono Nerd Font;
     font-size: 14px;
-    /* border-radius: 22px; */
+    /* border-radius: 3px; */
 }
 
 /* Every modules */
@@ -77,27 +81,38 @@ window#waybar {
 #tray,
 #idle_inhibitor,
 #window,
-#custom-power,
 #workspaces,
+#custom-power,
 #custom-media,
 #custom-PBPbattery {
     padding:0.25rem 0.75rem;
-    margin: 1px 6px;
-    background-color: rgba(0,0,0,0.8);
-    border-radius: 20px;
+    /* margin: 1px 6px; */
+    /* background-color: @bg;
+    border-radius: 20px; */
+    color: @blue_1;
 }
 
+#custom-separator {
+    color: @bg_highlight;
+}
+
+.modules-right,
+.modules-left,
+.modules-center {
+    background-color: @bg;
+    border-radius: 20px;
+}
 /* -----------------------------------------------------------------------------
  * Modules styles
  * -------------------------------------------------------------------------- */
 
 #clock {
-    /* color: #ff4499; */
-    color: #73daca;
+    /* color: @magenta_2; */
+    color: @magenta;
 }
 
 #custom-weather {
-    color: #ff4499;
+    color: @magenta;
 }
 
 #battery {
@@ -125,7 +140,7 @@ window#waybar {
 }
 
 #cpu {
-    color: #f7768e;
+    color: @magenta;
 }
 
 #cpu.warning {
@@ -140,7 +155,7 @@ window#waybar {
     animation-timing-function: linear;
     animation-iteration-count: infinite;
     animation-direction: alternate;
-    color: #f7768e;
+    color: @magenta;
 }
 
 #memory.warning {
@@ -159,8 +174,8 @@ window#waybar {
     /* background: @highlight; */
     /* background: #dfdfdf; */
     border-bottom: 3px transparent;
-    color:#ff4499;
-    margin-left: 5px;
+    color:@magenta_2;
+    /* margin-left: 5px; */
     padding: 7px;
 }
 
@@ -169,7 +184,7 @@ window#waybar {
 }
 
 #pulseaudio {
-    color: #bb9af7;
+    color: @magenta;
     border-left: 0px;
     border-right: 0px;
     margin-right: 0;
@@ -177,7 +192,7 @@ window#waybar {
 }
 
 /* #pulseaudio.muted { */
-/*     color: #ff4499; */
+/*     color: @magenta_2; */
 /* } */
 /**/
 #pulseaudio.microphone {
@@ -189,7 +204,7 @@ window#waybar {
 }
 
 /* #pulseaudio.microphone.muted { */
-/*     color: #ff4499; */
+/*     color: @magenta_2; */
 /* } */
 
 
@@ -203,30 +218,29 @@ window#waybar {
 }
 
 #custom-media {
-    color: #bb9af7;
+    color: @magenta;
 }
 
 #workspaces {
     font-size:16px;
-    background-color: rgba(0,0,0,0.8);
     border-radius: 20px;
 }
 
 #workspaces button {
     border-bottom: 3px solid transparent;
     margin-bottom: 0px;
-    color: #dfdfdf;
+    color: @blue_1;
 }
 
 #workspaces button.active {
-    border-bottom: 1px solid  #ff4499;
-    margin-bottom: 1px;
+    color: @magenta;
+    border-bottom: 1px solid @magenta;
+    /* margin-bottom: 1px; */
     padding-left:0;
 }
 
 #workspaces button.urgent {
-    border-color: #c9545d;
-    color: #c9545d;
+    border-bottom: 1px solid @magenta_2;
 }
 
 #custom-power {
@@ -234,12 +248,6 @@ window#waybar {
     padding-right: 1rem;
 }
 
-#custom-launcher {
-    font-size:15px;
-    margin-left:15px;
-    margin-right:10px;
-}
-
 #backlight.icon {
     padding-right:1px;
     font-size: 13px;
diff --git a/waybar/waybar/config b/waybar/waybar/config
new file mode 100644
index 0000000..4c0289a
--- /dev/null
+++ b/waybar/waybar/config
@@ -0,0 +1,208 @@
+// Global 
+{
+    "layer": "top",
+    "position": "top",
+    "margin": 5,
+
+    // If height property would be not present, it'd be calculated dynamically
+    "height": 34,
+
+    "modules-left": [
+        "hyprland/workspaces",
+        "custom/separator",
+        "custom/weather",
+        "custom/separator",
+        "memory",
+        "custom/separator",
+        "cpu"
+    ],
+ 
+    "modules-center": [
+        "clock"
+    ],
+
+    "modules-right": [
+        
+        "backlight#value",
+        "custom/separator",
+        "pulseaudio",
+        "pulseaudio#microphone",
+        "custom/separator",
+        "network",
+        "battery",
+        "custom/separator",
+        "custom/power"
+    ],
+
+    // Modules
+
+    "idle_inhibitor": {
+        "format": "{icon} ",
+        "format-icons":{
+            "activated": "",
+            "deactivated": ""
+        }
+    },
+
+    "battery": {
+        "states": {
+            // "good": 95,
+            "warning": 30,
+            "critical": 15
+        },
+        "format": "{capacity}% {icon} ",
+        "format-charging": "{capacity}% 󰂄",
+        "format-plugged": "{capacity}% ",
+        // "format-good": "", // An empty format will hide the module
+        // "format-full": "",
+        "format-icons": ["", "", "", "", ""]
+    },
+
+    "clock": {
+        "interval": 10,
+        // "format-alt": " {:%e %b %Y}", // Icon: calendar-alt
+        "format": "{:%e %b %Y %H:%M} ",
+        "tooltip-format": "{:%e %B %Y}"
+    },
+
+    "cpu": {
+        "interval": 5,
+        "format": "  {usage}% ({load})", // Icon: nf-oct-cpu
+        "states": {
+            "warning": 70,
+            "critical": 90,
+        },
+        "on-click": "alacritty -e 'glances'",
+    },
+
+    "memory": {
+        "interval": 5,
+        "format": "  {}%", // Icon: nf-cod-graph
+        "on-click": "alacritty -e 'glances'", 
+        "states": {
+            "warning": 70,
+            "critical": 90
+        }
+    },
+
+    "network": {
+        "interval": 5,
+        "format-wifi": "", // Icon: wifi
+        "format-ethernet": "", // Icon: ethernet
+        "format-disconnected": "⚠  Disconnected",
+        "tooltip-format": "{ifname}: {ipaddr}",
+        "on-click": "alacritty -e 'nmtui'",
+    },
+    "network#vpn": {
+        "interface": "tun0",
+        "format": " ",
+        "format-disconnected": "⚠  Disconnected",
+        "tooltip-format": "{ifname}: {ipaddr}/{cidr}",
+    },
+
+    "hyprland/mode": {
+        "format": "{}",
+        "tooltip": false
+    },
+
+    "hyprland/window": {
+        "format": "{}",
+        "max-length": 120
+    },
+
+    "hyprland/workspaces": {
+        // "on-scroll-up": "hyprctl dispatch workspace e+1",
+        // "on-scroll-down": "hyprctl dispatch workspace e-1",
+        "format": "{icon}",
+        "format-icons": {
+            "1": "일",
+            "2": "이",
+            "3": "삼",
+            "4": "사",
+            "5": "오",
+            "6": "육",
+            "7": "칠",
+            "8": "팔",
+            "9": "구",
+            "10": "십",
+            // "active": "󰻀",
+            // "default": "1"
+            // "persistent": ""
+        },
+        "all-outputs": true,
+        "persistent_workspaces": {
+            "*": 5
+        }
+    
+    },
+
+    "pulseaudio": {
+        "scroll-step": 1, // %, can be a float
+        "format": "{icon} {volume}%",
+        "format-bluetooth": "{volume}% {icon}  {format_source}",
+        "format-bluetooth-muted": " {icon}  {format_source}",
+        "format-muted": "󰸈",
+        "format-icons": {
+            "headphone": "󰋋",
+            "hands-free": "וֹ",
+            "headset": " 󰥰 ",
+            "phone": "",
+            "portable": "",
+            "car": "",
+            "default": [""]
+        },
+        "on-click": "pamixer -t",
+        "on-click-right": "pavucontrol",
+        "on-scroll-up": "pamixer -i 2",
+        "on-scroll-down": "pamixer -d 2"
+    },
+
+    "pulseaudio#microphone": {
+        "format": "{format_source}",
+        "format-source": " {volume}%",
+        "format-source-muted": " ",
+        "on-click": "pamixer --default-source -t",
+        "on-click-right": "pavucontrol",
+        "on-scroll-up": "pamixer --default-source -i 5",
+        "on-scroll-down": "pamixer --default-source -d 5",
+        "scroll-step": 5
+    },
+
+    // to use the weather module replace <your_location> with your city or town
+    // note: do not use spaces: new york would be newyork
+    "custom/weather": {
+        "exec": "sh ~/.config/waybar/scripts/weather.sh 'Vännäs'", 
+        "return-type": "json",
+        "interval": 600,
+    },
+
+    "tray": {
+        "icon-size": 18,
+        "spacing":10,
+     },
+
+    "backlight#icon": {
+        "format": "{icon}",
+        "on-scroll-down": "brightnessctl -c backlight set 1%-",
+        "on-scroll-up": "brightnessctl -c backlight set +1%"
+    },
+
+    "backlight#value" :{
+         "format": "{icon} {percent}%",
+         "format-icons": [" "],
+         "on-scroll-down": "brightnessctl -c backlight set 1%-",
+         "on-scroll-up": "brightnessctl -c backlight set +1%"
+    },
+
+    "custom/power": {
+        "format":"⏻",
+        "on-click": "exec wlogout",
+        "tooltip": false
+    },
+
+    "custom/separator": {
+        "format": "•",
+        "interval": "once",
+        "tooltip": false
+    }
+}
diff --git a/waybar/waybar/scripts/PBPbattery.sh b/waybar/waybar/scripts/PBPbattery.sh
new file mode 100755
index 0000000..1cf34da
--- /dev/null
+++ b/waybar/waybar/scripts/PBPbattery.sh
@@ -0,0 +1,21 @@
+
+#!/bin/bash
+#simple Shellscript for waybar/i3blocks/polybar on Pinebook pro
+#05012020 geri123@gmx.net Gerhard S.
+
+PERCENT=$(cat /sys/class/power_supply/cw2015-battery/capacity)
+STATUS=$(cat /sys/class/power_supply/cw2015-battery/status)
+case $((
+ $PERCENT >= 0 && $PERCENT <= 20 ? 1 :
+ $PERCENT > 20 && $PERCENT <= 40 ? 2 :
+ $PERCENT > 40 && $PERCENT <= 60 ? 3 :
+ $PERCENT > 60 && $PERCENT <= 80 ? 4 : 5)) in
+#
+       (1) echo $STATUS:"":$PERCENT%;;
+       (2) echo $STATUS:"":$PERCENT%;;
+       (3) echo $STATUS:"":$PERCENT%;;
+       (4) echo $STATUS:"":$PERCENT%;;
+       (5) echo $STATUS:"":$PERCENT%;;
+esac
+
+
diff --git a/waybar/waybar/scripts/keyhint.sh b/waybar/waybar/scripts/keyhint.sh
new file mode 100755
index 0000000..01f3396
--- /dev/null
+++ b/waybar/waybar/scripts/keyhint.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+yad --title="EndeavourOS Sway-WM keybindings:" --no-buttons --geometry=400x345-15-400 --list --column=key: --column=description: --column=command: "ESC" "close this app" "" "=" "modkey" "(set mod Mod4)" "+enter" "Terminal" "(xfce4-terminal)" "+d" "Application Menu" "(wofi)" "+p" "Activities" "(wofi)" "+o" "" "Open Broswer" "+n" "" "Open Files" "+q" "close focused app" "(kill)" "[Shift]+Print-key" "screenshot" "(grim)" "+Shift+e" "power-menu" "(wofi)" "+t" "open keybinding helper" "full list"
diff --git a/waybar/waybar/scripts/weather.sh b/waybar/waybar/scripts/weather.sh
new file mode 100755
index 0000000..e5e8491
--- /dev/null
+++ b/waybar/waybar/scripts/weather.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+LOC="$1"
+# HTML encode string as %20
+TEMP=$(curl -s 'https://wttr.in/'${LOC}'?format=%t\n&m')
+ICON=$(curl -s 'https://wttr.in/'${LOC}'?format=1' | grep -o '^\S*' )
+# echo $ICON
+echo '{"text": "'$TEMP'", "tooltip": "'$ICON' '$LOC'", "class": "weather" }'
+
diff --git a/waybar/waybar/style.css b/waybar/waybar/style.css
new file mode 100644
index 0000000..e165328
--- /dev/null
+++ b/waybar/waybar/style.css
@@ -0,0 +1,255 @@
+/* =============================================================================
+ *
+ * Waybar configuration
+ *
+ * Configuration reference: https://github.com/Alexays/Waybar/wiki/Configuration
+ *
+ * =========================================================================== */
+
+/* -----------------------------------------------------------------------------
+ * Keyframes
+ * -------------------------------------------------------------------------- */
+ @define-color magenta #9d7cd8;
+ @define-color magenta_2 #ff007c;
+ @define-color bg_highlight #292e42;
+ @define-color blue_1 #65bcff;
+ @define-color bg #222436;
+/*
+Arc-Dark Color Scheme
+*/
+@keyframes blink-warning {
+    70% {
+        color: white;
+    }
+
+    to {
+        color: white;
+        background-color: orange;
+    }
+}
+
+@keyframes blink-critical {
+    70% {
+      color: white;
+    }
+
+    to {
+        color: white;
+        background-color: red;
+    }
+}
+
+/* -----------------------------------------------------------------------------
+ * Base styles
+ * -------------------------------------------------------------------------- */
+
+/* Reset all styles */
+* {
+
+    border: none;
+    border-radius: 0;
+    min-height: 0;
+    margin: 0px;
+    padding: 0;
+    /* color: @blue_1; */
+}
+
+
+/* The whole bar */
+window#waybar {
+    /* color: #dfdfdf; */
+    background-color: rgba(0,0,0,0);
+    /* background-color: @bg; */
+    font-family: JetBrains Mono Nerd Font;
+    /*font-family: Intel One Mono Nerd Font;*/
+    font-size: 14px;
+    /* border-radius: 3px; */
+}
+
+/* Every modules */
+#battery,
+#clock,
+#backlight,
+#cpu,
+#custom-keyboard-layout,
+#memory,
+#mode,
+#custom-weather,
+#network,
+#pulseaudio,
+#temperature,
+#tray,
+#idle_inhibitor,
+#window,
+#workspaces,
+#custom-power,
+#custom-media,
+#custom-PBPbattery {
+    padding:0.25rem 0.75rem;
+    /* margin: 1px 6px; */
+    /* background-color: @bg;
+    border-radius: 20px; */
+    color: @blue_1;
+}
+
+#custom-separator {
+    color: @bg_highlight;
+}
+
+.modules-right,
+.modules-left,
+.modules-center {
+    background-color: @bg;
+    border-radius: 20px;
+}
+/* -----------------------------------------------------------------------------
+ * Modules styles
+ * -------------------------------------------------------------------------- */
+
+#clock {
+    /* color: @magenta_2; */
+    color: @magenta;
+}
+
+#custom-weather {
+    color: @magenta;
+}
+
+#battery {
+    animation-timing-function: linear;
+    animation-iteration-count: infinite;
+    animation-direction: alternate;
+}
+
+#battery.warning {
+    color: orange;
+}
+
+#battery.critical {
+    color: red;
+}
+
+#battery.warning.discharging {
+    animation-name: blink-warning;
+    animation-duration: 3s;
+}
+
+#battery.critical.discharging {
+    animation-name: blink-critical;
+    animation-duration: 2s;
+}
+
+#cpu {
+    color: @magenta;
+}
+
+#cpu.warning {
+    color: orange;
+}
+
+#cpu.critical {
+    color: red;
+}
+
+#memory {
+    animation-timing-function: linear;
+    animation-iteration-count: infinite;
+    animation-direction: alternate;
+    color: @magenta;
+}
+
+#memory.warning {
+    color: orange;
+ }
+
+#memory.critical {
+    color: red;
+    animation-name: blink-critical;
+    animation-duration: 2s;
+    padding-left:5px;
+    padding-right:5px;
+}
+
+#mode {
+    /* background: @highlight; */
+    /* background: #dfdfdf; */
+    border-bottom: 3px transparent;
+    color:@magenta_2;
+    /* margin-left: 5px; */
+    padding: 7px;
+}
+
+#network.disconnected {
+    color: orange;
+}
+
+#pulseaudio {
+    color: @magenta;
+    border-left: 0px;
+    border-right: 0px;
+    margin-right: 0;
+    border-radius: 20px 0 0 20px;
+}
+
+/* #pulseaudio.muted { */
+/*     color: @magenta_2; */
+/* } */
+/**/
+#pulseaudio.microphone {
+    border-left: 0px;
+    border-right: 0px;
+    margin-left: 0;
+    padding-left: 0;
+    border-radius: 0 20px 20px 0;
+}
+
+/* #pulseaudio.microphone.muted { */
+/*     color: @magenta_2; */
+/* } */
+
+
+#temperature.critical {
+    color: red;
+}
+
+#window {
+    font-weight: bold;
+    color: #f7768e;
+}
+
+#custom-media {
+    color: @magenta;
+}
+
+#workspaces {
+    font-size:16px;
+    border-radius: 20px;
+}
+
+#workspaces button {
+    border-bottom: 3px solid transparent;
+    margin-bottom: 0px;
+    color: @blue_1;
+}
+
+#workspaces button.active {
+    color: @magenta;
+    border-bottom: 1px solid @magenta;
+    /* margin-bottom: 1px; */
+    padding-left:0;
+}
+
+#workspaces button.urgent {
+    border-bottom: 1px solid @magenta_2;
+    color: #c9545d;
+}
+
+#custom-power {
+    font-size:18px;
+    padding-right: 1rem;
+}
+
+#backlight.icon {
+    padding-right:1px;
+    font-size: 13px;
+}
diff --git a/wofi/config b/wofi/config
index ffe064e..8208396 100644
--- a/wofi/config
+++ b/wofi/config
@@ -30,3 +30,4 @@ insensitive=true
 allow_images=true
 image_size=30
 gtk_dark=true
+single_click=true
diff --git a/wofi/style.css b/wofi/style.css
index ea202ca..6094157 100644
--- a/wofi/style.css
+++ b/wofi/style.css
@@ -14,11 +14,11 @@ Arc-Dark Color Scheme
 
 window {
     /* border: 1px solid @highlight; */
-    border-radius: 18px;
+    /*border-radius: 18px;
     /* background: rgba(0,0,0,0); */
     color: #bb9af7;
     position: relative;
-    background: linear-gradient(to bottom right, #73daca, #f7768e);
+    /*background: linear-gradient(to bottom right, #73daca, #f7768e); */
     padding: 1px;
 }