diff --git a/dotfiles/polybar.org b/dotfiles/polybar.org
index c7fd440..548aab9 100644
--- a/dotfiles/polybar.org
+++ b/dotfiles/polybar.org
@@ -83,7 +83,7 @@
 
   modules-left = i3 xwindow
   modules-center =
-  modules-right = pulseaudio wired-network wireless-network xbacklight nordvpn dunst unread_mail cpu battery temperature date
+  modules-right = pulseaudio wireless-network xbacklight nordvpn lockscreen dunst unread_mail cpu battery temperature date
 
   tray-position = right
   tray-padding = 0
@@ -312,7 +312,7 @@
   thermal-zone = 0
   warn-temperature = 70
   ;; Temperature off one cpu core
-  hwmon-path = /sys/devices/platform/coretemp.0/hwmon/hwmon2/temp1_input
+  hwmon-path = /sys/devices/platform/coretemp.0/hwmon/hwmon1/temp1_input
 
   format = %{A1:termite -e "watch sensors" &:}<ramp> <label>%{A}
   format-underline = ${colors.background}
@@ -471,6 +471,34 @@
   fi
 #+END_SRC
 
+* Dunst
+#+BEGIN_SRC conf
+  [module/lockscreen]
+  type = custom/script
+
+  format-underline = ${colors.background}
+  click-left = ~/scripts/lockscreen-toggle.sh
+  format = <label>
+  exec = ~/.config/polybar/scripts/lockscreen.sh
+  interval = 2
+#+END_SRC
+
+** Lock screen Status script
+:PROPERTIES:
+:header-args:  :tangle ~/.config/polybar/scripts/lockscreen.sh
+:header-args+: :comments both :mkdirp yes
+:header-args+: :shebang "#!/usr/bin/env bash"
+:END:
+#+BEGIN_SRC bash
+  if pgrep -x "xautolock" >/dev/null
+  then
+      echo "";
+  else
+      echo "%{F#FB4934}%{F-}";
+  fi
+#+END_SRC
+
+
 * Weather
 https://github.com/x70b1/polybar-scripts/tree/master/polybar-scripts/openweathermap-fullfeatured
 
diff --git a/dotfiles/scripts.org b/dotfiles/scripts.org
index c5b0fe1..a822ffd 100644
--- a/dotfiles/scripts.org
+++ b/dotfiles/scripts.org
@@ -83,6 +83,23 @@ Finally, lock the screen using =i3lock=.
   revert
 #+end_src
 
+* Toggle Automatic Lock Screen
+:PROPERTIES:
+:header-args:  :tangle ~/scripts/lockscreen-toggle.sh
+:header-args+: :comments both :mkdirp yes
+:header-args+: :shebang "#!/usr/bin/env bash"
+:END:
+
+#+begin_src bash
+  if pgrep -x "xautolock" >/dev/null
+  then
+      pkill xautolock;
+      notify-send "Lock Screen Desactivated"
+  else
+      xautolock -locker "~/scripts/lockscreen.sh" -detectsleep -time 30 -notify 60 -notifier "dunstify --replace=31846 -u critical -t 10000 -- 'Locking Screen' '60 seconds'" &
+      notify-send "Lock Screen Activated"
+  fi
+#+end_src
 * Delete first page of PDF
   :PROPERTIES:
   :header-args: :tangle ~/scripts/pdf-delete-first-page.sh