diff --git a/conkyrc b/conkyrc
new file mode 100755
index 0000000..52fde50
--- /dev/null
+++ b/conkyrc
@@ -0,0 +1,5 @@
+out_to_console yes
+out_to_x no
+update_interval 1
+TEXT
+mpd: ${exec mpc current | awk '{split($0,ar,": "); print ar[1]}'} | cpu: ${cpu cpu0}%:${cpu cpu1}%:${cpu cpu2}%:${cpu cpu3}% | ${if_running openvpn}MALNET${else}GTRI${endif} | time: ${time %F %T %Z}
diff --git a/dmenu/dmenu b/dmenu/dmenu
deleted file mode 100755
index 7941187..0000000
Binary files a/dmenu/dmenu and /dev/null differ
diff --git a/dmenu/dmenu.1 b/dmenu/dmenu.1
deleted file mode 100644
index 383b9cf..0000000
--- a/dmenu/dmenu.1
+++ /dev/null
@@ -1,168 +0,0 @@
-.TH DMENU 1 dmenu\-VERSION
-.SH NAME
-dmenu \- dynamic menu
-.SH SYNOPSIS
-.B dmenu
-.RB [ \-b ]
-.RB [ \-f ]
-.RB [ \-i ]
-.RB [ \-l
-.IR lines ]
-.RB [ \-p
-.IR prompt ]
-.RB [ \-fn
-.IR font ]
-.RB [ \-nb
-.IR color ]
-.RB [ \-nf
-.IR color ]
-.RB [ \-sb
-.IR color ]
-.RB [ \-sf
-.IR color ]
-.RB [ \-v ]
-.P
-.BR dmenu_run " ..."
-.SH DESCRIPTION
-.B dmenu
-is a dynamic menu for X, which reads a list of newline\-separated items from
-stdin.  When the user selects an item and presses Return, their choice is printed
-to stdout and dmenu terminates.  Entering text will narrow the items to those
-matching the tokens in the input.
-.P
-.B dmenu_run
-is a script used by
-.IR dwm (1)
-which lists programs in the user's $PATH and runs the result in their $SHELL.
-.SH OPTIONS
-.TP
-.B \-b
-dmenu appears at the bottom of the screen.
-.TP
-.B \-f
-dmenu grabs the keyboard before reading stdin.  This is faster, but will lock up
-X until stdin reaches end\-of\-file.
-.TP
-.B \-i
-dmenu matches menu items case insensitively.
-.TP
-.BI \-l " lines"
-dmenu lists items vertically, with the given number of lines.
-.TP
-.BI \-p " prompt"
-defines the prompt to be displayed to the left of the input field.
-.TP
-.BI \-fn " font"
-defines the font or font set used. eg. "fixed" or "Monospace-12:normal" (an xft font)
-.TP
-.BI \-nb " color"
-defines the normal background color.
-.IR #RGB ,
-.IR #RRGGBB ,
-and X color names are supported.
-.TP
-.BI \-nf " color"
-defines the normal foreground color.
-.TP
-.BI \-sb " color"
-defines the selected background color.
-.TP
-.BI \-sf " color"
-defines the selected foreground color.
-.TP
-.B \-v
-prints version information to stdout, then exits.
-.SH USAGE
-dmenu is completely controlled by the keyboard.  Items are selected using the
-arrow keys, page up, page down, home, and end.
-.TP
-.B Tab
-Copy the selected item to the input field.
-.TP
-.B Return
-Confirm selection.  Prints the selected item to stdout and exits, returning
-success.
-.TP
-.B Shift\-Return
-Confirm input.  Prints the input text to stdout and exits, returning success.
-.TP
-.B Escape
-Exit without selecting an item, returning failure.
-.TP
-C\-a
-Home
-.TP
-C\-b
-Left
-.TP
-C\-c
-Escape
-.TP
-C\-d
-Delete
-.TP
-C\-e
-End
-.TP
-C\-f
-Right
-.TP
-C\-g
-Escape
-.TP
-C\-h
-Backspace
-.TP
-C\-i
-Tab
-.TP
-C\-j
-Return
-.TP
-C\-J
-Shift-Return
-.TP
-C\-k
-Delete line right
-.TP
-C\-m
-Return
-.TP
-C\-n
-Down
-.TP
-C\-p
-Up
-.TP
-C\-u
-Delete line left
-.TP
-C\-w
-Delete word left
-.TP
-C\-y
-Paste from primary X selection
-.TP
-C\-Y
-Paste from X clipboard
-.TP
-M\-g
-Home
-.TP
-M\-G
-End
-.TP
-M\-h
-Up
-.TP
-M\-j
-Page down
-.TP
-M\-k
-Page up
-.TP
-M\-l
-Down
-.SH SEE ALSO
-.IR dwm (1),
-.IR stest (1)
diff --git a/dmenu/dmenu.o b/dmenu/dmenu.o
deleted file mode 100644
index b64703a..0000000
Binary files a/dmenu/dmenu.o and /dev/null differ
diff --git a/dmenu/dmenu_run b/dmenu/dmenu_run
deleted file mode 100755
index 052e51b..0000000
--- a/dmenu/dmenu_run
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-cachedir=${XDG_CACHE_HOME:-"$HOME/.cache"}
-if [ -d "$cachedir" ]; then
-	cache=$cachedir/dmenu_run
-else
-	cache=$HOME/.dmenu_cache # if no xdg dir, fall back to dotfile in ~
-fi
-(
-	IFS=:
-	if stest -dqr -n "$cache" $PATH; then
-		stest -flx $PATH | sort -u | tee "$cache" | dmenu "$@"
-	else
-		dmenu "$@" < "$cache"
-	fi
-) | ${SHELL:-"/bin/sh"} &
diff --git a/dmenu/draw.o b/dmenu/draw.o
deleted file mode 100644
index d5df116..0000000
Binary files a/dmenu/draw.o and /dev/null differ
diff --git a/dmenu/stest.1 b/dmenu/stest.1
deleted file mode 100644
index bb48f45..0000000
--- a/dmenu/stest.1
+++ /dev/null
@@ -1,87 +0,0 @@
-.TH STEST 1 dmenu\-VERSION
-.SH NAME
-stest \- filter a list of files by properties
-.SH SYNOPSIS
-.B stest
-.RB [ -abcdefghlpqrsuwx ]
-.RB [ -n
-.IR file ]
-.RB [ -o
-.IR file ]
-.RI [ file ...]
-.SH DESCRIPTION
-.B stest
-takes a list of files and filters by the files' properties, analogous to
-.IR test (1).
-Files which pass all tests are printed to stdout. If no files are given, stest
-reads files from stdin.
-.SH OPTIONS
-.TP
-.B \-a
-Test hidden files.
-.TP
-.B \-b
-Test that files are block specials.
-.TP
-.B \-c
-Test that files are character specials.
-.TP
-.B \-d
-Test that files are directories.
-.TP
-.B \-e
-Test that files exist.
-.TP
-.B \-f
-Test that files are regular files.
-.TP
-.B \-g
-Test that files have their set-group-ID flag set.
-.TP
-.B \-h
-Test that files are symbolic links.
-.TP
-.B \-l
-Test the contents of a directory given as an argument.
-.TP
-.BI \-n " file"
-Test that files are newer than
-.IR file .
-.TP
-.BI \-o " file"
-Test that files are older than
-.IR file .
-.TP
-.B \-p
-Test that files are named pipes.
-.TP
-.B \-q
-No files are printed, only the exit status is returned.
-.TP
-.B \-r
-Test that files are readable.
-.TP
-.B \-s
-Test that files are not empty.
-.TP
-.B \-u
-Test that files have their set-user-ID flag set.
-.TP
-.B \-w
-Test that files are writable.
-.TP
-.B \-x
-Test that files are executable.
-.SH EXIT STATUS
-.TP
-.B 0
-At least one file passed all tests.
-.TP
-.B 1
-No files passed all tests.
-.TP
-.B 2
-An error occurred.
-.SH SEE ALSO
-.IR dmenu (1),
-.IR test (1)
diff --git a/dmenu/stest.o b/dmenu/stest.o
deleted file mode 100644
index 20dccb5..0000000
Binary files a/dmenu/stest.o and /dev/null differ