diff --git a/.Xresources b/.Xresources
index 016bb45..08dd3ea 100644
--- a/.Xresources
+++ b/.Xresources
@@ -1,3 +1,4 @@
 #include ".Xresources.d/rxvt-unicode"
 #include ".Xresources.d/x11-ssh-askpass"
-#include ".Xresources.d/solarized"
+#include ".Xresources.d/hyperterm-snazzy"
+#include ".Xresources.d/rofi"
diff --git a/.Xresources.d/hyperterm-snazzy b/.Xresources.d/hyperterm-snazzy
new file mode 120000
index 0000000..9b5bd87
--- /dev/null
+++ b/.Xresources.d/hyperterm-snazzy
@@ -0,0 +1 @@
+/home/user/.Xresources.d/hyperterm-snazzy
\ No newline at end of file
diff --git a/.Xresources.d/rofi b/.Xresources.d/rofi
new file mode 120000
index 0000000..06fc6c9
--- /dev/null
+++ b/.Xresources.d/rofi
@@ -0,0 +1 @@
+/home/user/.Xresources.d/rofi
\ No newline at end of file
diff --git a/.config/polybar/config b/.config/polybar/config
index efe1190..c3e8edb 100644
--- a/.config/polybar/config
+++ b/.config/polybar/config
@@ -54,7 +54,7 @@ overline-color = #f00
 underline-size = 2
 underline-color = #00f
 
-border-bottom = 0
+border-bottom-size = 0
 border-bottom-color = ${colors.background}
 
 spacing = 1
@@ -71,6 +71,7 @@ font-3 = FontAwesome:pixelsize=14;0
 modules-left =  i3 xwindow
 modules-center =
 modules-right = backlight volume github pkg wlan vpncheck battery date powermenu
+;modules-right = backlight volume pkg wlan vpncheck battery date powermenu
 
 tray-position = left
 tray-padding = 4
@@ -105,7 +106,7 @@ overline-color = #f00
 underline-size = 0
 underline-color = #00f
 
-border-bottom = 0
+border-bottom-size = 0
 border-bottom-color = ${colors.background}
 
 spacing = 1
@@ -126,80 +127,6 @@ modules-right = temperature filesystem-slash filesystem-home cpu memory
 tray-position =
 tray-padding = 2
 
-[bar/top-left]
-monitor = ${env:MONITOR:DP-1-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 =
-
-tray-position =
-tray-padding = 2
-
-[bar/top-up]
-monitor = ${env:MONITOR:DP-1-2}
-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 =
-
-tray-position =
-tray-padding = 2
-
 [module/xwindow]
 type = internal/xwindow
 label = "   %{F#5b5b5b}%{F-} %title:0:70:...%"
@@ -297,11 +224,12 @@ ws-icon-9 = 10;
 
 [module/github]
 type = internal/github
-token = ${env:GITHUB_API_TOKEN}
+token = ${file:$HOME/.config/polybar/github_token}
 
-label = "%{u#2aa198}%{F#5b} %{F-}%notifications%%{u-}"
-empty-notifications = true
-;format-prefix = "%{F#5b}%{F-}"
+label = "%notifications%"
+format-underline = #2aa198
+format-prefix = " "
+format-prefix-foreground = #5b
 
 [module/mpd]
 type = internal/mpd
@@ -393,11 +321,14 @@ interface = wlp2s0
 interval = 3.0
 
 format-connected = <label-connected>
-format-connected-underline = #9f78e1
-format-disconnected-underline = ${self.format-connected-underline}
+format-connected-prefix = " "
+format-connected-prefix-foreground = #5b
 
-label-connected = "%{A1:connman-gtk:}%{F#5b5b5b}%{F-} %essid%%{A}"
-label-disconnected = "%{A1:connman-gtk:} %ifname%%{A}"
+format-connected-underline = #9f78e1
+;format-disconnected-underline = ${self.format-connected-underline}
+
+label-connected = "%{A1:connman-gtk &:}%essid%%{A}"
+label-disconnected = "%{A1:connman-gtk &:}%{A}"
 label-disconnected-foreground = #5b
 
 ramp-signal-0 = 
@@ -406,7 +337,6 @@ ramp-signal-2 = 
 ramp-signal-3 = 
 ramp-signal-4 = 
 ramp-signal-foreground = ${colors.foreground-alt}
-;click-left = connman-gtk
 
 [module/eth]
 type = internal/network
@@ -425,12 +355,18 @@ label-disconnected-foreground = ${colors.foreground-alt}
 [module/networkspeedup]
 type = internal/network
 interface = wlp2s0
-label-connected = "%{u#dc322f +u}%{F#5b}%{F-}%upspeed:7%%{u-}"
+label-connected = "%upspeed:7%"
+format-connected = <label-connected>
+format-connected-prefix = " "
+format-connected-prefix-foreground = #5b
 
 [module/networkspeeddown]
 type = internal/network
 interface = wlp2s0
-label-connected = "%{u#2aa198 +u}%{F#5b}%{F-}%downspeed:7%%{u-}"
+label-connected = "%downspeed:7%"
+format-connected = <label-connected>
+format-connected-prefix = " "
+format-connected-prefix-foreground = #5b
 
 [module/date]
 type = internal/date
@@ -535,12 +471,10 @@ 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
+format-underline = #dc322f
+label = "%output:0:30%"
+exec = .config/polybar/pkg.sh
+exec-if = "ping -q -w 2 -c 1 176.34.135.167 > /dev/null"
 
 [module/vpncheck]
 type = custom/script
@@ -555,7 +489,7 @@ format-prefix-foreground = #5b
 type = custom/menu
 
 label-open = 
-label-open-foreground = #b63650
+label-open-foreground = #ff5c56
 label-close =  cancel
 label-close-foreground = ${colors.secondary}
 label-separator = |
@@ -568,7 +502,7 @@ 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-0-3-exec = "~/.i3/i3lock-fancy-multimonitor/lock &"
 
 menu-1-0 = cancel
 menu-1-0-exec = menu-open-0
diff --git a/.config/polybar/pkg.sh b/.config/polybar/pkg.sh
index a3d36c0..f4457d3 100755
--- a/.config/polybar/pkg.sh
+++ b/.config/polybar/pkg.sh
@@ -2,5 +2,8 @@
 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-}"
+check=$((pac + aur))
+if [[ "$check" != "0" ]]
+then
+    echo "$pac %{F#5b5b5b}%{F-} $aur"
+fi
diff --git a/.i3/config b/.i3/config
index fb8322b..0cc171c 100644
--- a/.i3/config
+++ b/.i3/config
@@ -14,9 +14,10 @@ new_window pixel
 # start a terminal
 bindsym $mod+Return exec urxvtc
 
