diff --git a/.config/polybar/config b/.config/polybar/config
new file mode 100644
index 0000000..eb1dd0d
--- /dev/null
+++ b/.config/polybar/config
@@ -0,0 +1,259 @@
+;=====================================================
+;
+;   To learn more about how to configure Polybar
+;   go to https://github.com/jaagr/polybar
+;
+;   The README contains alot of information
+;
+;=====================================================
+
+[colors]
+;background = ${xrdb:color0:#222}
+background = #15325A
+background-alt = #25426A
+;foreground = ${xrdb:color7:#222}
+foreground = #dfdfdf
+foreground-alt = #55729A
+primary = #ffb52a
+secondary = #e60053
+alert = #bd2c40
+
+[bar/top]
+;monitor = ${env:MONITOR:HDMI-1}
+width = 100%
+height = 28
+;offset-x = 1%
+;offset-y = 1%
+radius = 0
+fixed-center = false
+
+background = ${colors.background}
+foreground = ${colors.foreground}
+
+line-size = 3
+line-color = #f00
+
+border-size = 0
+border-color = #00000000
+
+padding-left = 0
+padding-right = 1
+
+module-margin-left = 1
+module-margin-right = 1
+
+font-0 = "xos4 Terminus:pixelsize=16"
+font-1 = FontAwesome:pixelsize=16;1
+
+modules-left = i3
+modules-center = xwindow
+modules-right = filesystem volume xkeyboard memory cpu eth date powermenu
+
+tray-position = right
+tray-padding = 2
+;tray-transparent = true
+;tray-background = #0063ff
+
+;wm-restack = bspwm
+;wm-restack = i3
+
+;override-redirect = true
+
+;scroll-up = bspwm-desknext
+;scroll-down = bspwm-deskprev
+
+scroll-up = i3wm-wsnext
+scroll-down = i3wm-wsprev
+
+cursor-click = pointer
+cursor-scroll = ns-resize
+
+[module/i3]
+type = internal/i3
+format = <label-state> <label-mode>
+index-sort = true
+wrapping-scroll = false
+
+; Only show workspaces on the same output as the bar
+pin-workspaces = true
+
+label-mode-padding = 2
+label-mode-foreground = #000
+label-mode-background = ${colors.primary}
+
+; focused = Active workspace on focused monitor
+label-focused = %name%
+label-focused-background = ${colors.background-alt}
+label-focused-underline= ${colors.primary}
+label-focused-padding = 2
+
+; unfocused = Inactive workspace on any monitor
+label-unfocused = %index%
+label-unfocused-padding = 2
+
+; visible = Active workspace on unfocused monitor
+label-visible = %index%
+label-visible-background = ${self.label-focused-background}
+label-visible-underline = ${self.label-focused-underline}
+label-visible-padding = ${self.label-focused-padding}
+
+; urgent = Workspace with urgency hint set
+label-urgent = %index%
+label-urgent-background = ${colors.alert}
+label-urgent-padding = 2
+
+[module/xwindow]
+type = internal/xwindow
+label =  %title:0:30:...%
+format-foreground = #AA3552
+
+[module/xkeyboard]
+type = internal/xkeyboard
+blacklist-0 = num lock
+
+format-prefix = " "
+format-prefix-foreground = ${colors.foreground-alt}
+format-prefix-underline = ${colors.secondary}
+
+label-layout = %layout%
+label-layout-underline = ${colors.secondary}
+
+label-indicator-padding = 0
+label-indicator-margin = 0
+label-indicator-background = ${colors.secondary}
+label-indicator-underline = ${colors.secondary}
+
+[module/filesystem]
+type = internal/fs
+interval = 25
+
+format-mounted = <label-mounted>
+format-unmounted = <label-unmounted>
+
+mount-0 = /
+mount-1 = /media
+
+label-mounted = %{F#0a81f5}%mountpoint%%{F-}: %free%
+label-unmounted = %mountpoint%
+label-unmounted-foreground = ${colors.foreground-alt}
+
+[module/cpu]
+type = internal/cpu
+interval = 2
+format-prefix = " "
+format-prefix-foreground = ${colors.foreground-alt}
+format-underline = #f90000
+label = %percentage:2%%
+
+[module/memory]
+type = internal/memory
+interval = 2
+format-prefix = " "
+format-prefix-foreground = ${colors.foreground-alt}
+format-underline = #4bffdc
+label = %percentage_used%%
+
+[module/eth]
+type = internal/network
+interface = enp4s0
+interval = 3.0
+
+format-connected-underline = #55aa55
+format-connected-prefix = " "
+format-connected-prefix-foreground = ${colors.foreground-alt}
+label-connected = %local_ip%
+
+format-disconnected =
+;format-disconnected = <label-disconnected>
+;format-disconnected-underline = ${self.format-connected-underline}
+;label-disconnected = %ifname% disconnected
+;label-disconnected-foreground = ${colors.foreground-alt}
+
+[module/date]
+type = internal/date
+interval = 5
+
+date =
+date-alt = " %Y-%m-%d"
+
+time = %H:%M
+time-alt = %H:%M:%S
+
+format-prefix-foreground = ${colors.foreground-alt}
+format-prefix= 
+format-underline = #0a6cf5
+
+label = %date% %time%
+
+[module/volume]
+type = internal/volume
+
+format-volume = <label-volume> <bar-volume>
+label-volume = "VOL"
+label-volume-foreground = ${root.foreground}
+
+format-muted-prefix = " "
+format-muted-foreground = ${colors.foreground-alt}
+label-muted = sound muted
+
+bar-volume-width = 10
+bar-volume-foreground-0 = #55aa55
+bar-volume-foreground-1 = #55aa55
+bar-volume-foreground-2 = #55aa55
+bar-volume-foreground-3 = #55aa55
+bar-volume-foreground-4 = #55aa55
+bar-volume-foreground-5 = #f5a70a
+bar-volume-foreground-6 = #ff5555
+bar-volume-gradient = false
+bar-volume-indicator = |
+bar-volume-indicator-font = 2
+bar-volume-fill = ─
+bar-volume-fill-font = 2
+bar-volume-empty = ─
+bar-volume-empty-font = 2
+bar-volume-empty-foreground = ${colors.foreground-alt}
+
+[module/powermenu]
+type = custom/menu
+
+expand-right = true
+
+format-spacing = 1
+label-open = 
+label-open-foreground = ${colors.secondary}
+label-close =  cancel
+label-close-foreground = ${colors.secondary}
+label-separator = |
+label-separator-foreground = ${colors.foreground-alt}
+
+menu-0-0 =  Power
+menu-0-0-exec = menu-open-1
+menu-0-1 =  User
+menu-0-1-exec = menu-open-2
+
+menu-1-0 = Reboot
+menu-1-0-exec = systemctl reboot
+menu-1-1 = Shutdown
+menu-1-1-exec = systemctl poweroff
+menu-1-2 = Hibernate
+menu-1-2-exec = systemctl hibernate
+menu-1-3 = Suspend
+menu-1-3-exec = systemctl suspend
+
+menu-2-0 =  Lock
+menu-2-0-exec = bash ~/.i3/scripts/locker.sh
+menu-2-1 =  Logout
+menu-2-1-exec = i3-msg exit
+
+[settings]
+screenchange-reload = true
+;compositing-background = xor
+;compositing-background = screen
+;compositing-foreground = source
+;compositing-border = over
+
+[global/wm]
+margin-top = 0
+margin-bottom = 3
+
+; vim:ft=dosini
diff --git a/.i3/config b/.i3/config
index 4123db6..282c040 100644
--- a/.i3/config
+++ b/.i3/config
@@ -1,6 +1,7 @@
 # T's desktop v3
 #exec --no-stratup-id xrandr --output eDP1 --primary --auto
 exec --no-startup-id xrandr --output HDMI-0 --auto --mode 2048x1152 --primary
+exec_always --no-startup-id $HOME/.i3/scripts/polybar_launch.sh
 exec --no-startup-id mplayer -fs ~/.i3/boot.mp4
 exec --no-startup-id xset -dpms && xset s noblank && xset s noexpose && xset dpms 600 1800 360
 exec --no-startup-id xautolock -time 10 -locker ~/.i3/scripts/locker.sh
@@ -22,7 +23,7 @@ exec xmodmap ~/.i3/custom.map
 # US brackets on slovene special characters
 #exec xmodmap ~/.i3/custom.map
 
-font pango: FontAwesome, xos4 Terminess Powerline 12
+font pango: FontAwesome, xos4 Terminess Powerline 14
 
 
 #--APPEARANCE--#
@@ -222,23 +223,23 @@ mode "ignore" {
 bindsym $alt+i mode "ignore"
 
 #--BAR CONFIGURATION--#
-bar {
-    tray_output primary
-    #status_command i3blocks -c ~/.i3/i3blocks.conf
-    status_command i3blocks -c ~/.i3/i3blocks-netbook.conf
-
-    mode dock
-    hidden_state show
-    position top
-    # T-i3
-    colors {
-        background #15325A
-        statusline #FFFFFF
-        separator #666666
-        focused_workspace  #225396 #184791 #ffffff
-        active_workspace   #333333 #5f676a #ffffff
-        inactive_workspace #333333 #222222 #888888
-        urgent_workspace   #aa0000 #990000 #ffffff
-    }
-}
+#bar {
+#    tray_output primary
+#    #status_command i3blocks -c ~/.i3/i3blocks.conf
+#    status_command i3blocks -c ~/.i3/i3blocks-netbook.conf
+#
+#    mode dock
+#    hidden_state show
+#    position top
+#    # T-i3
+#    colors {
+#        background #15325A
+#        statusline #FFFFFF
+#        separator #666666
+#        focused_workspace  #225396 #184791 #ffffff
+#        active_workspace   #333333 #5f676a #ffffff
+#        inactive_workspace #333333 #222222 #888888
+#        urgent_workspace   #aa0000 #990000 #ffffff
+#    }
+#}
 # vim:filetype=i3
diff --git a/.i3/i3blocks-netbook.conf b/.i3/i3blocks-netbook.conf
index d93d87b..75010b3 100644
--- a/.i3/i3blocks-netbook.conf
+++ b/.i3/i3blocks-netbook.conf
@@ -35,4 +35,4 @@ interval=5
 
 [shutdown_menu]
 full_text= Quit
-command=~/.i3/scripts/shutdown_menu -c
+command= ~/.i3/scripts/shutdown_menu -c
diff --git a/.i3/i3blocks.conf b/.i3/i3blocks.conf
index 477e752..cf3cee9 100644
--- a/.i3/i3blocks.conf
+++ b/.i3/i3blocks.conf
@@ -47,4 +47,4 @@ interval=5
 
 [shutdown_menu]
 full_text= Quit
-command=~/.i3/scripts/shutdown_menu -c
+command= ~/.i3/scripts/shutdown_menu -c
diff --git a/.i3/scripts/polybar_launch.sh b/.i3/scripts/polybar_launch.sh
new file mode 100755
index 0000000..ec93ea8
--- /dev/null
+++ b/.i3/scripts/polybar_launch.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env sh
+
+# Terminate already running bar instances
+killall -q polybar
+
+# Wait until the processes have been shut down
+while pgrep -u $UID -x polybar >/dev/null; do sleep 1; done
+
+polybar top &
+
+
+echo "Bars launched..."
diff --git a/.i3/scripts/shutdown_menu b/.i3/scripts/shutdown_menu
index 87a1130..f8706ce 100755
--- a/.i3/scripts/shutdown_menu
+++ b/.i3/scripts/shutdown_menu
@@ -16,8 +16,8 @@ menu=(
   [Hibernate]="systemctl hibernate"
   [Suspend]="systemctl suspend"
   [Halt]="systemctl halt"
-  [Lock]="i3lock --color=${BG_COLOR}"
-  [Logout]="i3-msg exit"
+  [Lock]="~/.i3/scripts/locker.sh"
+  [Logout]="exit"
   [Cancel]="Cancel"
 )