diff --git a/.config/i3/config b/.config/i3/config
index 1d8acb3..6db9d3f 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -27,7 +27,7 @@ bindsym $mod+Shift+q kill
 # start dmenu (a program launcher)
 bindsym $mod+d exec --no-startup-id rofi -show drun   -theme themes/app-launcher
 bindsym $mod+i exec --no-startup-id rofi -show window -theme themes/app-launcher 
-bindsym $mod+s exec --no-startup-id rofi -show consul -modi consul:~/.config/rofi/scripts/services -theme themes/app-launcher 
+bindsym $mod+a exec --no-startup-id ~/.config/rofi/scripts/traefik.sh
 bindsym $mod+c exec --no-startup-id rofi -show ssh -theme themes/app-launcher 
  
 set $workspacer ~/.config/i3/i3-workspacer.py
@@ -170,18 +170,21 @@ exec --no-startup-id i3-msg 'exec $TERMINAL; workspace 2; exec firefox;'
 exec --no-startup-id feh --bg-scale ~/Wallpapers/seneca.jpg
 exec --no-startup-id ~/bin/autoconfgure_display.sh
 #exec --no-startup-id xset dpms 500
-exec --no-startup-id nm-applet
+exec --no-startup-id nm-applet --sm-disable
 exec --no-startup-id pasystray
+exec --no-startup-id joplin-desktop
 exec --no-startup-id clipit
 exec --no-startup-id xautolock -time 10 -locker "betterlockscreen -l dim"
 exec --no-startup-id ~/bin/dunstwal
 exec --no-startup-id /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
 
 exec telegram-desktop
-exec mattermost-desktop
+#exec mattermost-desktop
 
 exec --no-startup-id sleep 4; i3-msg '[class="Telegram"] move scratchpad'
+exec --no-startup-id sleep 4; i3-msg '[class="Joplin"] move scratchpad'
 exec --no-startup-id sleep 4; i3-msg '[class="Mattermost"] move scratchpad'
+#exec --no-startup-id sleep 4; i3-msg '[instance="joplin"] resize set 1300 900'
 
 exec_always --no-startup-id wal -R -n
 
@@ -199,6 +202,7 @@ for_window [class="QSyncthingTray"] floating enable
 for_window [class="Thunderbird" window_type="normal"] floating enable, resize set 1600 1050, border pixel 2
 for_window [class="Nautilus"] floating enable
 for_window [class="Gnome-calculator"] floating enable
+#for_window [class="Joplin"] resize set 1300 900, move scratchpad
 
 # keybinds
 bindsym Mod1+Tab workspace back_and_forth
@@ -210,6 +214,8 @@ bindsym Print exec "~/bin/screenshot.sh"
 bindsym $mod+minus [class="Telegram"] scratchpad show
 bindsym $mod+p [class="Mattermost"] scratchpad show
 bindsym $mod+m [class="Cantata"] scratchpad show
+bindsym $mod+Shift+s [class="Joplin"] scratchpad show
+bindsym $mod+Shift+z [class="zoom"] scratchpad show
 
 bindsym $mod+Delete exec rofi -modi system:$HOME/.config/rofi/scripts/powermenu.sh -show system -theme themes/system-menu
 bindsym $mod+shift+Delete exec betterlockscreen -l
diff --git a/.config/polybar/config b/.config/polybar/config
index ef93210..d368fdb 100644
--- a/.config/polybar/config
+++ b/.config/polybar/config
@@ -118,8 +118,8 @@ font-1 = RobotoMono Nerd Font:antialias=true:size=4;2
 font-2 = RobotoMono Nerd Font:antialias=false:size=14;2
 font-3 - RobotoMono Nerd Font:antialias=true:size=18;0
 
-modules-left = s4 battery s3 s4 wlan s3 s4 mpd s3
-modules-center = 
+modules-left = s4 battery s3 s4 wlan s3  s4 weather s5 
+modules-center = s4 mpd s5
 ; pulseaudio
 modules-right =  s4 powermenu s1 pulseaudio s3
 
@@ -439,7 +439,7 @@ label-connected = %local_ip%
 format-disconnected =
 ;format-disconnected = <label-disconnected>
 ;format-disconnected-underline = ${self.format-connected-underline}
-;label-disconnected = %ifname% disconnected
+;label-disconnected = %ifname% disconnecte@maciej.swierczek owszem gógl d
 ;label-disconnected-foreground = ${colors.foreground-alt}
 
 [module/date]
@@ -464,6 +464,10 @@ label-padding = 1
 [module/pulseaudio]
 type = internal/pulseaudio
 
+sink = alsa_output.pci-0000_00_1f.3.analog-stereo
+
+use-ui-max = true
+
 format-volume = <label-volume> <bar-volume>
 label-volume =  墳 %percentage%%
 label-volume-foreground = ${colors.background}
@@ -473,7 +477,7 @@ label-muted ="婢     %{T2}
 label-muted-foreground = ${colors.background}
 format-muted-background = ${colors.primary}
 
