diff --git a/botfiles/.Xresources b/botfiles/.Xresources
index ea91a8b..bc5061a 100644
--- a/botfiles/.Xresources
+++ b/botfiles/.Xresources
@@ -1,8 +1,8 @@
 ! special
 *.foreground: #dfdfdf
-*.background: #0a0200
-*.border_unfocused:    #0e0f0e
-*.border_focused: #1d1e1e
+*.background: #071616
+*.border_unfocused: #353234
+*.border_focused: #144949
 
 ! black
 *.color0: 	  #000000
diff --git a/botfiles/.config/bspwm/bspwmrc b/botfiles/.config/bspwm/bspwmrc
index e40b6ea..f8a3f73 100755
--- a/botfiles/.config/bspwm/bspwmrc
+++ b/botfiles/.config/bspwm/bspwmrc
@@ -9,12 +9,13 @@
 #~~~~~~~~~~~~~~~~
 # WINDOW MANAGER
 #~~~~~~~~~~~~~~~~
-bspc monitor -d 1 2 3 4 5 6 7 8 9 10
+bspc monitor -d one two three four five six seven eight nine ten
 bspc desktop -f 1
 
-bspc config border_width         2
-bspc config window_gap          6
-
+bspc config border_width         1
+bspc config window_gap          3
+bspc config normal_border_color "#353234"
+bspc config focused_border_color "#144949"
 bspc config split_ratio          0.52
 bspc config borderless_monocle   true
 bspc config gapless_monocle      true
diff --git a/botfiles/.config/bspwm/bspwmrc.pc b/botfiles/.config/bspwm/bspwmrc.pc
new file mode 100644
index 0000000..b0e757d
--- /dev/null
+++ b/botfiles/.config/bspwm/bspwmrc.pc
@@ -0,0 +1,35 @@
+#!/bin/sh
+#     _
+#    | |__  ___ _ ____      ___ __ ___
+#    | '_ \/ __| '_ \ \ /\ / / '_ ` _ \
+#    | |_) \__ \ |_) \ V  V /| | | | | |
+#    |_.__/|___/ .__/ \_/\_/ |_| |_| |_|
+#              |_|
+
+#~~~~~~~~~~~~~~~~
+# WINDOW MANAGER
+#~~~~~~~~~~~~~~~~
+bspc monitor -d 1 2 3 4 5 6 7 8 9 10
+bspc desktop -f 1
+
+bspc config border_width         1
+bspc config window_gap          3
+bspc config normal_border_color "#353234"
+bspc config focused_border_color "#4b8282"
+bspc config split_ratio          0.52
+bspc config borderless_monocle   true
+bspc config gapless_monocle      true
+
+#~~~~~~~~~~~~
+# APPS RULES
+#~~~~~~~~~~~~
+bspc rule -a qutebrowser desktop='^3'
+bspc rule -a discord desktop='^4'
+bspc rule -a TelegramDesktop desktop='^4'
+
+#~~~~~~~~~~~
+# AUTOSTART  
+#~~~~~~~~~~~
+${HOME}/.config/autostart/autostart.sh &
+
+
diff --git a/botfiles/.config/dunst/dunstrc b/botfiles/.config/dunst/dunstrc
index 23939c5..7d9e960 100644
--- a/botfiles/.config/dunst/dunstrc
+++ b/botfiles/.config/dunst/dunstrc
@@ -16,7 +16,7 @@
     padding = 15
     horizontal_padding = 15
     frame_width = 1
-    frame_color = "#66"
+    frame_color = "#144949"
     #alignment = left
     #x = 15
     #y = 15
@@ -83,17 +83,17 @@
 [urgency_low]
     # IMPORTANT: colors have to be defined in quotation marks.
     # Otherwise the "#" and following would be interpreted as a comment.
-    background = "#0a0200"
-    foreground = "#cccccc"1    
-    frame_color = "#dfdfdf"
+    background = "#071616"
+    foreground = "#cccccc"   
+    frame_color = "#144949"
     timeout = 5
     # Icon for notifications with low urgency, uncomment to enable
     #icon = ~/.local/share/arch.png
 
 [urgency_normal]
-    background = "#0a0200"
+    background = "#071616"
     foreground = "#cccccc"
-    frame_color = "#dfdfdf"
+    frame_color = "#144949"
     timeout = 5
 
 [urgency_critical]
diff --git a/botfiles/.config/nvim/init.vim b/botfiles/.config/nvim/init.vim
index ae1f72f..70060b6 100644
--- a/botfiles/.config/nvim/init.vim
+++ b/botfiles/.config/nvim/init.vim
@@ -99,8 +99,8 @@ augroup END
 "=============
 " Colorscheme
 "=============
-hi LineNr           ctermbg=0   ctermfg=6  cterm=NONE
-hi CursorLineNr     ctermbg=0   ctermfg=5   cterm=bold
+hi LineNr              ctermfg=6  cterm=NONE
+hi CursorLineNr        ctermfg=5   cterm=bold
 hi ColorColumn      ctermbg=0   ctermfg=1   cterm=undercurl
 hi SignColumn                   ctermfg=7
 hi VertSplit        ctermbg=8   ctermfg=0
