major fixes and rearrangement

102 files changed, 199 insertions, 145 deletions

diff --git a/Xresources b/Xresources
index 0365c8f..3fa2ad8 100644
--- a/Xresources
+++ b/Xresources
@@ -20,4 +20,9 @@ xterm*metaSendsEscape: true
 xterm*eightBitInput: false
 xterm*allowSendEvents: true
 
-
+Xft.autohint: 0
+Xft.lcdfilter:  lcddefault
+Xft.hintstyle:  hintfull
+Xft.hinting: 1
+Xft.antialias: 1
+Xft.rgba: rgb
diff --git a/bash_aliases b/bash_aliases
index 3908bb2..2c25e60 100644
--- a/bash_aliases
+++ b/bash_aliases
@@ -55,7 +55,7 @@ alias x='tar -xvzf'
 alias a='tar -cvzf'
 alias i='yaourt -S'
 alias p='sudo pacman -Rs'
-alias clean='sudo pacman -Rsn $(pacman -Qdtq)'
+alias clean='sudo pacma -Rsn $(pacman -Qdtq)'
 alias t='optirun'
 alias ts='optirun -b none nvidia-settings -c :8'
 alias tc='lsof -n /dev/nvidia0'
diff --git a/config/ratpoison/.tools b/config/ratpoison/.tools
new file mode 120000
index 0000000..5c56ccd
--- /dev/null
+++ b/config/ratpoison/.tools
@@ -0,0 +1 @@
+/home/vasko/dotfiles/tools
\ No newline at end of file
diff --git a/tools/README.md b/config/ratpoison/README.md
index 6970672..6970672 100644
--- a/tools/README.md
+++ b/config/ratpoison/README.md
diff --git a/tools/borderscript b/config/ratpoison/borderscript
index 1495bec..1495bec 100755
--- a/tools/borderscript
+++ b/config/ratpoison/borderscript
diff --git a/tools/bordtoggle b/config/ratpoison/bordtoggle
index 4b57c17..4b57c17 100755
--- a/tools/bordtoggle
+++ b/config/ratpoison/bordtoggle
diff --git a/tools/clipboard b/config/ratpoison/clipboard
index 79ad150..093a6d1 100755
--- a/tools/clipboard
+++ b/config/ratpoison/clipboard
@@ -42,7 +42,7 @@ function entries() {
 }
 
 function menu() {
-    echo ~/.tools/ratmenu -label "\"clipboard $command\"" \
+    echo ~/.config/ratpoison/ratmenu -label "\"clipboard $command\"" \
         -style dreary -fg \"$COLOR11\" -bg \"$COLOR0\" -io 2 $(entries) | sh
 }
 
