diff --git a/bspwm/bspwmrc b/bspwm/bspwmrc
index ec57944..9101f04 100755
--- a/bspwm/bspwmrc
+++ b/bspwm/bspwmrc
@@ -8,9 +8,15 @@ sxhkd &
 nitrogen --restore
 picom &
 dunst &
+copyq &
+nm-applet &
+blueman-applet &
+xfce4-power-manager &
+numlockx on &
+/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 &
 
-#((defapt cred ca bspwm se poate ocupa singur de asta))TODO mini script care detecteaza monitoare si le da workspace-uri dinamic
-bspc monitor -d I II III IV V VI VII VIII IX
+bspc monitor -d 1 2 3 4 5 6
+bspc monitor VGA1 7 8 9
 
 
 bspc config focus_follows_pointer true
@@ -51,9 +57,13 @@ bspc config focused_private_border_color    ""
 # APP RULES
 ###
 
-bspc rule -a Gimp		desktop='^9' state=floating follow=on
+bspc rule -a Gimp		desktop='^6' state=floating follow=on
 bspc rule -a Pavucontrol	state=floating
-bspc rule -a copyq		state=floating  #TODO? daca nu se spawneaza in coltul ecranului atunci fa-l sa faca asa manual
+bspc rule -a copyq		state=floating
+bspc rule -a Blueman-manager	state=floating
 bspc rule -a Screenkey		manage=off
 bspc rule -a Firefox		desktop='^1'
 bspc rule -a Discord		desktop='^4'
+bspc rule -a AlarmWindow	state=floating
+bspc rule -a pop-up		state=floating
+bspc rule -a setup		state=floating
diff --git a/polybar/config.ini b/polybar/config.ini
index ab92807..78fe273 100644
--- a/polybar/config.ini
+++ b/polybar/config.ini
@@ -122,8 +122,8 @@ module-margin-right = 0
 ;   font-3 = FontAwesome:size=10
 ; See the Fonts wiki page for more details
 
-font-0 = "scientifica:size=8;2"
-font-1 = "Siji:size=8;2"
+font-0 = "Hack Nerd Font:size=8;2"
+font-1 = "Siji:size=10;2"
 
 ; Modules are added to one of the available blocks
 ;   modules-left = cpu ram
diff --git a/sxhkd/sxhkdd b/sxhkd/sxhkdd
deleted file mode 100644
index 0e5ea5a..0000000
--- a/sxhkd/sxhkdd
+++ /dev/null
@@ -1,121 +0,0 @@
-#
-# wm independent hotkeys
-#
-
-# terminal emulator
-super + Return
-	urxvt
-
-# program launcher
-super + @space
-	dmenu_run
-
-# make sxhkd reload its configuration files:
-super + Escape
-	pkill -USR1 -x sxhkd
-
-#
-# bspwm hotkeys
-#
-
-# quit/restart bspwm
-super + alt + {q,r}
-	bspc {quit,wm -r}
-
-# close and kill
-super + {_,shift + }w
-	bspc node -{c,k}
-
-# alternate between the tiled and monocle layout
-super + m
-	bspc desktop -l next
-
-# send the newest marked node to the newest preselected node
-super + y
-	bspc node newest.marked.local -n newest.!automatic.local
-
-# swap the current node and the biggest node
-super + g
-	bspc node -s biggest
-
-#
-# state/flags
-#
-
-# set the window state
-super + {t,shift + t,s,f}
-	bspc node -t {tiled,pseudo_tiled,floating,fullscreen}
-
-# set the node flags
-super + ctrl + {m,x,y,z}
-	bspc node -g {marked,locked,sticky,private}
-
-#
-# focus/swap
-#
-
-# focus the node in the given direction
-super + {_,shift + }{h,j,k,l}
-	bspc node -{f,s} {west,south,north,east}
-
-# focus the node for the given path jump
-super + {p,b,comma,period}
-	bspc node -f @{parent,brother,first,second}
-
-# focus the next/previous node in the current desktop
-super + {_,shift + }c
-	bspc node -f {next,prev}.local
-
-# focus the next/previous desktop in the current monitor
-super + bracket{left,right}
-	bspc desktop -f {prev,next}.local
-
-# focus the last node/desktop
-super + {grave,Tab}
-	bspc {node,desktop} -f last
-
-# focus the older or newer node in the focus history
-super + {o,i}
-	bspc wm -h off; \
-	bspc node {older,newer} -f; \
-	bspc wm -h on
-
-# focus or send to the given desktop
-super + {_,shift + }{1-9,0}
-	bspc {desktop -f,node -d} '^{1-9,10}'
-
-#
-# preselect
-#
-
-# preselect the direction
-super + ctrl + {h,j,k,l}
-	bspc node -p {west,south,north,east}
-
-# preselect the ratio
-super + ctrl + {1-9}
-	bspc node -o 0.{1-9}
-
-# cancel the preselection for the focused node
-super + ctrl + space
-	bspc node -p cancel
-
-# cancel the preselection for the focused desktop
-super + ctrl + shift + space
-	bspc query -N -d | xargs -I id -n 1 bspc node id -p cancel
-
-#
-# move/resize
-#
-
-# expand a window by moving one of its side outward
-super + alt + {h,j,k,l}
-	bspc node -z {left -20 0,bottom 0 20,top 0 -20,right 20 0}
-
-# contract a window by moving one of its side inward
-super + alt + shift + {h,j,k,l}
-	bspc node -z {right -20 0,top 0 20,bottom 0 -20,left 20 0}
-
-# move a floating window
-super + {Left,Down,Up,Right}
-	bspc node -v {-20 0,0 20,0 -20,20 0}
diff --git a/sxhkd/sxhkdrc b/sxhkd/sxhkdrc
index 38fb65d..7b1cfc8 100644
--- a/sxhkd/sxhkdrc
+++ b/sxhkd/sxhkdrc
@@ -13,8 +13,22 @@ super + shift + m
 	rhythmbox
 super + shift + v
 	pavucontrol