diff --git a/botfiles/.config/polybar/config b/botfiles/.config/polybar/config
index 3d2b7c9..812f508 100644
--- a/botfiles/.config/polybar/config
+++ b/botfiles/.config/polybar/config
@@ -12,7 +12,7 @@
 bg= ${xrdb:background}
 fg = ${xrdb:foreground}
 border = ${xrdb:border_unfocused}
-
+border_f = ${xrdb:border_focused}
 ;~~~~~
 ; bar
 ;~~~~~
@@ -21,14 +21,14 @@ width = 100%
 height = 24
 fixed-center = true
 
-font-0 = "DejaVu Sans Mono:pixelsize=10:antialias=true;3"
+font-0 = "Inconsolata:pixelsize=10:antialias=true;3"
 font-1 = "Font Awesome 5 Brands:pixelsize=13:antialias=true;3"
 font-2 = "Font Awesome 5 Free:style=Solid:pixelsize=12:antialias=true;3"
 
 background = ${colors.bg}
 foreground = ${colors.fg}
 
-line-size = 3
+line-size = 0
 line-color = ${colors.fg}
 
 border-size = 0
@@ -72,17 +72,19 @@ ws-icon-7 = "8;"
 
 format = <label-state><label-mode>
 label-monitor = %name%
-label-focused = %index% %icon%
-label-focused-background = ${colors.border}
+label-focused = %name%
+label-focused-background = ${colors.border_f}
 label-focused-overline = ${colors.fg}
-label-occupied = %index% %icon%
+label-occupied = %name%
+label-occupied-background = ${colors.border}
 label-occupied-padding = 1
 label-focused-padding = 1
-label-unfocused-padding = 0
-label-visible-padding = 0
-label-urgent = %index% %icon%
+label-unfocused-padding = 1
+label-visible-padding = 1
+label-urgent = %name%
 label-urgent-padding = 1
-label-empty = 
+label-empty = %name%
+label-empty-padding = 1
 
 ;~~~~~
 ; MPD
diff --git a/botfiles/.zshrc b/botfiles/.zshrc
index 60c7b73..7b21e26 100644
--- a/botfiles/.zshrc
+++ b/botfiles/.zshrc
@@ -20,8 +20,8 @@ source "${HOME}/.zprofile"
 
 # Prompt
 #export PROMPT="%B%F{blue}%~ %b%f$ "
-export PROMPT=' %B%F{#34ef57}%~ %f%b
-[%B%F{red}%?%f%b]%F{#34ef57}%B>%b%f '
+export PROMPT=' %F{#299b9b}%~ %f
+[%B%F{red}%?%f%b]%F{#299b9b}%B>%b%f '
 
 # Completetion
 autoload -U compinit
@@ -104,3 +104,28 @@ export LESS_TERMCAP_ue=$'\E[0m'        # reset underline
 #TETRIS
 autoload -Uz tetriscurses
 alias tetris='tetriscurses'
+
+
+ZSH_HIGHLIGHT_STYLES[default]='none'
+ZSH_HIGHLIGHT_STYLES[unknown-token]='bg=red'
+ZSH_HIGHLIGHT_STYLES[reserved-word]='fg=yellow'
+ZSH_HIGHLIGHT_STYLES[alias]='fg=cyan'
+ZSH_HIGHLIGHT_STYLES[builtin]='fg=cyan'
+ZSH_HIGHLIGHT_STYLES[function]='fg=cyan'
+ZSH_HIGHLIGHT_STYLES[command]='fg=cyan'
+ZSH_HIGHLIGHT_STYLES[precommand]='none'
+ZSH_HIGHLIGHT_STYLES[commandseparator]='none'
+ZSH_HIGHLIGHT_STYLES[hashed-command]='fg=blue'
+ZSH_HIGHLIGHT_STYLES[path]='none'
+ZSH_HIGHLIGHT_STYLES[path_prefix]='none'
+ZSH_HIGHLIGHT_STYLES[path_approx]='fg=yellow'
+ZSH_HIGHLIGHT_STYLES[globbing]='fg=green'
+ZSH_HIGHLIGHT_STYLES[history-expansion]='fg=green'
+ZSH_HIGHLIGHT_STYLES[single-hyphen-option]='fg=magenta'
+ZSH_HIGHLIGHT_STYLES[double-hyphen-option]='fg=red'
+ZSH_HIGHLIGHT_STYLES[back-quoted-argument]='none'
+ZSH_HIGHLIGHT_STYLES[single-quoted-argument]='fg=red'
+ZSH_HIGHLIGHT_STYLES[double-quoted-argument]='fg=red'
+ZSH_HIGHLIGHT_STYLES[dollar-double-quoted-argument]='fg=cyan'
+ZSH_HIGHLIGHT_STYLES[back-double-quoted-argument]='fg=cyan'
+ZSH_HIGHLIGHT_STYLES[assign]='none'