diff --git a/tools/cmusplaying b/config/ratpoison/cmusplaying
index 133b6f9..133b6f9 100755
--- a/tools/cmusplaying
+++ b/config/ratpoison/cmusplaying
diff --git a/tools/cmusvolind b/config/ratpoison/cmusvolind
index 0e95e1e..0e95e1e 100755
--- a/tools/cmusvolind
+++ b/config/ratpoison/cmusvolind
diff --git a/tools/create_frame b/config/ratpoison/create_frame
index e39f7dc..e39f7dc 100755
--- a/tools/create_frame
+++ b/config/ratpoison/create_frame
diff --git a/tools/exec_to_workspace b/config/ratpoison/exec_to_workspace
index c7968f2..c7968f2 100755
--- a/tools/exec_to_workspace
+++ b/config/ratpoison/exec_to_workspace
diff --git a/config/ratpoison/firesend b/config/ratpoison/firesend
new file mode 100755
index 0000000..b1e2d37
--- /dev/null
+++ b/config/ratpoison/firesend
@@ -0,0 +1,2 @@
+#!/bin/bash
+$HOME/.config/ratpoison/exec_to_workspace II vimb $@ > /dev/null 2>&1
diff --git a/tools/functions b/config/ratpoison/functions
index fe9ab02..fe9ab02 100644
--- a/tools/functions
+++ b/config/ratpoison/functions
diff --git a/tools/imgur b/config/ratpoison/imgur
index 59e4199..59e4199 100755
--- a/tools/imgur
+++ b/config/ratpoison/imgur
diff --git a/tools/lock b/config/ratpoison/lock
index b2c0741..b2c0741 100755
--- a/tools/lock
+++ b/config/ratpoison/lock
diff --git a/tools/menu/anti-forensic b/config/ratpoison/menu/anti-forensic
index 8735c08..8735c08 100755
--- a/tools/menu/anti-forensic
+++ b/config/ratpoison/menu/anti-forensic
diff --git a/tools/menu/automation b/config/ratpoison/menu/automation
index fb5e773..fb5e773 100755
--- a/tools/menu/automation
+++ b/config/ratpoison/menu/automation
diff --git a/tools/menu/backdoor b/config/ratpoison/menu/backdoor
index 0cd2939..0cd2939 100755
--- a/tools/menu/backdoor
+++ b/config/ratpoison/menu/backdoor
diff --git a/tools/menu/binary b/config/ratpoison/menu/binary
index 5d7696e..5d7696e 100755
--- a/tools/menu/binary
+++ b/config/ratpoison/menu/binary
diff --git a/tools/menu/bluetooth b/config/ratpoison/menu/bluetooth
index 52416f5..52416f5 100755
--- a/tools/menu/bluetooth
+++ b/config/ratpoison/menu/bluetooth
diff --git a/tools/menu/code-audit b/config/ratpoison/menu/code-audit
index 6313a61..6313a61 100755
--- a/tools/menu/code-audit
+++ b/config/ratpoison/menu/code-audit
diff --git a/tools/menu/cracker b/config/ratpoison/menu/cracker
index 8579b6e..8579b6e 100755
--- a/tools/menu/cracker
+++ b/config/ratpoison/menu/cracker
diff --git a/tools/menu/crypto b/config/ratpoison/menu/crypto
index ea4b6fb..ea4b6fb 100755
--- a/tools/menu/crypto
+++ b/config/ratpoison/menu/crypto
diff --git a/tools/menu/cryptography b/config/ratpoison/menu/cryptography
index 1d8527d..1d8527d 100755
--- a/tools/menu/cryptography
+++ b/config/ratpoison/menu/cryptography
diff --git a/tools/menu/database b/config/ratpoison/menu/database
index ccfc385..ccfc385 100755
--- a/tools/menu/database
+++ b/config/ratpoison/menu/database
diff --git a/tools/menu/debugger b/config/ratpoison/menu/debugger
index fd66ba9..fd66ba9 100755
--- a/tools/menu/debugger
+++ b/config/ratpoison/menu/debugger
diff --git a/tools/menu/decompiler b/config/ratpoison/menu/decompiler
index f1c3f58..f1c3f58 100755
--- a/tools/menu/decompiler
+++ b/config/ratpoison/menu/decompiler
diff --git a/tools/menu/defensive b/config/ratpoison/menu/defensive
index 7a36e60..7a36e60 100755
--- a/tools/menu/defensive
+++ b/config/ratpoison/menu/defensive
diff --git a/tools/menu/disassembler b/config/ratpoison/menu/disassembler
index c5b35e8..c5b35e8 100755
--- a/tools/menu/disassembler
+++ b/config/ratpoison/menu/disassembler
diff --git a/tools/menu/dos b/config/ratpoison/menu/dos
index 87d5a96..87d5a96 100755
--- a/tools/menu/dos
+++ b/config/ratpoison/menu/dos
diff --git a/tools/menu/drone b/config/ratpoison/menu/drone
index 31700c8..31700c8 100755
--- a/tools/menu/drone
+++ b/config/ratpoison/menu/drone
diff --git a/tools/menu/exploitation b/config/ratpoison/menu/exploitation
index 26fa347..26fa347 100755
--- a/tools/menu/exploitation
+++ b/config/ratpoison/menu/exploitation
diff --git a/tools/menu/fingerprint b/config/ratpoison/menu/fingerprint
index 9fad377..9fad377 100755
--- a/tools/menu/fingerprint
+++ b/config/ratpoison/menu/fingerprint
diff --git a/tools/menu/firmware b/config/ratpoison/menu/firmware
index 89012aa..89012aa 100755
--- a/tools/menu/firmware
+++ b/config/ratpoison/menu/firmware
diff --git a/tools/menu/forensic b/config/ratpoison/menu/forensic
index 5095d28..5095d28 100755
--- a/tools/menu/forensic
+++ b/config/ratpoison/menu/forensic
diff --git a/tools/menu/fuzzer b/config/ratpoison/menu/fuzzer
index 24888c6..24888c6 100755
--- a/tools/menu/fuzzer
+++ b/config/ratpoison/menu/fuzzer
diff --git a/tools/menu/hardware b/config/ratpoison/menu/hardware
index 4722e92..4722e92 100755
--- a/tools/menu/hardware
+++ b/config/ratpoison/menu/hardware
diff --git a/tools/menu/honeypot b/config/ratpoison/menu/honeypot
index a8edcd6..a8edcd6 100755
--- a/tools/menu/honeypot
+++ b/config/ratpoison/menu/honeypot
diff --git a/tools/menu/keylogger b/config/ratpoison/menu/keylogger
index 63e34b2..63e34b2 100755
--- a/tools/menu/keylogger
+++ b/config/ratpoison/menu/keylogger
diff --git a/tools/menu/main b/config/ratpoison/menu/main
index 7321a01..7321a01 100755
--- a/tools/menu/main
+++ b/config/ratpoison/menu/main
diff --git a/tools/menu/malware b/config/ratpoison/menu/malware
index e444018..e444018 100755
--- a/tools/menu/malware
+++ b/config/ratpoison/menu/malware
diff --git a/tools/menu/misc b/config/ratpoison/menu/misc
index b0b22ba..b0b22ba 100755
--- a/tools/menu/misc
+++ b/config/ratpoison/menu/misc
diff --git a/tools/menu/mobile b/config/ratpoison/menu/mobile
index 7df69de..7df69de 100755
--- a/tools/menu/mobile
+++ b/config/ratpoison/menu/mobile
diff --git a/tools/menu/networking b/config/ratpoison/menu/networking
index 05306fc..05306fc 100755
--- a/tools/menu/networking
+++ b/config/ratpoison/menu/networking
diff --git a/tools/menu/nfc b/config/ratpoison/menu/nfc
index 612752b..612752b 100755
--- a/tools/menu/nfc
+++ b/config/ratpoison/menu/nfc
diff --git a/tools/menu/packer b/config/ratpoison/menu/packer
index 9d11921..9d11921 100755
--- a/tools/menu/packer
+++ b/config/ratpoison/menu/packer
diff --git a/tools/menu/proxy b/config/ratpoison/menu/proxy
index 53c8449..53c8449 100755
--- a/tools/menu/proxy
+++ b/config/ratpoison/menu/proxy
diff --git a/tools/menu/radio b/config/ratpoison/menu/radio
index d551b6c..d551b6c 100755
--- a/tools/menu/radio
+++ b/config/ratpoison/menu/radio
diff --git a/tools/menu/recon b/config/ratpoison/menu/recon
index 93698b5..93698b5 100755
--- a/tools/menu/recon
+++ b/config/ratpoison/menu/recon
diff --git a/tools/menu/reversing b/config/ratpoison/menu/reversing
index 691593f..691593f 100755
--- a/tools/menu/reversing
+++ b/config/ratpoison/menu/reversing
diff --git a/tools/menu/scanner b/config/ratpoison/menu/scanner
index e39b562..e39b562 100755
--- a/tools/menu/scanner
+++ b/config/ratpoison/menu/scanner
diff --git a/tools/menu/sniffer b/config/ratpoison/menu/sniffer
index 5597ba3..5597ba3 100755
--- a/tools/menu/sniffer
+++ b/config/ratpoison/menu/sniffer
diff --git a/tools/menu/social b/config/ratpoison/menu/social
index dcff339..dcff339 100755
--- a/tools/menu/social
+++ b/config/ratpoison/menu/social
diff --git a/tools/menu/spoof b/config/ratpoison/menu/spoof
index 44b05e0..44b05e0 100755
--- a/tools/menu/spoof
+++ b/config/ratpoison/menu/spoof
diff --git a/tools/menu/threat-model b/config/ratpoison/menu/threat-model
index c049121..c049121 100755
--- a/tools/menu/threat-model
+++ b/config/ratpoison/menu/threat-model
diff --git a/tools/menu/tunnel b/config/ratpoison/menu/tunnel
index 36ac380..36ac380 100755
--- a/tools/menu/tunnel
+++ b/config/ratpoison/menu/tunnel
diff --git a/tools/menu/unpacker b/config/ratpoison/menu/unpacker
index 480190a..480190a 100755
--- a/tools/menu/unpacker
+++ b/config/ratpoison/menu/unpacker
diff --git a/tools/menu/voip b/config/ratpoison/menu/voip
index 2e23991..2e23991 100755
--- a/tools/menu/voip
+++ b/config/ratpoison/menu/voip
diff --git a/tools/menu/webapp b/config/ratpoison/menu/webapp
index 98ee5e6..98ee5e6 100755
--- a/tools/menu/webapp
+++ b/config/ratpoison/menu/webapp
diff --git a/tools/menu/windows b/config/ratpoison/menu/windows
index add1f71..add1f71 100755
--- a/tools/menu/windows
+++ b/config/ratpoison/menu/windows
diff --git a/tools/menu/wireless b/config/ratpoison/menu/wireless
index 2fc6eda..2fc6eda 100755
--- a/tools/menu/wireless
+++ b/config/ratpoison/menu/wireless
diff --git a/tools/mpdvolind b/config/ratpoison/mpdvolind
index c279af8..c279af8 100755
--- a/tools/mpdvolind
+++ b/config/ratpoison/mpdvolind
diff --git a/config/ratpoison/newtab b/config/ratpoison/newtab
new file mode 100755
index 0000000..2adab28
--- /dev/null
+++ b/config/ratpoison/newtab
@@ -0,0 +1,2 @@
+#!/bin/sh
+~/.config/ratpoison/exec_to_workspace 2 firefox -new-tab $1
diff --git a/tools/panel/audio_mon b/config/ratpoison/panel/audio_mon
index 1a1fa55..1a1fa55 100644
--- a/tools/panel/audio_mon
+++ b/config/ratpoison/panel/audio_mon
diff --git a/tools/panel/batterymon b/config/ratpoison/panel/batterymon
index 19a4d5a..19a4d5a 100755
--- a/tools/panel/batterymon
+++ b/config/ratpoison/panel/batterymon
diff --git a/tools/panel/icons b/config/ratpoison/panel/icons
index aa27523..aa27523 100644..100755
--- a/tools/panel/icons
+++ b/config/ratpoison/panel/icons
diff --git a/tools/panel/load b/config/ratpoison/panel/load
index 3977bee..3977bee 100755
--- a/tools/panel/load
+++ b/config/ratpoison/panel/load
diff --git a/tools/panel/monce b/config/ratpoison/panel/monce
index caa316c..caa316c 100755
--- a/tools/panel/monce
+++ b/config/ratpoison/panel/monce
diff --git a/tools/panel/music b/config/ratpoison/panel/music
index 2fb91d1..2fb91d1 100755
--- a/tools/panel/music
+++ b/config/ratpoison/panel/music
diff --git a/tools/panel/panel b/config/ratpoison/panel/panel
index 4260578..0477467 100755
--- a/tools/panel/panel
+++ b/config/ratpoison/panel/panel
@@ -1,7 +1,7 @@
 #! /bin/sh
 cd ~/.tools/panel