-# start dmenu
-#bindsym $mod+d exec --no-startup-id j4-dmenu-desktop --dmenu="dmenu -fn 'hack-10' -h 20 -nb '#202020' -nf '#FFFFFF' -sf '#dc322f' -sb '#202020' -p '>' -b -w 400 -q -o 0.9"
-bindsym $mod+d exec --no-startup-id .i3/j4-dmenu.sh
+# start drofi dmenu
+bindsym $mod+w exec --no-startup-id rofi -show window
+bindsym $mod+Shift+w exec --no-startup-id rofi -show run
+bindsym $mod+Shift+x exec --no-startup-id rofi -show drun
 
 #############################################################################################################################
 
@@ -120,14 +121,11 @@ smart_borders on
 
 #############################################################################################################################
 
-#zmenu
-bindsym $mod+Shift+q exec ~/.i3/zmenu.sh
+#rofi_power menu
+bindsym $mod+Shift+q exec ~/.i3/rofi_powermenu.sh
 
-#wappslocalmenu
-bindsym $mod+x exec ~/.i3/wappslocalmenu.sh
-
-#wappsmenu
-bindsym $mod+w exec ~/dev/git/dmenu2-web/launcher.sh
+#rofi_custom menu
+bindsym $mod+x exec ~/.i3/rofi_custom.sh
 
 # apps
 bindsym $mod+Control+t exec thunar