-#super + shift + f
-	#$FILEMANAGER
+super + shift + f
+	$FILEMANAGER
+super + shift + Return
+	$FILEMANAGER
+
+super + shift + d
+	discord
+super + shift + v
+	pavucontrol
+super + shift + o
+	$TERMINAL -e htop
+super + shift + Escape
+	xfce4-taskmanager
+super + shift + v
+	$TERMINAL -e vim -c Ex
+
 
 ###
 # MISC
@@ -23,7 +37,46 @@ super + shift + v
 # ROFI run menu
 super + d
 	rofi -show run
+
+# Turn off all diplays
+super + alt + c
+	sleep 1; xset dpms force off
+
+# dmenu display selector
+super + p
+	./display.sh
+
+#dmenu wacom area set
+super + w
+	./wacom.sh
+
 #Take a screenshot
+Print
+	flameshot gui
+#Brightness control
+XF86MonBrightnessDown
+	xbacklight -dec 5
+XF86MonBrightnessUp
+	xbacklight -inc 5
+
+#Volume control
+XF86Audio{Lower,Raise}Volume
+	amixer -D pulse sset Master 2%{-,+}
+XF86AudioMute
+	amixer -D pulse sset Master toggle
+XF86AudioMicMute
+	amixer -D pulse sset Capture toggle
+
+#Media keys
+XF86AudioPlay
+	playerctl play-pause
+XF86Audio{Next,Prev}
+	playerctl {next,previous}
+XF86AudioStop
+	playerctl stop
+# Power options script
+super + Escape
+	~/.config/bspwm/power.sh
 
 ###
 # BSPWM
@@ -38,7 +91,7 @@ super + {_,shift + }c
 	bspc node -{c,k}
 
 # alternate between the tiled and monocle layout
-super + f
+super + alt + f
 	bspc desktop -l next
 
 # send the newest marked node to the newest preselected node
@@ -54,7 +107,7 @@ super + m
 #
 
 # set the window state
-super + {t,alt + t,s,alt + f}
+super + {t,alt + t,s,f}
 	bspc node -t {tiled,pseudo_tiled,floating,fullscreen}
 
 # set the node flags
@@ -70,7 +123,7 @@ super + {_,shift + }{h,j,k,l}
 	bspc node -{f,s} {west,south,north,east}
 
 # focus the node for the given path jump
-super + {p,b,comma,period}
+super + {alt + p,alt + b,comma,period}
 	bspc node -f @{parent,brother,first,second}
 
 # focus the next/previous node in the current desktop