-bar-volume-width = 21
+bar-volume-width = 11
 bar-volume-foreground-0 = ${colors.background}
 ;bar-volume-foreground-1 = #55aa55
 ;bar-volume-foreground-2 = #55aa55
@@ -491,16 +495,37 @@ bar-volume-empty = ""
 bar-volume-empty-font = 2
 bar-volume-empty-foreground = ${colors.foreground}
 
+click-right = pavucontrol &
+
 [module/alsa]
 type = internal/alsa
+master-soundcard = default
+speaker-soundcard = default
+headphone-soundcard = default
+master-mixer = Master
+mapped = true
 
-format-volume = <label-volume> <bar-volume>
+format-volume = <ramp-volume> <label-volume>
 label-volume = VOL
-label-volume-foreground = ${root.foreground}
+label-volume-foreground = ${colors.foreground}
+label-volume-background = ${colors.background}
 
-format-muted-prefix = " "
-format-muted-foreground = ${colors.foreground-alt}
-label-muted = sound muted
+
+label-muted = muted
+label-muted-foreground = ${colors.foreground}
+label-muted-background = ${colors.background}
+
+; Only applies if <ramp-volume> is used
+ramp-volume-0 = 0
+ramp-volume-1 = 1
+ramp-volume-2 = 2
+
+; If defined, it will replace <ramp-volume> when
+; headphones are plugged in to `headphone_control_numid`
+; If undefined, <ramp-volume> will be used for both
+; Only applies if <ramp-volume> is used
+ramp-headphones-0 = 
+ramp-headphones-1 = 
 
 bar-volume-width = 10
 bar-volume-foreground-0 = #55aa55
@@ -517,7 +542,7 @@ bar-volume-fill = ─
 bar-volume-fill-font = 2
 bar-volume-empty = ─
 bar-volume-empty-font = 2
-bar-volume-empty-foreground = ${colors.foreground-alt}
+bar-volume-empty-foreground = ${colors.foreground}
 
 [module/battery]
 prefix="BAT"
@@ -577,7 +602,7 @@ label-warn-padding = 1
 format-warn = <ramp> <label-warn>
 ;format-warn-underline = ${self.format-underline}
 format-warn-background= ${colors.primary}
-hwmon-path = /sys/devices/platform/coretemp.0/hwmon/hwmon5/temp1_input
+hwmon-path = /sys/devices/platform/thinkpad_hwmon/hwmon/hwmon4/temp1_input
 label = %temperature-c%
 label-warn = %temperature-c%
 label-warn-foreground = ${colors.background}
@@ -629,12 +654,18 @@ menu-2-0-exec = sudo poweroff
 menu-2-1 = cancel
 menu-2-1-exec = menu-open-0
 
+[module/weather]
+type = custom/script
+exec = ~/.config/polybar/polybar-weather/openweathermap-detailed.sh
+format-background = ${colors.primary}
+format-prefix-foreground = ${colors.background}
+
 [settings]
 screenchange-reload = true
 ;compositing-background = xor
 ;compositing-background = screen
-;compositing-foreground = source
-;compositing-border = over
+compositing-foreground = source
+compositing-border = over
 pseudo-transparency = true
 
 [global/wm]
diff --git a/.config/rofi/scripts/traefik.sh b/.config/rofi/scripts/traefik.sh
new file mode 100755
index 0000000..42c5e2e
--- /dev/null
+++ b/.config/rofi/scripts/traefik.sh
@@ -0,0 +1,7 @@
+#!/bin/bash -x
+
+TRAEFIK="http://traefik.docker.localhost"
+DOMAIN="docker.localhost"
+SERVICES=$(curl ${TRAEFIK}/api/http/routers |jq ".[].rule" |grep "${DOMAIN}" |awk -F\` '{print $2}')
+SELECTION=$(echo -e "$SERVICES" | uniq -u | rofi -dmenu -p "Select traefik service: "  -theme ~/.config/rofi/themes/app-launcher)
+[ ! -z "$SELECTION" ] && xdg-open "http://${SELECTION}"
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index c53f88b..e831327 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,7 +15,8 @@ tags.*
 .exports
 nbproject
 .idea
-docker/etc/php/
+#docker/etc/php/
 .jira
 bin/__pycache__/
 .config/rofi/scripts/__pycache__/
+.phpintel/
diff --git a/.zshrc b/.zshrc
index 49aca10..cbbc231 100644
--- a/.zshrc
+++ b/.zshrc
@@ -170,6 +170,8 @@ alias l="sudo systemctl restart docker && tmux kill-server"
 
 alias crl="dbus-send --session --dest=org.Cinnamon.LookingGlass --type=method_call /org/Cinnamon/LookingGlass org.Cinnamon.LookingGlass.ReloadExtension string:'EXTENSION_UUID' string:'APPLET'"
 
+alias easy-rsa="docker run --rm -it -v /home/paramah/myCertificateAuthority:/pki draeath/easyrsa"
+
 # alias cat="bat"
 #alias ping='~/bin/prettyping --nolegend'