@@ -221,7 +219,7 @@ mode "resize" {
 bindsym $mod+r mode "resize"
 
 exec_always --no-startup-id $HOME/.config/polybar/launch.sh
-exec --no-startup-id menutray -i
+#exec --no-startup-id menutray -i
 
 #bar {
 #        position top
diff --git a/.i3/conky-bottom.sh b/.i3/conky-bottom.sh
deleted file mode 100755
index 5bbf271..0000000
--- a/.i3/conky-bottom.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-# Send the header so that i3bar knows we want to use JSON:
-echo '{"version":1}'
-
-# Begin the endless array.
-echo '['
-
-# We send an empty first array of blocks to make the loop simpler:
-echo '[],'
-
-# Now send blocks with information forever:
-exec conky -c $HOME/.i3/conkyrc-bottom
diff --git a/.i3/conky-top.sh b/.i3/conky-top.sh
deleted file mode 100755
index 8caa099..0000000
--- a/.i3/conky-top.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-# Send the header so that i3bar knows we want to use JSON:
-echo '{"version":1}'
-
-# Begin the endless array.
-echo '['
-
-# We send an empty first array of blocks to make the loop simpler:
-echo '[],'
-
-# Now send blocks with information forever:
-exec conky -c $HOME/.i3/conkyrc-top
diff --git a/.i3/conkyrc-bottom b/.i3/conkyrc-bottom
deleted file mode 100644
index 1790668..0000000
--- a/.i3/conkyrc-bottom
+++ /dev/null
@@ -1,128 +0,0 @@
-#!/usr/bin/conky
-out_to_x no
-own_window no
-out_to_console yes
-background no
-max_text_width 0
-
-# Update interval in seconds
-update_interval 1.0
-
-# This is the number of times Conky will update before quitting.
-# Set to zero to run forever.
-total_run_times 0
-
-# Shortens units to a single character (kiB->k, GiB->G, etc.). Default is off.
-short_units yes
-
-# How strict should if_up be when testing an interface for being up?
-# The value is one of up, link or address, to check for the interface
-# being solely up, being up and having link or being up, having link
-# and an assigned IP address. 
-if_up_strictness address
-
-# Add spaces to keep things from moving about?  This only affects certain objects.
-# use_spacer should have an argument of left, right, or none
-use_spacer left
-
-# Force UTF8? note that UTF8 support required XFT
-override_utf8_locale no
-
-# number of cpu samples to average
-# set to 1 to disable averaging
-cpu_avg_samples 2
-
-# Stuff after 'TEXT' will be formatted on screen
-# JSON for i3bar
-
-TEXT
-
-[
-
-#backup disk
-${if_match ${execi 60 df -h | grep sdb1 | wc -l} == 1 }\
-    ${if_match ${execi 60 df -h | grep sdb1 | awk '{print $5}' | cut -d"%" -f1} >= 95 }\
-        {"full_text":" ${execi 60 df -h | grep sdb1 | awk '{print $5}'}","color":"\#dc322f","separator":false,"separator_block_width":10, "min_width": 65, "align": "left"}\
-        ${else}
-        ${if_match ${execi 60 df -h | grep sdb1 | awk '{print $5}' | cut -d"%" -f1} >= 90 }\
-            {"full_text":" ${execi 60 df -h | grep sdb1 | awk '{print $5}'}","color":"\#F15D25","separator":false,"separator_block_width":10, "min_width": 65, "align": "left"}\
-            ${else}
-            {"full_text":" ${execi 60 df -h | grep sdb1 | awk '{print $5}'}","color":"\#268bd2","separator":false,"separator_block_width":10, "min_width": 65, "align": "left"},\
-
-        $endif
-    $endif
-$endif
-
-#ADD DYNAMIC INTERFACE
-
-{"full_text":" ${downspeed wlp2s0}","color":"\#2aa198","separator":false,"separator_block_width":15, "min_width": 65, "align": "left"},\
-
-#UP
-
-#ADD DYNAMIC INTERFACE
-
-{"full_text":" ${upspeed wlp2s0}","color":"\#dc322f","separator":false,"separator_block_width":15, "min_width": 65, "align": "left"},\
-
-#CPU
-
-${if_match ${cpu cpu0} >= 80}\
-{"full_text":" ${cpu cpu0}%","color":"\#dc322f","separator":false,"separator_block_width":6, "min_width": 65, "align": "left"},\
-${else}
-    ${if_match ${cpu cpu0} >= 50}\
-    {"full_text":" ${cpu cpu0}%","color":"\#E56C08","separator":false,"separator_block_width":6, "min_width": 65, "align": "left"},\
-    ${else}
-    {"full_text":" ${cpu cpu0}%","color":"\#c5c5c5","separator":false,"separator_block_width":6, "min_width": 65, "align": "left"},\
-    $endif
-$endif
-    
-#MEM
-
-# CHANGE COLOR IN HIGH MEMORY USAGE
-{"full_text":" ${mem}","color":"\#c5c5c5","separator":false,"separator_block_width":20, "min_width": 65, "align": "left"},\
-
-#SYSTEM
-${if_match ${execi 60 df -h | grep universe-lvroot | awk '{print $5}' | cut -d"%" -f1} >= 95 }\
-    {"full_text":" ${execi 60 df -h | grep universe-lvroot | awk '{print $5}'}","color":"\#dc322f","separator":false,"separator_block_width":6, "min_width": 65, "align": "left"},\
-    ${else}
-    ${if_match ${execi 60 df -h | grep universe-lvroot | awk '{print $5}' | cut -d"%" -f1} >= 90 }\
-        {"full_text":" ${execi 60 df -h | grep universe-lvroot | awk '{print $5}'}","color":"\#F15D25","separator":false,"separator_block_width":6, "min_width": 65, "align": "left"},\
-        ${else}
-        {"full_text":" ${execi 60 df -h | grep universe-lvroot | awk '{print $5}'}","color":"\#c5c5c5","separator":false,"separator_block_width":6, "min_width": 65, "align": "left"},\
-    $endif
-$endif
-
-
-#HOME
-${if_match ${execi 60 df -h | grep universe-lvhome | awk '{print $5}' | cut -d"%" -f1} >= 95 }\
-    {"full_text":" ${execi 60 df -h | grep universe-lvhome | awk '{print $5}'}","color":"\#dc322f","separator":false,"separator_block_width":6, "min_width": 65, "align": "left"}\
-    ${else}
-    ${if_match ${execi 60 df -h | grep universe-lvhome | awk '{print $5}' | cut -d"%" -f1} >= 90 }\
-        {"full_text":" ${execi 60 df -h | grep universe-lvhome | awk '{print $5}'}","color":"\#F15D25","separator":false,"separator_block_width":6, "min_width": 65, "align": "left"}\
-        ${else}
-        {"full_text":" ${execi 60 df -h | grep universe-lvhome | awk '{print $5}'}","color":"\#c5c5c5","separator":false,"separator_block_width":6, "min_width": 65, "align": "left"}\
-
-    $endif
-$endif
-#MPV
-
-#${if_match "${exec xdotool search --class mpv}"==""}\
-#{"full_text":" ","color":"\#2aa198","separator":false,"separator_block_width":6, "min_width": 570, "align": "right"},\
-#${else}
-#{"full_text": "    ${exec xprop -id $(xdotool search --class mpv) | grep 'NET_WM_NAME(UTF8_STRING)' | cut -d'"' -f2}   ","color":"\#c5c5c5","separator":false,"separator_block_width":6, "min_width":570 , "align": "right"}\
-#$endif
-
-#MUSIC
-
-#${if_match "${exec mpc -f %artist% | head  -n 1 | grep -v 'consume: off'| sed 's/\\n//g'}"==""}\
-#{"full_text":" ","color":"\#2aa198","separator":false,"separator_block_width":6, "min_width": 600, "align": "left"}\
-#${else}
-#    ${if_match "${exec mpc status | egrep 'paused|playing' | cut -d" " -f1}"=="[playing]"}\
-#    {"full_text": "    ${exec echo $(mpc -f "%artist%" | head -n 1 | head -c 40 | cut -d"%" -f1) - $(mpc -f "%title%" | head -n 1 | head -c 40 | cut -d"%" -f1)}   ","color":"\#c5c5c5","separator":false,"separator_block_width":6, "min_width": 600, "align": "right"}\
-#    ${else}
-#    {"full_text": "    ${exec echo $(mpc -f "%artist%" | head -n 1 | head -c 40 | cut -d"%" -f1) - $(mpc -f "%title%" | head -n 1 | head -c 40 | cut -d"%" -f1)}   ","color":"\#c5c5c5","separator":false,"separator_block_width":6,"min_width": 600, "align": "right"}\
-#    $endif
-#SEPARATOR
-#$endif
-
-
-],
diff --git a/.i3/conkyrc-bottom.old b/.i3/conkyrc-bottom.old
deleted file mode 100644
index 8e30600..0000000
--- a/.i3/conkyrc-bottom.old
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/usr/bin/conky
-out_to_x no
-own_window no
-out_to_console yes
-background no
-max_text_width 0
-
-# Update interval in seconds
-update_interval 1.0
-
-# This is the number of times Conky will update before quitting.
-# Set to zero to run forever.
-total_run_times 0
-
-# Shortens units to a single character (kiB->k, GiB->G, etc.). Default is off.
-short_units yes
-
-# How strict should if_up be when testing an interface for being up?
-# The value is one of up, link or address, to check for the interface
-# being solely up, being up and having link or being up, having link
-# and an assigned IP address. 
-if_up_strictness address
-
-# Add spaces to keep things from moving about?  This only affects certain objects.
-# use_spacer should have an argument of left, right, or none
-use_spacer right
-
-# Force UTF8? note that UTF8 support required XFT
-override_utf8_locale no
-
-# number of cpu samples to average
-# set to 1 to disable averaging
-cpu_avg_samples 2
-
-# Stuff after 'TEXT' will be formatted on screen
-# JSON for i3bar
-
-TEXT
-
-[
-
-#DOWN
-
-#ADD DYNAMIC INTERFACE
-
-{"full_text":" ${downspeed ${execi 120 ip r | grep default | head | cut -d\  -f5}}","color":"\#00AE58","separator":false,"separator_block_width":6, "min_width": 65, "align": "left"},\
-
-#UP
-
-#ADD DYNAMIC INTERFACE
-
-{"full_text":" ${upspeed ${execi 120 ip r | grep default | head | cut -d\  -f5}}","color":"\#D0151E","separator":false,"separator_block_width":6, "min_width": 65, "align": "left"},\
-
-#CPU
-
-${if_match ${cpu cpu0} >= 80}\
-{"full_text":" ${cpu cpu0}%","color":"\#D0151E","separator":false,"separator_block_width":6, "min_width": 65, "align": "left"},\
-${else}
-    ${if_match ${cpu cpu0} >= 50}\
-    {"full_text":" ${cpu cpu0}%","color":"\#E56C08","separator":false,"separator_block_width":6, "min_width": 65, "align": "left"},\
-    ${else}
-    {"full_text":" ${cpu cpu0}%","color":"\#C5C5C5","separator":false,"separator_block_width":6, "min_width": 65, "align": "left"},\
-    $endif
-$endif
-    
-#MEM
-
-# CHANGE COLOR IN HIGH MEMORY USAGE
-{"full_text":" ${mem}","color":"\#C5C5C5","separator":false,"separator_block_width":430, "min_width": 65, "align": "left"},\
-
-#MPV
-
-${if_match "${exec xdotool search --class mpv}"==""}\
-{"full_text":" ","color":"\#00AE58","separator":false,"separator_block_width":6, "min_width": 570, "align": "right"},\
-${else}
-{"full_text": "    ${exec xprop -id $(xdotool search --class mpv) | grep 'NET_WM_NAME(UTF8_STRING)' | cut -d'"' -f2}   ","color":"\#C5C5C5","separator":false,"separator_block_width":6, "min_width":570 , "align": "right"},\
-$endif
-
-#MUSIC
-
-${if_match "${exec mpc -f %artist% | head  -n 1 | grep -v 'consume: off'| sed 's/\\n//g'}"==""}\
-{"full_text":" ","color":"\#00AE58","separator":false,"separator_block_width":6, "min_width": 600, "align": "left"}\
-${else}
-    ${if_match "${exec mpc status | egrep 'paused|playing' | cut -d" " -f1}"=="[playing]"}\
-    {"full_text": "    ${exec echo $(mpc -f "%artist%" | head -n 1 | head -c 40 | cut -d"%" -f1) - $(mpc -f "%title%" | head -n 1 | head -c 40 | cut -d"%" -f1)}   ","color":"\#C5C5C5","separator":false,"separator_block_width":6, "min_width": 600, "align": "right"}\
-    ${else}
-    {"full_text": "    ${exec echo $(mpc -f "%artist%" | head -n 1 | head -c 40 | cut -d"%" -f1) - $(mpc -f "%title%" | head -n 1 | head -c 40 | cut -d"%" -f1)}   ","color":"\#C5C5C5","separator":false,"separator_block_width":6,"min_width": 600, "align": "right"}\
-    $endif
-#SEPARATOR
-$endif
-
-
-],
diff --git a/.i3/conkyrc-front b/.i3/conkyrc-front
deleted file mode 100644
index 9198e02..0000000
--- a/.i3/conkyrc-front
+++ /dev/null
@@ -1,156 +0,0 @@
--- vim: ts=4 sw=4 noet ai cindent syntax=lua
---[[
-Conky, a system monitor, based on torsmo
-
-Any original torsmo code is licensed under the BSD license
-
-All code written since the fork of torsmo is licensed under the GPL
-
-Please see COPYING for details
-
-Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen
-Copyright (c) 2005-2012 Brenden Matthews, Philip Kovacs, et. al. (see AUTHORS)
-All rights reserved.
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-]]
-
-conky.config = {
-    alignment = 'top_right',
-	gap_x = 15,
-	gap_y = 30,
-    background = false,
-    border_width = 0,
-    cpu_avg_samples = 2,
-	default_color = 'white',
-    default_outline_color = 'white',
-    default_shade_color = 'white',
-    draw_borders = false,
-    draw_graph_borders = true,
-    draw_outline = false,
-    draw_shades = false,
-    use_xft = true,
-    font = 'Ubuntu:size=10',
-    net_avg_samples = 2,
-    no_buffers = false,
-    out_to_console = false,
-    out_to_stderr = false,
-    extra_newline = false,
-    own_window = true,
-	own_window_argb_visual = true,
-	own_window_argb_value = 200,
-    own_window_class = 'Conky',
-    own_window_type = 'normal',
-    stippled_borders = 0,
-    update_interval = 1.0,
-    uppercase = false,
-    use_spacer = 'none',
-    show_graph_scale = true,
-    show_graph_range = false
-}
-
-conky.text = [[
-${alignc -10}${font Open Sans:size=20}${color dodgerblue3}Arch${color}Linux$font$color
-${voffset 4}$color${font}${font Open Sans:size=15}$alignr${voffset -15}${time %H:%M}$font
-${voffset -4}${color dodgerblue3}${font Open Sans:Bold:size=10}DATE ${hr 5}$color$font
-$color${font Open Sans:size=12}$alignc${time %A}, ${time %d %B %Y}$font$color
-
-
-# SYS
-${voffset -8}${font Open Sans:Bold:size=10}${color dodgerblue3}SYSTEM ${hr 5}$color${font}
-$sysname $kernel $alignr $machine
-Uptime: $alignr $uptime
-
-
-# MEMORY
-${voffset -8}${font Open Sans:Bold:size=10}${color dodgerblue3}MEMORY ${membar 4} 
-$color${font Open Sans:bold:size=8.5}Used:$font $mem of $memmax$alignr$memperc%
-$color${font Open Sans:bold:size=8.5}Free:$font $memeasyfree
-$color${font Open Sans:bold:size=8.5}Buffers / Cached:$font$alignr$buffers / $cached
-
-
-${voffset -10}------------------------------------------------- ${font Open Sans:Bold:size=10}${color dodgerblue3}${voffset -2}RAM${color}${font}${voffset -1} ---- ${font Open Sans:Bold:size=10}${color dodgerblue3}${voffset -2}CPU${color}${font}${voffset -1} -
-${top_mem name 1}${alignr}${top_mem cpu 1} %
-${voffset -13}${alignr}${offset -60}${top_mem mem 1} %
-${top_mem name 2}${alignr}${top_mem cpu 2} %
-${voffset -13}${alignr}${offset -60}${top_mem mem 2} %
-${top_mem name 3}${alignr}${top_mem cpu 3} %
-${voffset -13}${alignr}${offset -60}${top_mem mem 3} %
-${top_mem name 4}${alignr}${top_mem cpu 4} %
-${voffset -13}${alignr}${offset -60}${top_mem mem 4} %
-
-
-${voffset -8}${font Open Sans:Bold:size=10}${color dodgerblue3}SWAP ${swapbar 4}
-$color${font Open Sans:bold:size=8.5}Used:$font $swap of $swapmax$alignr$swapperc%
-$color${font Open Sans:bold:size=8.5}Free:$font $swapfree
-
-
-# CPU
-${voffset -8}${font Open Sans:Bold:size=10}${color dodgerblue3}CPU ${cpubar 4}
-$color${font}Intel® Core™ i5-4670K @ ${freq_g cpu0}GHz $alignr $cpu% @ ${execi 2 sensors | grep 'Physical id 0' | cut -c18-19}°C
-${font}Core 0 - ${execi 2 sensors | grep 'Core 0' | cut -c18-19}°C ${alignc 60}${color dodgerblue3}${cpubar cpu1}${color}
-${font}Core 1 - ${execi 2 sensors | grep 'Core 1' | cut -c18-19}°C ${alignc 60}${color dodgerblue3}${cpubar cpu2}${color}
-
-
-${voffset -10}------------------------------------------------- ${font Open Sans:Bold:size=10}${color dodgerblue3}${voffset -2}RAM${color}${font}${voffset -1} ---- ${font Open Sans:Bold:size=10}${color dodgerblue3}${voffset -2}CPU${color}${font}${voffset -1} -
-#${hr 1}
-${top name 1}${alignr}${top cpu 1} %
-${voffset -13}${alignr}${offset -60}${top mem 1} %
-${top name 2}${alignr}${top cpu 2} %
-${voffset -13}${alignr}${offset -60}${top mem 2} %
-${top name 3}${alignr}${top cpu 3} %
-${voffset -13}${alignr}${offset -60}${top mem 3} %
-${top name 4}${alignr}${top cpu 4} %
-${voffset -13}${alignr}${offset -60}${top mem 4} %
-
-
-# NETWORK
-${voffset -8}${font Open Sans:Bold:size=10}${color dodgerblue3}NETWORK ${hr 5}
-$color${font Open Sans:bold:size=8.5}External IP ${font}${alignr}${execi 60 curl icanhazip.com }$font
-${voffset -14}$alignc${execpi 4 echo "\${font}\${color}ping: \${font Open Sans:bold:size=8.5}\${color #66aaff}$(ping -W 1 -c 1 8.8.8.8 -q | grep rtt | egrep [0-9]+\.[0-9]+ -o | head -n 2 | tail -n 1)\${font}\${color} ms"}
-
-${if_match "${addr eno1}" != "No Address"}
-${voffset -10}${font Open Sans:bold:size=8.5}Ethernet $font$alignr ${addr eno1}
- ${upspeed eno1}/s $alignr ${totalup eno1}
-${voffset -14}$alignc${upspeedgraph eno1 10,120  000000 aaddff}
- ${downspeed eno1}/s $alignr ${totaldown eno1}
-${voffset -14}$alignc${downspeedgraph eno1 10,120  000000 66aaff}
-
-${endif}
-${if_match "${addr wlp2s0}" != "No Address"}
-${voffset -10}${font Open Sans:bold:size=8.5}WiFi $font${wireless_link_qual_perc wlp2s0}% $alignr ${addr wlp2s0}
-${voffset -14}$alignc${wireless_essid wlp2s0}
-$alignc${wireless_link_bar 4,260 wlp2s0}   
-↑ ${upspeed wlp2s0}/s $alignr ${totalup wlp2s0}
-${voffset -14}$alignc${upspeedgraph wlp2s0 10,120 000000 aaddff}
-↓ ${downspeed wlp2s0}/s $alignr ${totaldown wlp2s0}
-${voffset -14}$alignc${downspeedgraph wlp2s0 10,120 000000 66aaff}
-${endif}
-
-
-# DISC
-${voffset -8}${font Open Sans:Bold:size=10}${color dodgerblue3}DISCS ${hr 5}
-${alignc}${color aaddff}write: ${diskio_write /dev/sda}${color 66aaff} read:${diskio_read /dev/sda}$color
-
-$color${voffset -10}${font Open Sans:bold:size=8.5}ROOT $font$alignr ${fs_type /}
-${fs_used /} / ${fs_size /} $alignr ${fs_used_perc /} %
-${fs_bar /}
-
-${voffset -10}${font Open Sans:bold:size=8.5}HOME $font$alignr ${fs_type /home/user}
-${fs_used /home/user} / ${fs_size /home/user} $alignr ${fs_used_perc /home/user} %
-${fs_bar /home/user}
-
-#${voffset -8}${font Open Sans:Bold:size=10}${color dodgerblue3}WEATHER ${hr 5}
-#${alignc -10}$font$color${execi 1800 ~/.i3/weather.sh }
-
-]]
diff --git a/.i3/conkyrc-top b/.i3/conkyrc-top
deleted file mode 100644
index 2e8e958..0000000
--- a/.i3/conkyrc-top
+++ /dev/null
@@ -1,216 +0,0 @@
-#!/usr/bin/conky
-out_to_x no
-own_window no
-out_to_console yes
-background no
-max_text_width 0
-
-# Update interval in seconds
-update_interval 1.0
-
-# This is the number of times Conky will update before quitting.
-# Set to zero to run forever.
-total_run_times 0
-
-# Shortens units to a single character (kiB->k, GiB->G, etc.). Default is off.
-short_units yes
-
-# How strict should if_up be when testing an interface for being up?
-# The value is one of up, link or address, to check for the interface
-# being solely up, being up and having link or being up, having link
-# and an assigned IP address. 
-if_up_strictness address
-
-# Add spaces to keep things from moving about?  This only affects certain objects.
-# use_spacer should have an argument of left, right, or none
-use_spacer left
-
-# Force UTF8? note that UTF8 support required XFT
-override_utf8_locale no
-
-# number of cpu samples to average
-# set to 1 to disable averaging
-cpu_avg_samples 2
-
-# Stuff after 'TEXT' will be formatted on screen
-# JSON for i3bar
-
-TEXT
-
-[
-
-#IF INTERNET CONNECTED PART
-
-${if_match "${execi 120 ping -q -w 2 -c 1 176.34.135.167 > /dev/null && echo ok}"=="ok"}
-    
-    # TEST UPGRADES
-    ${if_match "${execi 300 (checkupdates;cower -u;pip list --outdated --timeout 1 --retries 1) | wc -l }"!="0"}\
-    
-    #LOGO
-    {"full_text":"[","color":"\#dc322f","separator":false,"separator_block_width":3},\
-    #PACMAN
-    ${if_match "${execi 300 checkupdates | wc -l }"!="0"}\
-    {"full_text":"pac${execi 200 checkupdates | wc -l}","color":"\#dc322f","separator":false,"separator_block_width":2},\
-    $endif
-
-    #AUR
-    ${if_match "${execi 300 cower -u | wc -l }"!="0"}\
-    {"full_text":"aur${execi 1900 cower -u | wc -l}","color":"\#F15D25","separator":false,"separator_block_width":2},\
-    $endif
-
-    #PIP
-    ${if_match "${execi 300 pip list --outdated --timeout 1 --retries 1 | wc -l }"!="0"}\
-    {"full_text":"pip${execi 1900 pip list --outdated --timeout 1 --retries 1| wc -l}","color":"\#E7AD00","separator":false,"separator_block_width":2},\
-    $endif
-
-    {"full_text":"]","color":"\#dc322f","separator":false,"separator_block_width":3},\
-    $endif
-
-
-$endif
-
-#SEPARATOR
-{"full_text":" ","separator":false,"separator_block_width":15},\
-
-#VOLUME
-${if_match "${exec amixer get 'Master' | grep '\[on\]' | grep Left | cut -d"[" -f2 | cut -d"%" -f1}" == "" }\
-{"full_text":" ","color":"\#dc322f","separator":false,"separator_block_width":6},\
-${else}
-    ${if_match ${exec amixer get 'Master' | grep '\[on\]' | grep Left | cut -d"[" -f2 | cut -d"%" -f1} >= 75 }\
-    {"full_text":"  ${exec amixer get 'Master' | grep '\[on\]' | grep Left | cut -d"[" -f2 | cut -d"%" -f1}%","color":"\#c5c5c5","separator":false,"separator_block_width":6},\
-    ${else}
-        ${if_match ${exec amixer get 'Master' | grep '\[on\]' | grep Left | cut -d"[" -f2 | cut -d"%" -f1} >= 50 }\
-        {"full_text":"  ${exec amixer get 'Master' | grep '\[on\]' | grep Left | cut -d"[" -f2 | cut -d"%" -f1}%","color":"\#c5c5c5","separator":false,"separator_block_width":6},\
-        ${else}
-            {"full_text":"  ${exec amixer get 'Master' | grep '\[on\]' | grep Left | cut -d"[" -f2 | cut -d"%" -f1}%","color":"\#c5c5c5","separator":false,"separator_block_width":6},\
-        $endif
-    $endif
-$endif
-
-
-#SEPARATOR
-{"full_text":" ","color":"\#2aa198","separator":false,"separator_block_width":15},\
-
-#BACKLIGHT
-{"full_text":"  ${exec light -G | cut -d"." -f1}","color":"\#c5c5c5","separator":false,"separator_block_width":6},\
-
-#SEPARATOR
-
-#WIRED
-${if_match "${addr br0}" != "No Address" }\
-    {"full_text":" ","color":"\#2aa198","separator":false,"separator_block_width":15},\
-    ${if_match "${exec ip a | grep -A 1 ' br0:' | grep ether | awk '{print $2}'}" == "${exec cat ~/.i3/mac_orig}" }\
-    {"full_text":"ORIG       ${addr br0}","color":"\#c5c5c5","separator":false,"separator_block_width":6},\
-    ${else}
-    {"full_text":" ${exec ip a | grep -A 1 ' br0:' | grep ether | awk '{print $2}'}       ${addr br0}","color":"\#c5c5c5","separator":false,"separator_block_width":6},\
-    $endif
-$endif
-
-#WIFI
-${if_match "${wireless_essid wlp2s0}" != "off/any" }\
-{"full_text":" ","color":"\#2aa198","separator":false,"separator_block_width":15},\
-{"full_text":" ","color":"\#c5c5c5","separator":false,"separator_block_width":6},\
-    ${if_match ${wireless_link_qual_perc wlp2s0} >= 75 }\
-    {"full_text":"${wireless_essid wlp2s0}","color":"\#2aa198","separator":false,"separator_block_width":6},\
-    ${else}
-        ${if_match ${wireless_link_qual_perc wlp2s0} <= 25 }\
-        {"full_text":"${wireless_essid wlp2s0}","color":"\#dc322f","separator":false,"separator_block_width":6},\
-        ${else}
-        {"full_text":"${wireless_essid wlp2s0}","color":"\#c5c5c5","separator":false,"separator_block_width":6},\
-
-        $endif
-    $endif
-$endif
-
-#VPN CONNECTED
-${if_match "${exec ip address show | grep tun}" != "" }\
-{"full_text":"     VPN","color":"\#F15D25","separator":false,"separator_block_width":6},\
-$endif
-
-#TOR CONNECTED
-${if_match "${exec systemctl status tor | grep 'active (running)'}" != "" }\
-{"full_text":" ","color":"\#2aa198","separator":false,"separator_block_width":15},\
-{"full_text":"   TOR${execi 10 proxychains wget http://checkip.dyndns.org/ -O - -o /dev/null | cut -d: -f 2 | cut -d\< -f 1}","color":"\#F15D25","separator":false,"separator_block_width":6},\
-$endif
-
-#SEPARATOR
-{"full_text":" ","color":"\#2aa198","separator":false,"separator_block_width":15},\
-
-#BATTERY
-
-${if_match "${exec cat /sys/class/power_supply/BAT0/status}" == "Charging" }\
-{"full_text":" ","color":"\#c5c5c5","separator":false,"separator_block_width":6},\
-{"full_text":"${battery_percent BAT0}%","color":"\#c5c5c5","separator":false,"separator_block_width":6},\
-${else}
-    ${if_match "${exec cat /sys/class/power_supply/BAT0/status}" != "Full" }\
-        ${if_match ${battery_percent BAT0} >= 80}\
-        {"full_text":" ","color":"\#c5c5c5","separator":false,"separator_block_width":6},\
-        {"full_text":"${battery_percent BAT0}%","color":"\#2aa198","separator":false,"separator_block_width":6},\
-        {"full_text":" ","color":"\#2aa198","separator":false,"separator_block_width":15},\
-        {"full_text":" ","color":"\#c5c5c5","separator":false,"separator_block_width":6},\
-        {"full_text":"${battery_time BAT0}","color":"\#2aa198","separator":false,"separator_block_width":6},\
-        ${else}
-            ${if_match ${battery_percent BAT0} >= 50}\
-            {"full_text":" ","color":"\#c5c5c5","separator":false,"separator_block_width":6},\
-            {"full_text":"${battery_percent BAT0}%","color":"\#2aa198","separator":false,"separator_block_width":6},\
-            {"full_text":" ","color":"\#2aa198","separator":false,"separator_block_width":15},\
-            {"full_text":" ","color":"\#c5c5c5","separator":false,"separator_block_width":6},\
-            {"full_text":"${battery_time BAT0}","color":"\#2aa198","separator":false,"separator_block_width":6},\
-            ${else}
-                ${if_match ${battery_percent BAT0} >= 30}\
-                {"full_text":" ","color":"\#c5c5c5","separator":false,"separator_block_width":6},\
-                {"full_text":"${battery_percent BAT0}%","color":"\#2aa198","separator":false,"separator_block_width":6},\
-                {"full_text":" ","color":"\#2aa198","separator":false,"separator_block_width":15},\
-                {"full_text":" ","color":"\#c5c5c5","separator":false,"separator_block_width":6},\
-                {"full_text":"${battery_time BAT0}","color":"\#2aa198","separator":false,"separator_block_width":6},\
-                ${else}
-                    ${if_match ${battery_percent BAT0} >= 10}\
-                    {"full_text":" ","color":"\#E56C08","separator":false,"separator_block_width":6},\
-                    {"full_text":"${battery_percent BAT0}%","color":"\#E56C08","separator":false,"separator_block_width":6},\
-                    {"full_text":" ","color":"\#2aa198","separator":false,"separator_block_width":15},\
-                    {"full_text":" ","color":"\#c5c5c5","separator":false,"separator_block_width":6},\
-                    {"full_text":"${battery_time BAT0}","color":"\#E56C08","separator":false,"separator_block_width":6},\
-                    ${else}
-                    {"full_text":" ","color":"\#dc322f","separator":false,"separator_block_width":6},\
-                    {"full_text":"${battery_percent BAT0}%","color":"\#dc322f","separator":false,"separator_block_width":6},\
-                    {"full_text":" ","color":"\#2aa198","separator":false,"separator_block_width":15},\
-                    {"full_text":" ","color":"\#c5c5c5","separator":false,"separator_block_width":6},\
-                    {"full_text":"${battery_time BAT0}","color":"\#dc322f","separator":false,"separator_block_width":6},\
-                    {"full_text":" ","color":"\#2aa198","separator":false,"separator_block_width":6},\
-
-                    $endif
-                $endif
-            $endif
-        $endif
-    $endif
-$endif
-
-#SEPARATOR
-{"full_text":" ","color":"\#2aa198","separator":false,"separator_block_width":15},\
-
-#DATE
-#{"full_text":"","color":"\#268bd2","separator":false,"separator_block_width":0},\
-#{"full_text":" ${time %d}","color":"\#073642","background":"\#268bd2","separator":false,"separator_block_width":0},\
-#{"full_text":"/","color":"\#073642","background":"\#268bd2","separator":false,"separator_block_width":0},\
-#{"full_text":"${time %m}","color":"\#073642","background":"\#268bd2","separator":false,"separator_block_width":0},\
-#{"full_text":"/","color":"\#073642","background":"\#268bd2","separator":false,"separator_block_width":0},\
-#{"full_text":"${time %Y}","color":"\#073642","background":"\#268bd2","separator":false,"separator_block_width":0},\
-#{"full_text":" ","color":"\#073642","background":"\#268bd2","separator":false,"separator_block_width":0},\
-
-#TIME
-#{"full_text":" ${time %H:%M:%S}","color":"\#268bd2","background":"\#073642","separator":false,"separator_block_width":0},\
-#{"full_text":"  ","background":"\#073642","separator":false,"separator_block_width":6}\
-
-#DATE
-{"full_text":"${time %d}","color":"\#c5c5c5","separator":false,"separator_block_width":0},\
-{"full_text":"/","color":"\#2aa198","separator":false,"separator_block_width":0},\
-{"full_text":"${time %m}","color":"\#c5c5c5","separator":false,"separator_block_width":0},\
-{"full_text":"/","color":"\#2aa198","separator":false,"separator_block_width":0},\
-{"full_text":"${time %Y}","color":"\#c5c5c5","separator":false,"separator_block_width":6},\
-{"full_text":" ","color":"\#2aa198","separator":false,"separator_block_width":6},\
-
-#TIME
-{"full_text":"${time %H:%M:%S}","color":"\#c5c5c5","separator":false,"separator_block_width":6},\
-{"full_text":" ","color":"\#2aa198","separator":false,"separator_block_width":6}\
-
-],
diff --git a/.i3/j4-dmenu.sh b/.i3/j4-dmenu.sh
deleted file mode 100755
index 5784d82..0000000
--- a/.i3/j4-dmenu.sh
+++ /dev/null
@@ -1 +0,0 @@
-j4-dmenu-desktop --dmenu="(cat ; (stest -flx $(echo $PATH | tr : ' ') | sort -u)) | dmenu -fn 'hack-10' -h 20 -nb '#202020' -nf '#FFFFFF' -sf '#dc322f' -sb '#202020' -p '>' -b -q -o 0.9"
diff --git a/.i3/wappslocalmenu.sh b/.i3/rofi_custom.sh
similarity index 80%
rename from .i3/wappslocalmenu.sh
rename to .i3/rofi_custom.sh
index 944a07d..86e04de 100755
--- a/.i3/wappslocalmenu.sh
+++ b/.i3/rofi_custom.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-action=$(echo -e "ompd\nompd-git\nspotify\ntransmission\nnicotine\nstreamstudio\nnetflix\nmps-youtube" | dmenu -fn 'hack-10' -h 20 -nb '#202020' -nf '#FFFFFF' -sf '#dc322f' -sb '#202020' -p "wapps >" -w 190 -o 0.9 -y 21 -l 8)
+action=$(echo -e "ompd\nompd-git\nspotify\ntransmission\nnicotine\nstreamstudio\nnetflix\nmps-youtube" | rofi -dmenu -p "custom:")
 
 if [[ "$action" == "ompd" ]]
 then
@@ -33,7 +33,7 @@ fi
 
 if [[ "$action" == "nicotine" ]]
 then
-    nicotine.py
+    nicotine
 fi
 
 if [[ "$action" == "spotify" ]]
diff --git a/.i3/zmenu.sh b/.i3/rofi_powermenu.sh
similarity index 60%
rename from .i3/zmenu.sh
rename to .i3/rofi_powermenu.sh
index 8001377..5b8b17a 100755
--- a/.i3/zmenu.sh
+++ b/.i3/rofi_powermenu.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
-action=$(echo -e "lock\nlogout\nshutdown\nreboot" | dmenu -fn 'hack-10' -h 20 -nb '#202020' -nf '#FFFFFF' -sf '#dc322f' -sb '#202020' -p '>' -w 100 -o 0.9 -y 21 -l 4)
+action=$(echo -e "lock\nlogout\nshutdown\nreboot" | rofi -dmenu -p "power:")
+
 if [[ "$action" == "lock" ]]
 then
     ~/.i3/i3lock-fancy-multimonitor/lock
diff --git a/.zshrc b/.zshrc
deleted file mode 100644
index cb7dc5e..0000000
--- a/.zshrc
+++ /dev/null
@@ -1,78 +0,0 @@
-# Path to your oh-my-zsh installation.
-export ZSH=$HOME/.oh-my-zsh
-
-# Set name of the theme to load.
-ZSH_THEME="agnoster"
-
-#turn on comments with # in shell
-setopt interactivecomments
-
-#aliases
-alias zshconfig="vi ~/.zshrc_node"
-alias zshconfig_global="vi ~/.zshrc"
-alias vimconfig="vi ~/.vimrc"
-alias sshconfig="vi ~/.ssh/config"
-alias lh="du -ahd1 | sort -h"
-#lhs() { for list in $(ls -a | sed 's/\ /\\ /g'); do du -hs $list; done | sort -hr }
-alias sprunge="curl -F 'sprunge=<-' http://sprunge.us"
-alias ix="curl -s -F 'f:1=<-' ix.io"
-up () { curl -F "c=@${1:--}" http://ptpb.pw/ }
-alias vi="vim"
-alias sudo="sudo "
-alias installed="pacman -Qqen"
-alias chrome="google-chrome-stable"
-alias tmux="tmux -2"
-alias neofetch="neofetch --crop_mode fit --image_size 33% --image ~/.config/neofetch/archlinux.png --colors 3 10 7 4 10 10"
-bak() { cp "$1" "$1.bak" }
-chromeapp() { google-chrome-stable --app=$1 }
-extract() {
-   if [ -f $1 ] ; then
-       case $1 in
-           *.tar.bz2)	tar xvjf $1    ;;
-           *.tar.gz)	tar xvzf $1    ;;
-	   *.tar.xz)	tar xJf $1     ;;
-           *.bz2)	bunzip2 $1     ;;
-           *.rar)	unrar x $1     ;;
-           *.gz)	gunzip $1      ;;
-           *.tar)	tar xvf $1     ;;
-           *.tbz2)	tar xvjf $1    ;;
-           *.tgz)	tar xvzf $1    ;;
-           *.zip)	unzip $1       ;;
-           *.Z)		uncompress $1  ;;
-           *.7z)	7z x $1        ;;
-           *)		echo "Unable to extract '$1'" ;;
-       esac
-   else
-       echo "'$1' is not a valid file"
-   fi
-}
-alias startx="ssh-add;startx"
-
-#exports
-export EDITOR='vim'
-export VISUAL='vim'
-export BROWSER='google-chrome-stable'
-export POWERLINE_CONFIG_COMMAND=/usr/bin/powerline-config
-#deactivate gaskpass
-unset SSH_ASKPASS
-#man colors
-export LESS_TERMCAP_mb=$'\E[01;31m'
-export LESS_TERMCAP_md=$'\E[01;31m'
-export LESS_TERMCAP_me=$'\E[0m'
-export LESS_TERMCAP_se=$'\E[0m'
-export LESS_TERMCAP_so=$'\E[01;44;33m'
-export LESS_TERMCAP_ue=$'\E[0m'
-export LESS_TERMCAP_us=$'\E[01;32m'
-#ssh-agent
-export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/ssh-agent.socket"
-
-#zshrc node specific
-source ~/.zshrc_node
-
-#zshconf
-autoload -U zmv
-plugins=(git python)
-source $ZSH/oh-my-zsh.sh
-source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
-source ~/.zsh/zsh-autosuggestions/zsh-autosuggestions.zsh
-export ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=10'
diff --git a/README.md b/README.md
index 46f4d34..37709e1 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-# Archlinux i3-gaps Dark Solarized
+# Archlinux i3-gaps Acid Dark 
 