-source ./profile
-source ~/.colors
+. ./profile
+. ~/.colors
 
 [ -e "$PANEL_FIFO" ] && rm "$PANEL_FIFO"
 mkfifo -m 777 "$PANEL_FIFO"
diff --git a/tools/panel/panel_bar b/config/ratpoison/panel/panel_bar
index 4bc63f9..99370d8 100755
--- a/tools/panel/panel_bar
+++ b/config/ratpoison/panel/panel_bar
@@ -2,8 +2,8 @@
 
 num_mon=$(bspc query -M | wc -l)
 
-source ./panel_colors
-source ./icons
+. ./panel_colors
+. ./icons
 while read -r line ; do
 	case $line in
 		Imail) 
@@ -74,15 +74,13 @@ while read -r line ; do
 			;;
 	
 	
-		B*)
-			# battery output
-			if [[ ${line#?} =~ Discharging ]];then
+		BDischarging*)
 			percent=`echo ${line#?} | cut -d' ' -f2`
 			battery="%{F$COLOR_STATUS_FG}%{B$COLOR_STATUS_BG} ${ICON_PWR} ${percent} %{B-}%{F-}";
-		        else
+			;;
+	        B*)
 			percent=`echo ${line#?} | cut -d' ' -f2`
 			battery="%{F$COLOR_STATUS_FG}%{B$COLOR_STATUS_BG} ${ICON_PLUG} ${percent} %{B-}%{F-}";
-		        fi
 			;;
 	
 	
diff --git a/tools/panel/panel_colors b/config/ratpoison/panel/panel_colors
index f04ddbb..ac3d3b4 100644..100755
--- a/tools/panel/panel_colors
+++ b/config/ratpoison/panel/panel_colors
@@ -1,4 +1,5 @@
-source ~/.colors
+#!/bin/bash
+. ~/.colors
 
 COLOR_FOCUSED_FG="#FF`echo $COLOR4 | cut -c 2-`"
 COLOR_FOCUSED_BG="#FF`echo $COLOR0 | cut -c 2-`"
diff --git a/tools/panel/profile b/config/ratpoison/panel/profile
index c8b6807..e0eeba2 100755
--- a/tools/panel/profile
+++ b/config/ratpoison/panel/profile
@@ -1,3 +1,4 @@
+#!/bin/bash
 PANEL_FIFO=/tmp/panel-fifo
 PANEL_HEIGHT=24
 
diff --git a/tools/panel/signal b/config/ratpoison/panel/signal
index d494f5d..d494f5d 100755
--- a/tools/panel/signal
+++ b/config/ratpoison/panel/signal
diff --git a/config/ratpoison/panel/windows b/config/ratpoison/panel/windows
new file mode 100755
index 0000000..e5ae808
--- /dev/null
+++ b/config/ratpoison/panel/windows
@@ -0,0 +1,3 @@
+#!/bin/bash
+echo 'Wclear' > /tmp/panel-fifo
+ratpoison -c 'windows %s%n %t' | while read line;do echo "${line}" | cut -c -25 > /tmp/panel-fifo && sleep 0.004;done                   
diff --git a/tools/paneltoggle b/config/ratpoison/paneltoggle
index 5e665bb..5e665bb 100755
--- a/tools/paneltoggle
+++ b/config/ratpoison/paneltoggle
diff --git a/tools/py/color_detect.py b/config/ratpoison/py/color_detect.py
index 30661f8..30661f8 100644
--- a/tools/py/color_detect.py
+++ b/config/ratpoison/py/color_detect.py
diff --git a/tools/py/colorz.py b/config/ratpoison/py/colorz.py
index 8c00f0c..8c00f0c 100644
--- a/tools/py/colorz.py
+++ b/config/ratpoison/py/colorz.py
diff --git a/tools/py/colorz.pyc b/config/ratpoison/py/colorz.pyc
index c31b558..c31b558 100644
--- a/tools/py/colorz.pyc
+++ b/config/ratpoison/py/colorz.pyc
diff --git a/tools/ratcolor b/config/ratpoison/ratcolor
index e6e59a8..e6e59a8 100755
--- a/tools/ratcolor
+++ b/config/ratpoison/ratcolor
diff --git a/tools/ratmenu b/config/ratpoison/ratmenu
index d8ec195..d8ec195 100755
--- a/tools/ratmenu
+++ b/config/ratpoison/ratmenu
diff --git a/config/ratpoison/ratpoison.colors b/config/ratpoison/ratpoison.colors
new file mode 100644
index 0000000..8659fcd
--- /dev/null
+++ b/config/ratpoison/ratpoison.colors
@@ -0,0 +1,2 @@
+set fgcolor #c83f21
+set bgcolor #200909
diff --git a/config/ratpoison/ratpoisonrc.clipboard b/config/ratpoison/ratpoisonrc.clipboard
new file mode 100644
index 0000000..dbdcef1
--- /dev/null
+++ b/config/ratpoison/ratpoisonrc.clipboard
@@ -0,0 +1,57 @@
+# Use xcb to build a better cut and paste clipboard.
+#
+# C-t y #   - paste selection buffer # (and sets the current X PRIMARY selection to it)
+# C-t p #   - set selection buffer # using current X PRIMARY selection
+
+# C-t y a   - pop selection (treat buffers as a stack with 1 being the bottom)
+# C-t y q   - pop selection (queue pop)
+# C-t p a   - push selection (treat buffers as a stack with 1 being the bottom)
+
+# C-t y y   - paste selection menu
+# C-t p p   - set selection menu
+
+# C-t p C   - clear all buffers
+
+# change directory to $HOME
+chdir
+
+newkmap clipboard_paste
+newkmap clipboard_set
+exec ~/.config/ratpoison/clipboard init
+
+bind p readkey clipboard_paste
+bind y readkey clipboard_set
+
+# Menu version of paste and set
+definekey clipboard_paste p exec ~/.config/ratpoison/clipboard menu_paste
+definekey clipboard_set y exec ~/.config/ratpoison/clipboard menu_set
+
+# Clear buffers
+definekey clipboard_set C exec ~/.config/ratpoison/clipboard init
+
+# Push/pop
+definekey clipboard_paste a exec ~/.config/ratpoison/clipboard pop
+definekey clipboard_set a exec ~/.config/ratpoison/clipboard push
+# pop queue
+definekey clipboard_paste q exec ~/.config/ratpoison/clipboard pop_queue
+
+definekey clipboard_paste 1 exec ~/.config/ratpoison/clipboard paste 1
+definekey clipboard_paste 2 exec ~/.config/ratpoison/clipboard paste 2
+definekey clipboard_paste 3 exec ~/.config/ratpoison/clipboard paste 3
+definekey clipboard_paste 4 exec ~/.config/ratpoison/clipboard paste 4
+definekey clipboard_paste 5 exec ~/.config/ratpoison/clipboard paste 5
+definekey clipboard_paste 6 exec ~/.config/ratpoison/clipboard paste 6
+definekey clipboard_paste 7 exec ~/.config/ratpoison/clipboard paste 7
+definekey clipboard_paste 8 exec ~/.config/ratpoison/clipboard paste 8
+definekey clipboard_paste 9 exec ~/.config/ratpoison/clipboard paste 9
+
+definekey clipboard_set 1 exec ~/.config/ratpoison/clipboard set 1
+definekey clipboard_set 2 exec ~/.config/ratpoison/clipboard set 2
+definekey clipboard_set 3 exec ~/.config/ratpoison/clipboard set 3
+definekey clipboard_set 4 exec ~/.config/ratpoison/clipboard set 4
+definekey clipboard_set 5 exec ~/.config/ratpoison/clipboard set 5
+definekey clipboard_set 6 exec ~/.config/ratpoison/clipboard set 6
+definekey clipboard_set 7 exec ~/.config/ratpoison/clipboard set 7
+definekey clipboard_set 8 exec ~/.config/ratpoison/clipboard set 8
+definekey clipboard_set 9 exec ~/.config/ratpoison/clipboard set 9
+
diff --git a/tools/ratpoisonrc.conf b/config/ratpoison/ratpoisonrc.conf
index f441830..4eed442 100644
--- a/tools/ratpoisonrc.conf
+++ b/config/ratpoison/ratpoisonrc.conf
@@ -5,14 +5,14 @@ definekey top s-grave meta
 definekey top Arabic_dammatan meta
 
 #find files script
-bind f exec ~/.tools/spotlight
+bind f exec ~/.config/ratpoison/spotlight
 
 # set font with unicode support
 #set font -*-terminus-medium-r-normal-*-14-*-*-*-*-*-*-*
 set font "DejaVu Sans Mono"
 
 # Enable xcb copy/paste
-source .tools/ratpoisonrc.clipboard
+source .config/ratpoison/ratpoisonrc.clipboard
 
 # Make tab switch to the next screen
 bind Tab nextscreen
@@ -52,7 +52,7 @@ showborder
 ######################################
 # Panel
 ######################################
-alias barsend exec ~/.tools/panel/windows
+alias barsend exec ~/.config/ratpoison/panel/windows
 
 # tell ratpoison to ignore panels
 unmanage rpbar
@@ -75,49 +75,64 @@ unmanage ratbar.pl
 
 
 # Switcher window
-alias workspace_menu exec .tools/workspace_menu
+alias workspace_menu exec .config/ratpoison/workspace_menu
 bind W workspace_menu
 
 
 #Get F-keys to switch windows now in /usr/bin/rpws
-definekey top F1 exec rpws 1 && echo "D1" > /tmp/panel-fifo #&& ratpoison -c bordscript
-definekey top F2 exec rpws 2 && echo "D2" > /tmp/panel-fifo #&& ratpoison -c bordscript
-definekey top F3 exec rpws 3 && echo "D3" > /tmp/panel-fifo #&& ratpoison -c bordscript
-definekey top F4 exec rpws 4 && echo "D4" > /tmp/panel-fifo #&& ratpoison -c bordscript
-definekey top F5 exec rpws 5 && echo "D5" > /tmp/panel-fifo #&& ratpoison -c bordscript
-definekey top F6 exec rpws 6 && echo "D6" > /tmp/panel-fifo #&& ratpoison -c bordscript
-definekey top F7 exec rpws 7 && echo "D7" > /tmp/panel-fifo #&& ratpoison -c bordscript
-definekey top F8 exec rpws 8 && echo "D8" > /tmp/panel-fifo #&& ratpoison -c bordscript
-definekey top F9 exec rpws 9 && printf "D9\nIxlear\n" > /tmp/panel-fifo #&& ratpoison -c bordscript
-definekey top F10 exec rpws 10 && printf "D10\nIclear\n" > /tmp/panel-fifo & xset -led named "Scroll Lock" #&& ratpoison -c bordscript
-definekey top F11 exec rpws 11 && echo "D11" > /tmp/panel-fifo #&& ratpoison -c bordscript
-definekey top F12 exec rpws 12 && echo "D12" > /tmp/panel-fifo #&& ratpoison -c bordscript
-
-definekey top M-F1 rpwsm1
-definekey top M-F2 rpwsm2
-definekey top M-F3 rpwsm3
-definekey top M-F4 rpwsm4
-definekey top M-F5 rpwsm5
-definekey top M-F6 rpwsm6
-definekey top M-F7 rpwsm7
-definekey top M-F8 rpwsm8
-definekey top M-F9 rpwsm9
-definekey top M-F10 rpwsm10
-definekey top M-F11 rpwsm11
-definekey top M-F12 rpwsm12
-
-definekey top S-F1 exec rpws 13
-definekey top S-F2 exec rpws 14
-definekey top S-F3 exec rpws 15
-definekey top S-F4 exec rpws 16
-definekey top S-F5 exec rpws 17
-definekey top S-F6 exec rpws 18
-definekey top S-F7 exec rpws 19
-definekey top S-F8 exec rpws 20
-definekey top S-F9 exec rpws 21
-definekey top S-F10 exec rpws 22
-definekey top S-F11 exec rpws 23
-definekey top S-F12 exec rpws 24
+definekey top F1 exec rpws 1 && echo "D1" > /tmp/panel-fifo && ratpoison -c barsend
+definekey top F2 exec rpws 2 && echo "D2" > /tmp/panel-fifo && ratpoison -c barsend
+definekey top F3 exec rpws 3 && echo "D3" > /tmp/panel-fifo && ratpoison -c barsend
+definekey top F4 exec rpws 4 && echo "D4" > /tmp/panel-fifo && ratpoison -c barsend
+definekey top F5 exec rpws 5 && echo "D5" > /tmp/panel-fifo && ratpoison -c barsend
+definekey top F6 exec rpws 6 && echo "D6" > /tmp/panel-fifo && ratpoison -c barsend
+definekey top F7 exec rpws 7 && echo "D7" > /tmp/panel-fifo && ratpoison -c barsend
+definekey top F8 exec rpws 8 && echo "D8" > /tmp/panel-fifo && ratpoison -c barsend
+definekey top F9 exec rpws 9 && printf "D9\nIxlear\n" > /tmp/panel-fifo && ratpoison -c barsend
+definekey top F10 exec rpws 10 && printf "D10\nIclear\n" > /tmp/panel-fifo & xset -led named "Scroll Lock" & ratpoison -c barsend
+definekey top F11 exec rpws 11 && echo "D11" > /tmp/panel-fifo && ratpoison -c barsend
+definekey top F12 exec rpws 12 && echo "D12" > /tmp/panel-fifo && ratpoison -c barsend
+
+definekey top M-F1 rpwsm1 && echo "D1" > /tmp/panel-fifo && ratpoison -c barsend
+definekey top M-F2 rpwsm2 && echo "D2" > /tmp/panel-fifo && ratpoison -c barsend
+definekey top M-F3 rpwsm3 && echo "D3" > /tmp/panel-fifo && ratpoison -c barsend
+definekey top M-F4 rpwsm4 && echo "D4" > /tmp/panel-fifo && ratpoison -c barsend
+definekey top M-F5 rpwsm5 && echo "D5" > /tmp/panel-fifo && ratpoison -c barsend
+definekey top M-F6 rpwsm6 && echo "D6" > /tmp/panel-fifo && ratpoison -c barsend
+definekey top M-F7 rpwsm7 && echo "D7" > /tmp/panel-fifo && ratpoison -c barsend
+definekey top M-F8 rpwsm8 && echo "D8" > /tmp/panel-fifo && ratpoison -c barsend
+definekey top M-F9 rpwsm9 printf "D9\nIxlear\n" > /tmp/panel-fifo && ratpoison -c barsend
+definekey top M-F10 rpwsm10 && printf "D10\nIclear\n" > /tmp/panel-fifo & xset -led named "Scroll Lock" && ratpoison -c barsend
+definekey top M-F11 rpwsm11 && echo "D11" > /tmp/panel-fifo && ratpoison -c barsend
+definekey top M-F12 rpwsm12 && echo "D12" > /tmp/panel-fifo && ratpoison -c barsend
+
+definekey top S-F1 exec rpws 13 && echo "D13" > /tmp/panel-fifo && ratpoison -c barsend
+definekey top S-F2 exec rpws 14 && echo "D14" > /tmp/panel-fifo && ratpoison -c barsend
+definekey top S-F3 exec rpws 15 && echo "D15" > /tmp/panel-fifo && ratpoison -c barsend
+definekey top S-F4 exec rpws 16 && echo "D16" > /tmp/panel-fifo && ratpoison -c barsend
+definekey top S-F5 exec rpws 17 && echo "D17" > /tmp/panel-fifo && ratpoison -c barsend
+definekey top S-F6 exec rpws 18 && echo "D18" > /tmp/panel-fifo && ratpoison -c barsend
+definekey top S-F7 exec rpws 19 && echo "D19" > /tmp/panel-fifo && ratpoison -c barsend
+definekey top S-F8 exec rpws 20 && echo "D20" > /tmp/panel-fifo && ratpoison -c barsend
+definekey top S-F9 exec rpws 21 && echo "D21" > /tmp/panel-fifo && ratpoison -c barsend
+definekey top S-F10 exec rpws 22 && echo "D22" > /tmp/panel-fifo && ratpoison -c barsend
+definekey top S-F11 exec rpws 23 && echo "D23" > /tmp/panel-fifo && ratpoison -c barsend
+definekey top S-F12 exec rpws 24 && echo "D24" > /tmp/panel-fifo && ratpoison -c barsend
+
+definekey top S-M-F1 rpwsm13 && echo "D13" > /tmp/panel-fifo && ratpoison -c barsend
+definekey top S-M-F2 rpwsm14 && echo "D14" > /tmp/panel-fifo && ratpoison -c barsend
+definekey top S-M-F3 rpwsm15 && echo "D15" > /tmp/panel-fifo && ratpoison -c barsend
+definekey top S-M-F4 rpwsm16 && echo "D16" > /tmp/panel-fifo && ratpoison -c barsend
+definekey top S-M-F5 rpwsm17 && echo "D17" > /tmp/panel-fifo && ratpoison -c barsend
+definekey top S-M-F6 rpwsm18 && echo "D18" > /tmp/panel-fifo && ratpoison -c barsend
+definekey top S-M-F7 rpwsm19 && echo "D19" > /tmp/panel-fifo && ratpoison -c barsend
+definekey top S-M-F8 rpwsm20 && echo "D20" > /tmp/panel-fifo && ratpoison -c barsend
+definekey top S-M-F9 rpwsm21 && echo "D21" > /tmp/panel-fifo && ratpoison -c barsend
+definekey top S-M-F10 rpwsm22 && echo "D22" > /tmp/panel-fifo && ratpoison -c barsend
+definekey top S-M-F11 rpwsm23 && echo "D23" > /tmp/panel-fifo && ratpoison -c barsend
+definekey top S-M-F12 rpwsm24 && echo "D24" > /tmp/panel-fifo && ratpoison -c barsend
+
+
 
 #definekey top s-F1 exec ratpoison -c 'meta F1'
 #definekey top s-F2 exec ratpoison -c 'meta F2'
@@ -142,7 +157,7 @@ definekey top M-S-F12 rpwsm13
 #Bindings
 #-------------------------------------------------------------
 
-alias window_menu exec .tools/window_menu
+alias window_menu exec .config/ratpoison/window_menu
 
 bind h focusleft
 bind l focusright
@@ -160,7 +175,7 @@ bind T exec ~/bin/passmake
 definekey top s-l exec i3lock -n -i ~/.wallpaper.png
 definekey top s-s exec ~/bin/sus
 definekey top s-L redisplay
-bind C exec ~/.tools/wp change
+bind C exec ~/.config/ratpoison/wp change
 bind v hsplit
 bind V hsplit 2/3
 bind s vsplit
@@ -180,9 +195,9 @@ bind m exec xfce4-popup-applicationsmenu
 bind g exec ~/bin/safeimg
 bind P exec ~/bin/safepaste
 
-alias bordtoggle exec ~/.tools/bordtoggle
-alias bordscript exec ~/.tools/borderscript
-alias paneltoggle exec ~/.tools/paneltoggle
+alias bordtoggle exec ~/.config/ratpoison/bordtoggle
+alias bordscript exec ~/.config/ratpoison/borderscript
+alias paneltoggle exec ~/.config/ratpoison/paneltoggle
 
 
 
@@ -195,11 +210,11 @@ definekey top s-p paneltoggle
 
 
 # b : Open url
-alias browse_cmd exec .tools/exec_to_workspace 2 vimb
+alias browse_cmd exec .config/ratpoison/exec_to_workspace 2 vimb
 alias browse colon browse_cmd 
 bind b browse
 # B : open a new firefox tab and browse to the X clipboard selection
-alias browse_selection exec .tools/exec_to_workspace 2 vimb `ratpoison -c getsel`
+alias browse_selection exec .config/ratpoison/exec_to_workspace 2 vimb `ratpoison -c getsel`
 bind B banish
 
 # Paste with X selection
@@ -226,13 +241,13 @@ definekey top KP_Enter exec ~/Dropbox/speech/run-duplex.sh
 # Volume Control
 #-------------------------------------------------------------
 # Up
-alias volup exec amixer -q set Master 5+ && ratpoison -c "echo `$HOME/.tools/volind`"
+alias volup exec amixer -q set Master 5+ && ratpoison -c "echo `$HOME/.config/ratpoison/volind`" & volume -f 'V%i' > /tmp/panel-fifo
 
 definekey top XF86AudioRaiseVolume volup
 definekey top s-Prior volup
 
 # Down
-alias voldown exec amixer -q set Master 5- && ratpoison -c "echo `$HOME/.tools/volind`"
+alias voldown exec amixer -q set Master 5- && ratpoison -c "echo `$HOME/.config/ratpoison/volind`" & volume -f 'V%i' > /tmp/panel-fifo
 
 definekey top XF86AudioLowerVolume voldown
 definekey top s-Next voldown
@@ -257,9 +272,9 @@ definekey top XF86MonBrightnessDown brightdown
 #-------------------------------------------------------------
 # Aliases
 alias playinfo exec ratpoison -c "echo Music: `mpc -h 127.0.0.1 | head -2 | tail -1 | awk '{print $1}'`"
-alias volinfo exec ratpoison -c "echo `$HOME/.tools/mpdvolind`"
+alias volinfo exec ratpoison -c "echo `$HOME/.config/ratpoison/mpdvolind`"
 alias songinfo exec ratpoison -c "echo Music: `mpc -h 127.0.0.1 | head -1`"
-#alias volinfo exec ratpoison -c "echo `$HOME/.tools/cmusvolind`"
+#alias volinfo exec ratpoison -c "echo `$HOME/.config/ratpoison/cmusvolind`"
 #alias playinfo exec ratpoison -c "echo Music: `cmus-remote -Q | awk '/status/  {print $2}'`"
 #alias songinfo exec ratpoison -c "echo Playing:`cmus-remote -Q | awk '/ artist/ {$1=$2=""; print $0}'` - `cmus-remote -Q 2>/dev/null | grep title | awk '{$1=$2=""; print $0}'`"
 
diff --git a/tools/rpbar b/config/ratpoison/rpbar
index 3b90f35..3b90f35 100755
--- a/tools/rpbar
+++ b/config/ratpoison/rpbar
diff --git a/tools/rpbaro b/config/ratpoison/rpbaro
index cb4b1f0..cb4b1f0 100755
--- a/tools/rpbaro
+++ b/config/ratpoison/rpbaro
diff --git a/tools/rpbarsend b/config/ratpoison/rpbarsend
index e1b7b05..e1b7b05 100755
--- a/tools/rpbarsend
+++ b/config/ratpoison/rpbarsend
diff --git a/tools/screen_run b/config/ratpoison/screen_run
index 97baff4..c70b567 100755
--- a/tools/screen_run
+++ b/config/ratpoison/screen_run
@@ -2,7 +2,7 @@
 #
 # Connect to a named screen session if it exists, otherwise create it
 # If creating a new screen session, use the file screenrc.$session
-# in the .tools directory.
+# in the .config/ratpoison directory.
 #
 screen_dir=$HOME/.screen
 session=$1
diff --git a/tools/spotlight b/config/ratpoison/spotlight
index a60a201..a60a201 100755
--- a/tools/spotlight
+++ b/config/ratpoison/spotlight
diff --git a/tools/sprunge b/config/ratpoison/sprunge
index a6e89a4..a6e89a4 100755
--- a/tools/sprunge
+++ b/config/ratpoison/sprunge
diff --git a/tools/taskbar b/config/ratpoison/taskbar
index 46bb43f..46bb43f 100755
--- a/tools/taskbar
+++ b/config/ratpoison/taskbar
diff --git a/tools/time b/config/ratpoison/time
index 4e3cbfc..4e3cbfc 100755
--- a/tools/time
+++ b/config/ratpoison/time
diff --git a/tools/volind b/config/ratpoison/volind
index c562ef6..c562ef6 100755
--- a/tools/volind
+++ b/config/ratpoison/volind
diff --git a/tools/window_menu b/config/ratpoison/window_menu
index 950d252..26f5e4d 100755
--- a/tools/window_menu
+++ b/config/ratpoison/window_menu
@@ -6,7 +6,7 @@
 #   - If order=last, the windows are listed in the order that you last visited them in.
 #   - If order=sequential, the windows are listed in number order.
 order=sequential
-ratmenu="~/.tools/ratmenu"
+ratmenu="~/.config/ratpoison/ratmenu"
 
 source ~/.colors
 
@@ -15,7 +15,7 @@ source ~/.colors
 
 window_index_str=$(ratpoison -c "info" | sed 's/^.*\([0-9]\)(.*$/\1/')
 if [ "$window_index_str" = "No window." ]; then
-    group_index=$($HOME/.tools/workspace current)
+    group_index=$($HOME/.config/ratpoison/workspace current)
     $ratmenu -style dreary -fg \"$COLOR0\" -bg \"$COLOR0\" "No windows in group $group_index" 
 /bin/true
 else
diff --git a/tools/workspace_menu b/config/ratpoison/workspace_menu
index 6fb6633..38ef9fc 100755
--- a/tools/workspace_menu
+++ b/config/ratpoison/workspace_menu
@@ -7,7 +7,7 @@
 # script possible.  Regular bourne shell printf does NOT.
 
 workspace_command="/usr/bin/rpws"
-ratmenu="~/.tools/ratmenu"
+ratmenu="~/.config/ratpoison/ratmenu"
 
 ( printf "$ratmenu -style dreary -fg \"$COLOR11\" -bg \"$COLOR0\" -io $[ $($workspace_command current) + 1 ]";
   ratpoison -c "groups" | while read s; do
diff --git a/tools/wp b/config/ratpoison/wp
index ad77290..1f7a707 100755
--- a/tools/wp
+++ b/config/ratpoison/wp
@@ -254,5 +254,6 @@ pkill stalone
 source ~/.colors
 #convert -font DejaVuSansB -pointsize 30 -stroke $COLOR0 -strokewidth 1 -fill $COLOR11 -draw 'text 70,60 "Vasil Zlatanov -> +46 723537981 vasil.zlatanov@gmail.com" ' $background ~/.wallpaper.png &
 convert $background ~/.wallpaper.png &
+chmod +x ~/.colors
 ~/.config/vimb/color-gen
-~/.tools/ratcolor
+~/.config/ratpoison/ratcolor
diff --git a/tools/xtoolwait b/config/ratpoison/xtoolwait
index 6d07668..6d07668 100755
--- a/tools/xtoolwait
+++ b/config/ratpoison/xtoolwait
diff --git a/config/vimb/config b/config/vimb/config
index 1075b1e..1cec1bb 100644
--- a/config/vimb/config
+++ b/config/vimb/config
@@ -1,10 +1,37 @@
-nmap s 10j
-nmap e 10k
-set status-color-bg=#200c0c
-set status-color-fg=#c8834f
-set status-ssl-color-bg=#200c0c
-set status-ssl-color-fg=#c8834f
-set completion-bg-active=#200c0c
-set completion-bg-normal=#200c0c
-set completion-fg-active=#a0614d
-set completion-fg-normal=#c8834f
+shortcut-add wiki=https://en.wikipedia.org/w/index.php?search=$0
+shortcut-add gl=https://encrypted.google.com/#q=$0
+shortcut-add dl=https://duckduckgo.com/lite/?q=$0
+shortcut-add map=https://maps.google.com/maps?saddr=$0&daddr=$1
+shortcut-add gh=https://github.com/$0/$1
+shortcut-add arrp=https://www.archlinux.org/packages/?q=$0
+shortcut-add arwk=https://wiki.archlinux.org/index.php?title=Special%3ASearch&search=$0&go=Go
+shortcut-add aur=https://aur.archlinux.org/packages/?K=$0
+shortcut-default gl
+
+set download-command=aria2c --seed-time=900 -d Downloads/ %s
+set download-use-external=true
+
+set cookie-accept=always
+set cookie-expire-time=0
+set cookie-timeout=0
+
+nmap s <C-D>
+nmap e <C-U>
+nmap w :open wiki 
+nmap W :open arwk 
+nmap d :open dl 
+nmap a :open arrp 
+nmap A :open aur 
+nmap ( <C-O>
+nmap ) <C-N>
+nmap S :set scripts=false<CR> r :shellcmd mpv --no-terminal "%s"<CR> :set scripts=true<CR>
+
+
+set status-color-bg=#202020
+set status-color-fg=#c8c8c8
+set status-ssl-color-bg=#202020
+set status-ssl-color-fg=#c8c8c8
+set completion-bg-active=#202020
+set completion-bg-normal=#202020
+set completion-fg-active=#a0a0a0
+set completion-fg-normal=#c8c8c8
diff --git a/mutt/crypto.rc b/mutt/crypto.rc
index 9b43636..4029c3d 100644
--- a/mutt/crypto.rc
+++ b/mutt/crypto.rc
@@ -28,12 +28,12 @@ set pgp_good_sign="^gpg: Good signature from"
 # if you want to use S-mime instead set the smime_is_default variable to yes
 
 # automatically sign all outgoing messages
-# set crypt_autosign
+set crypt_autosign
 # sign only replies to signed messages
-set crypt_replysign
+#set crypt_replysign
 
 # automatically encrypt outgoing messages
-set crypt_autoencrypt=yes
+#set crypt_autoencrypt=yes
 # encrypt only replies to signed messages
 #set crypt_replyencrypt=yes
 # encrypt and sign replies to encrypted messages
diff --git a/tools/firesend b/tools/firesend
deleted file mode 100755
index d4e92ea..0000000
--- a/tools/firesend
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-$HOME/.tools/exec_to_workspace II vimb $@ > /dev/null 2>&1
diff --git a/tools/newtab b/tools/newtab
deleted file mode 100755
index d27c2b8..0000000
--- a/tools/newtab
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-~/.tools/exec_to_workspace 2 firefox -new-tab $1
diff --git a/tools/ratpoisonrc.clipboard b/tools/ratpoisonrc.clipboard
deleted file mode 100644
index 5037886..0000000
--- a/tools/ratpoisonrc.clipboard
+++ /dev/null
@@ -1,57 +0,0 @@
-# Use xcb to build a better cut and paste clipboard.
-#
-# C-t y #   - paste selection buffer # (and sets the current X PRIMARY selection to it)
-# C-t p #   - set selection buffer # using current X PRIMARY selection
-
-# C-t y a   - pop selection (treat buffers as a stack with 1 being the bottom)
-# C-t y q   - pop selection (queue pop)
-# C-t p a   - push selection (treat buffers as a stack with 1 being the bottom)
-
-# C-t y y   - paste selection menu
-# C-t p p   - set selection menu
-
-# C-t p C   - clear all buffers
-
-# change directory to $HOME
-chdir
-
-newkmap clipboard_paste
-newkmap clipboard_set
-exec ~/.tools/clipboard init
-
-bind p readkey clipboard_paste
-bind y readkey clipboard_set
-
-# Menu version of paste and set
-definekey clipboard_paste p exec ~/.tools/clipboard menu_paste
-definekey clipboard_set y exec ~/.tools/clipboard menu_set
-
-# Clear buffers
-definekey clipboard_set C exec ~/.tools/clipboard init
-
-# Push/pop
-definekey clipboard_paste a exec ~/.tools/clipboard pop
-definekey clipboard_set a exec ~/.tools/clipboard push
-# pop queue
-definekey clipboard_paste q exec ~/.tools/clipboard pop_queue
-
-definekey clipboard_paste 1 exec ~/.tools/clipboard paste 1
-definekey clipboard_paste 2 exec ~/.tools/clipboard paste 2
-definekey clipboard_paste 3 exec ~/.tools/clipboard paste 3
-definekey clipboard_paste 4 exec ~/.tools/clipboard paste 4
-definekey clipboard_paste 5 exec ~/.tools/clipboard paste 5
-definekey clipboard_paste 6 exec ~/.tools/clipboard paste 6
-definekey clipboard_paste 7 exec ~/.tools/clipboard paste 7
-definekey clipboard_paste 8 exec ~/.tools/clipboard paste 8
-definekey clipboard_paste 9 exec ~/.tools/clipboard paste 9
-
-definekey clipboard_set 1 exec ~/.tools/clipboard set 1
-definekey clipboard_set 2 exec ~/.tools/clipboard set 2
-definekey clipboard_set 3 exec ~/.tools/clipboard set 3
-definekey clipboard_set 4 exec ~/.tools/clipboard set 4
-definekey clipboard_set 5 exec ~/.tools/clipboard set 5
-definekey clipboard_set 6 exec ~/.tools/clipboard set 6
-definekey clipboard_set 7 exec ~/.tools/clipboard set 7
-definekey clipboard_set 8 exec ~/.tools/clipboard set 8
-definekey clipboard_set 9 exec ~/.tools/clipboard set 9
-