diff --git a/.config/polybar/config b/.config/polybar/config
new file mode 100644
index 0000000..26360b9
--- /dev/null
+++ b/.config/polybar/config
@@ -0,0 +1,478 @@
+;=====================================================
+;
+;   To learn more about how to configure Polybar
+;   go to https://github.com/jaagr/polybar
+;
+;   The README contains alot of information
+;
+;=====================================================
+
+[colors]
+background = #222
+background-alt = #444
+foreground = #dfdfdf
+foreground-alt = #55
+primary = #ffb52a
+secondary = #e60053
+alert = #bd2c40
+
+[global/wm]
+margin-top = 5
+margin-bottom = 5
+
+[bar/top]
+monitor = ${env:MONITOR:eDP-1}
+width = 100%
+height = 20
+offset-x = 0
+offset-y = 0
+
+;background = ${xrdb:color9}
+background = ${colors.background}
+foreground = ${colors.foreground}
+
+overline-size = 0
+overline-color = #f00
+underline-size = 2
+underline-color = #00f
+
+border-bottom = 0
+border-bottom-color = ${colors.background}
+
+spacing = 1
+padding-left = 0
+padding-right = 2
+module-margin-left = 1
+module-margin-right = 2
+
+font-0 = hack:pixelsize=12;1
+font-1 = unifont:size=6:heavy:fontformat=truetype;-2
+font-2 = siji:pixelsize=10;0
+font-3 = FontAwesome:pixelsize=14;0
+
+modules-left =  i3 xwindow
+modules-center =
+modules-right = backlight volume pkg wlan battery 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
+
+[bar/bottom]
+monitor = ${env:MONITOR:eDP-1}
+bottom = true
+width = 100%
+height = 20
+offset-x = 0
+offset-y = 0
+
+;background = ${xrdb:color9}
+background = ${colors.background}
+foreground = ${colors.foreground}
+
+overline-size = 0
+overline-color = #f00
+underline-size = 0
+underline-color = #00f
+
+border-bottom = 0
+border-bottom-color = ${colors.background}
+
+spacing = 1
+padding-left = 0
+padding-right = 2
+module-margin-left = 1
+module-margin-right = 2
+
+font-0 = hack:pixelsize=12;0
+font-1 = unifont:size=6:heavy:fontformat=truetype;-2
+font-2 = siji:pixelsize=10;0
+font-3 = FontAwesome:pixelsize=14;0
+
+modules-left = mpd
+modules-center = networkspeedup networkspeeddown
+modules-right = temperature filesystem-slash filesystem-home cpu memory
+
+tray-position = right
+tray-padding = 2
+
+[module/xwindow]
+type = internal/xwindow
+label = "   %{F#5b5b5b}%{F-} %title:0:50:...%"
+
+[module/xkeyboard]
+type = internal/xkeyboard
+blacklist-0 = num lock
+
+format-underline = ${colors.secondary}
+format-prefix = " "
+format-prefix-foreground = ${colors.foreground-alt}
+
+label-layout = %layout%
+
+label-indicator-padding = 2
+label-indicator-background = ${colors.secondary}
+label-indicator-underline = ${colors.secondary}
+
+[module/filesystem-home]
+type = internal/fs
+interval = 25
+
+mount-0 = /home
+label-mounted = "%{F#5b5b5b}%{F-} %percentage_used%"
+
+[module/filesystem-slash]
+type = internal/fs
+interval = 25
+
+mount-0 = /
+label-mounted = "%{F#5b5b5b}%{F-} %percentage_used%"
+
+;label-unmounted = %mountpoint%: not mounted
+;label-unmounted-foreground = ${colors.foreground-alt}
+
+[module/bspwm]
+type = internal/bspwm
+ws-icon-default = x
+
+label-focused = %index%
+label-focused-background = ${colors.background-alt}
+label-focused-underline= ${colors.primary}
+label-focused-padding = 2
+
+label-occupied = %index%
+label-occupied-padding = 2
+
+label-urgent = %index%!
+label-urgent-background = ${colors.alert}
+label-urgent-padding = 2
+
+label-empty = %index%
+label-empty-foreground = ${colors.foreground-alt}
+label-empty-padding = 2
+
+[module/i3]
+type = internal/i3
+format = <label-state> <label-mode>
+index-sort = true
+wrapping-scroll = false
+strip-wsnumbers = true
+pin-workspaces = true
+
+label-mode-padding = 2
+label-mode-foreground = #000
+label-mode-background = ${colors.primary}
+
+label-focused = %name%
+label-focused-background = ${module/bspwm.label-focused-background}
+label-focused-underline = ${module/bspwm.label-focused-underline}
+label-focused-padding = ${module/bspwm.label-focused-padding}
+
+label-unfocused = %name%
+label-unfocused-padding = ${module/bspwm.label-occupied-padding}
+
+label-urgent = %name%!
+label-urgent-background = ${module/bspwm.label-urgent-background}
+label-urgent-padding = ${module/bspwm.label-urgent-padding}
+
+label-visible = %name%
+label-visible-background = ${self.label-focused-background}
+label-visible-underline = ${self.label-focused-underline}
+label-visible-padding = ${self.label-focused-padding}
+
+ws-icon-0 = 1;
+ws-icon-1 = 2;
+ws-icon-2 = 3;
+ws-icon-3 = 4;
+ws-icon-4 = 5;
+ws-icon-5 = 6;
+ws-icon-6 = 7;
+ws-icon-7 = 8;
+ws-icon-8 = 9;
+ws-icon-9 = 10;
+
+[module/mpd]
+type = internal/mpd
+
+format-online = " <icon-prev> <icon-stop> <toggle> <icon-next>  <icon-repeat> <icon-random>  <label-song>  <bar-progress>"
+
+label-song-maxlen = 40
+label-song-ellipsis = true
+label-offline = offline
+
+icon-prev = 
+icon-seekb = 
+icon-stop = 
+icon-play = 
+icon-pause = 
+icon-next = 
+icon-seekf = 
+
+icon-random = 
+icon-repeat = 
+
+toggle-on-foreground = ${colors.primary}
+toggle-off-foreground = #66
+
+bar-progress-width = 10
+bar-progress-indicator = |
+bar-progress-fill = ─
+bar-progress-empty = ─
+
+[module/backlight]
+type = internal/backlight
+card = intel_backlight
+click-left = connman-gtk
+
+format = <label> <bar>
+label = ""
+
+bar-width = 10
+bar-indicator = |
+bar-indicator-foreground = #ff
+bar-indicator-font = 2
+bar-fill = ─
+bar-fill-font = 2
+bar-fill-foreground = #9f78e1
+bar-empty = ─
+bar-empty-font = 2
+bar-empty-foreground = ${colors.foreground-alt}
+
+[module/cpu]
+type = internal/cpu
+interval = 2
+format = <ramp-coreload>
+format-prefix =
+format-prefix-foreground = ${colors.foreground-alt}
+;format-underline = #f90000
+label = %percentage%
+ramp-coreload-0 = %{F#5b}▁%{F-}
+ramp-coreload-1 = %{F#5b}▂%{F-}
+ramp-coreload-2 = %{F#5b}▃%{F-}
+ramp-coreload-3 = %{F#cb4b16}▄%{F-}
+ramp-coreload-4 = %{F#cb4b16}▅%{F-}
+ramp-coreload-5 = %{F#dc322f}▆%{F-}
+ramp-coreload-6 = %{F#dc322f}▇%{F-}
+ramp-coreload-7 = %{F#dc322f}█%{F-}
+
+
+[module/memory]
+type = internal/memory
+interval = 2
+format = <label> <bar-used>
+format-prefix = 
+format-prefix-foreground = ${colors.foreground-alt}
+;format-underline = #4bffdc
+label =
+bar-used-width = 30
+bar-used-foreground-0 = #55aa55
+bar-used-foreground-1 = #557755
+bar-used-foreground-2 = #f5a70a
+bar-used-foreground-3 = #ff5555
+;bar-used-fill = ▐
+bar-used-fill = 
+bar-used-empty = 
+bar-used-empty-foreground = #444444
+bar-used-indicator =
+
+[module/wlan]
+type = internal/network
+interface = wlp2s0
+interval = 3.0
+
+format-connected = <label-connected>
+format-connected-underline = #9f78e1
+format-disconnected-underline = ${self.format-connected-underline}
+
+label-connected = "%{F#5b5b5b}%{F-} %essid%"
+label-disconnected = %ifname%
+label-disconnected-foreground = ${colors.foreground-alt}
+
+ramp-signal-0 = 
+ramp-signal-1 = 
+ramp-signal-2 = 
+ramp-signal-3 = 
+ramp-signal-4 = 
+ramp-signal-foreground = ${colors.foreground-alt}
+;click-left = connman-gtk
+
+[module/eth]
+type = internal/network
+;interface = br0
+interval = 3.0
+
+format-connected-underline = #55aa55
+format-connected-prefix = " "
+format-connected-foreground-foreground = ${colors.foreground-alt}
+label-connected = %local_ip%
+
+format-disconnected-underline = ${self.format-connected-underline}
+label-disconnected = %ifname%
+label-disconnected-foreground = ${colors.foreground-alt}
+
+[module/networkspeedup]
+type = internal/network
+interface = wlp2s0
+label-connected = "%{u#dc322f +u}%{F#5b}%{F-}%upspeed:7%%{u-}"
+
+[module/networkspeeddown]
+type = internal/network
+interface = wlp2s0
+label-connected = "%{u#2aa198 +u}%{F#5b}%{F-}%downspeed:7%%{u-}"
+
+[module/date]
+type = internal/date
+interval = 5
+
+date = "%d/%m/%y"
+date-alt = " %d"
+
+time = " %H:%M:%S"
+time-alt =  %H:%M
+
+;format-prefix = 
+format-prefix-foreground = ${colors.foreground-alt}
+format-underline = #0a6cf5
+
+label = %date% %time%
+
+[module/volume]
+type = internal/volume
+
+format-volume = <label-volume> <bar-volume>
+label-volume = ""
+label-volume-foreground = ${root.foreground}
+
+format-muted-prefix = " "
+format-muted-foreground = ${colors.foreground-alt}
+label-muted = 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-indicator-foreground = #ff
+bar-volume-fill = ─
+bar-volume-fill-font = 2
+bar-volume-empty = ─
+bar-volume-empty-font = 2
+bar-volume-empty-foreground = ${colors.foreground-alt}
+
+[module/battery]
+type = internal/battery
+battery = BAT0
+adapter = AC
+full-at = 98
+time-format = %H:%M
+
+label-discharging = %percentage% %time%
+
+format-charging = <animation-charging> <label-charging>
+format-charging-underline = #ffb52a
+
+format-discharging = <ramp-capacity> <label-discharging>
+format-discharging-underline = ${self.format-charging-underline}
+
+format-full-prefix = " "
+format-full-prefix-foreground = ${colors.foreground-alt}
+format-full-underline = ${self.format-charging-underline}
+
+ramp-capacity-0 = 
+ramp-capacity-1 = 
+ramp-capacity-2 = 
+ramp-capacity-3 = 
+ramp-capacity-4 = 
+ramp-capacity-foreground = ${colors.foreground-alt}
+
+animation-charging-0 = 
+animation-charging-1 = 
+animation-charging-2 = 
+animation-charging-3 = 
+animation-charging-4 = 
+animation-charging-foreground = ${colors.foreground-alt}
+animation-charging-framerate = 750
+
+[module/temperature]
+type = internal/temperature
+thermal-zone = 0
+warn-temperature = 60
+
+format = <ramp> <label>
+format-underline = #f50a4d
+format-warn = <ramp> <label-warn>
+format-warn-underline = ${self.format-underline}
+
+label = %temperature%
+label-warn = %temperature%
+label-warn-foreground = ${colors.secondary}
+
+ramp-0 = 
+ramp-1 = 
+ramp-2 = 
+ramp-foreground = ${colors.foreground-alt}
+
+[module/pkg]
+type = custom/script
+;tail = true
+interval = 1200
+format = <label>
+;format-background = #999
+;format-foreground = #000
+;format-padding = 4
+label = "%output:0:100%"
+exec = ~/.config/polybar/pkg.sh
+;exec = checkupdates
+
+[module/powermenu]
+type = custom/menu
+
+label-open = 
+label-open-foreground = #b63650
+label-close =  cancel
+label-close-foreground = ${colors.secondary}
+label-separator = |
+label-separator-foreground = ${colors.foreground-alt}
+
+menu-0-0 = reboot
+menu-0-0-exec = menu-open-1
+menu-0-1 = power off
+menu-0-1-exec = menu-open-2
+menu-0-2 = log out
+menu-0-2-exec = menu-open-3
+menu-0-3 = 
+menu-0-3-exec = ~/.i3/i3lock-fancy-multimonitor/lock
+
+menu-1-0 = cancel
+menu-1-0-exec = menu-open-0
+menu-1-1 = reboot
+menu-1-1-exec = sudo reboot
+
+menu-2-0 = power off
+menu-2-0-exec = shutdown now
+menu-2-1 = cancel
+menu-2-1-exec = menu-open-0
+
+menu-3-0 = log out
+menu-3-0-exec = i3-msg exit
+menu-3-1 = cancel
+menu-3-1-exec = menu-open-0
+; vim:ft=dosini
diff --git a/.config/polybar/launch.sh b/.config/polybar/launch.sh
new file mode 100755
index 0000000..a6d27f1
--- /dev/null
+++ b/.config/polybar/launch.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env sh
+
+# Terminate already running bar instances
+killall -q polybar
+
+# Wait until the processes have been shut down
+while pgrep -x polybar >/dev/null; do sleep 1; done
+
+# Launch bar1 and bar2
+polybar top &
+polybar bottom &
+
+echo "Bars launched..."
diff --git a/.config/polybar/pkg.sh b/.config/polybar/pkg.sh
new file mode 100755
index 0000000..277d336
--- /dev/null
+++ b/.config/polybar/pkg.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+pac=$(checkupdates | wc -l)
+aur=$(cower -u | wc -l)
+#echo "%{u#ff9900 +u}%{F#dc322f}$pac %{F-}%{F#5b5b5b}%{F-}%{F#cb4b16} $aur%{F-}%{u-}"
+echo "%{u#dc322f +u}$pac %{F#5b5b5b}%{F-} $aur%{u-}"
diff --git a/README.md b/README.md
index 6cc10c8..abd61ea 100644
--- a/README.md
+++ b/README.md
@@ -1,30 +1,34 @@
-# Archlinux i3wm Dark Solarized
+# Archlinux i3-gaps Dark Solarized
 
-i3wm zsh conky
+i3-gaps zsh polybar
 
 ![alt tag](https://github.com/eoli3n/dotfiles/blob/master/screenshots/i3wm.png)
 
-weechat
+Weechat
 
 ![alt tag](https://github.com/eoli3n/dotfiles/blob/master/screenshots/weechat.png)
 
-thunar gtk dmenu2
+O!MPD thunar gtk
 
 ![alt tag](https://github.com/eoli3n/dotfiles/blob/master/screenshots/thunar.png)
 
-firefox O!MPD
+Retroarch
 
-![alt tag](https://github.com/eoli3n/dotfiles/blob/master/screenshots/web.png)
+![alt tag](https://github.com/eoli3n/dotfiles/blob/master/screenshots/retroarch.png)
 
 i3lock
 
 ![alt tag](https://github.com/eoli3n/dotfiles/blob/master/screenshots/i3lock.png)
 
+Connman
+
+![alt tag](https://github.com/eoli3n/dotfiles/blob/master/screenshots/connman.png)
+
 # Env setup
     
-    sudo pacman -S i3-wm rxvt-unicode zsh git i3lock ttf-hack vim weechat compton conky xbindkeys powerline powerline-fonts powerline-vim xorg-xrdb xclip zsh-syntax-highlighting tmux
+    sudo pacman -S rxvt-unicode zsh git i3lock ttf-hack vim weechat compton xbindkeys powerline powerline-fonts powerline-vim xorg-xrdb xclip zsh-syntax-highlighting tmux
 
-    yaourt -S compton-git powerline ttf-font-awesome ttf-font-icons j4-dmenu-desktop
+    pacaur -S i3-gaps polybar albert compton-git powerline ttf-font-awesome ttf-unifont ttf-font-icons j4-dmenu-desktop siji-git
 
     cd ~/.i3
     git clone https://github.com/guimeira/i3lock-fancy-multimonitor
diff --git a/a b/a
deleted file mode 100644
index 7898192..0000000
--- a/a
+++ /dev/null
@@ -1 +0,0 @@
-a
diff --git a/screenshots/connman.png b/screenshots/connman.png
new file mode 100644
index 0000000..5ae1ce2
Binary files /dev/null and b/screenshots/connman.png differ
diff --git a/screenshots/i3lock.png b/screenshots/i3lock.png
index 209b86a..2cd68ea 100644
Binary files a/screenshots/i3lock.png and b/screenshots/i3lock.png differ
diff --git a/screenshots/i3wm.png b/screenshots/i3wm.png
index 4e895e5..c6b442f 100644
Binary files a/screenshots/i3wm.png and b/screenshots/i3wm.png differ
diff --git a/screenshots/retroarch.png b/screenshots/retroarch.png
new file mode 100644
index 0000000..5aaeacd
Binary files /dev/null and b/screenshots/retroarch.png differ
diff --git a/screenshots/thunar.png b/screenshots/thunar.png
index b8e188b..55052d6 100644
Binary files a/screenshots/thunar.png and b/screenshots/thunar.png differ
diff --git a/screenshots/web.png b/screenshots/web.png
deleted file mode 100644
index c9c5d63..0000000
Binary files a/screenshots/web.png and /dev/null differ
diff --git a/screenshots/weechat.png b/screenshots/weechat.png
index 9e8df8d..b8007e5 100644
Binary files a/screenshots/weechat.png and b/screenshots/weechat.png differ