-**i3-gaps zsh polybar**
+**i3-gaps zsh pureprompt polybar**
 
 ![alt tag](https://github.com/eoli3n/dotfiles/blob/master/screenshots/i3gaps.png)
 
@@ -25,21 +25,23 @@
 **Packages**
 
 ```
-sudo pacman -S rxvt-unicode zsh git ttf-hack vim weechat xbindkeys powerline powerline-fonts powerline-vim xorg-xrdb xclip zsh-syntax-highlighting tmux xorg-xfd connman connman-gtk w3m lxappearance maim slop
+sudo pacman -S rxvt-unicode zsh zsh-syntax-highlighting git ttf-hack vim weechat xbindkeys powerline powerline-fonts powerline-vim xorg-xrdb xclip tmux xorg-xfd connman connman-gtk w3m lxappearance maim slop
 
-pacaur -S i3-gaps polybar-git albert compton-git powerline powerline-vim ttf-font-awesome ttf-unifont ttf-font-icons j4-dmenu-desktop siji-git menutray cower i3lock-color-git
+pacaur -S i3-gaps polybar-git rofi compton-git powerline powerline-vim ttf-font-awesome ttf-unifont ttf-font-icons siji-git menutray cower i3lock-color-git
 
 cd ~/.i3
 git clone https://github.com/guimeira/i3lock-fancy-multimonitor
 ```
 Change ``BLURTYPE="5x3"`` in ``i3lock-fancy-multimonitor/lock`` file.
 
-**Zsh deps**
+**ZSH pure prompt**
 
+1° Install [oh-my-zsh](https://github.com/robbyrussell/oh-my-zsh)
 ```
-git clone git://github.com/zsh-users/zsh-autosuggestions ~/.zsh/zsh-autosuggestions
+sh -c "$(curl -fsSL https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh)"
 ```
-Note: zshrc needs to be adapt at your fits
+
+2° Then install [pure prompt](https://github.com/sindresorhus/pure)
 
 **Gtk+ and Qt**
 
@@ -115,7 +117,11 @@ In weechat
 - https://github.com/jaagr/polybar
 - https://github.com/guimeira/i3lock-fancy-multimonitor
 - https://github.com/chjj/compton
-- https://github.com/altercation/solarized
+- [hyperterm-snazzy-Xresources](https://gist.github.com/zhy0/ffdab4b01f8cf6a6814261d4c4eed0be)
+
+## Previously
+
+* [i3-gaps Dark Solarized](https://github.com/eoli3n/dotfiles/tree/zsh-agnoster-solarized)
 
 **IRC**
 
diff --git a/aur_packages b/aur_packages
deleted file mode 100644
index c6c8fda..0000000
--- a/aur_packages
+++ /dev/null
@@ -1,47 +0,0 @@
-albert
-bitwig-studio
-blockify
-cadence
-compton-git
-connman-gtk
-cower
-dmenu2
-dolphin-emu-git
-google-chrome
-googler
-gtk-engine-unico
-gtk-theme-numix-solarized
-i3-gaps
-i3lock-color-git
-j4-dmenu-desktop
-jdownloader2
-kazam
-light-git
-logkeys-git
-lostfiles
-mp3val
-mpd-notification
-neofetch
-nicotine-plus-git
-openvpn-update-systemd-resolved
-otf-cm-unicode
-otf-texgyre
-ovmf-git
-pacaur
-pcsx2-git
-polybar
-retroarch-assets-xmb-git
-retroarch-autoconfig-udev-git
-retroarch-git
-siji-git
-spotify
-streamstudio-bin
-teamviewer
-tor-browser-fr
-ttf-font-awesome
-ttf-font-icons
-ttf-impallari-cabin-font
-ttf-impallari-cabin-sketch
-ttf-unifont
-vertex-themes
-vibrancy-colors
diff --git a/pac_packages b/pac_packages
deleted file mode 100644
index a80eba6..0000000
--- a/pac_packages
+++ /dev/null
@@ -1,77 +0,0 @@
-arandr
-asciinema
-audacity
-beets
-bmon
-borg
-connman
-downgrade
-dunst
-evince
-feh
-firefox
-firefox-i18n-fr
-flashplugin
-galculator
-gimp
-git
-gitg
-gpick
-htop
-imagemagick
-inkscape
-iotop
-libretro-bsnes
-libretro-desmume
-libretro-gambatte
-libretro-genesis-plus-gx
-libretro-mednafen-psx
-libretro-mgba
-libretro-mupen64plus
-libretro-overlays
-libretro-pcsx-rearmed
-libretro-reicast
-libretro-shaders
-libretro-yabause
-lm_sensors
-lxappearance
-maim
-mpc
-mpd
-mps-youtube
-mpv
-nmap
-powerline
-powerline-fonts
-powerline-vim
-redshift
-rxvt-unicode
-screen
-scrot
-slop
-speedtest-cli
-thunar
-thunar-media-tags-plugin
-thunderbird
-thunderbird-i18n-fr
-tor
-torsocks
-tmux
-transmission-cli
-transmission-gtk
-ttf-hack
-ttf-ubuntu-font-family
-unrar
-unzip
-vim
-virt-manager
-vlc
-w3m
-weechat
-winff
-xbindkeys
-xclip
-youtube-dl
-zip
-zsh
-zsh-syntax-highlighting