diff --git a/bin/code-to-pdf b/bin/conversion/code-to-pdf
similarity index 100%
rename from bin/code-to-pdf
rename to bin/conversion/code-to-pdf
diff --git a/bin/csvtomd b/bin/conversion/csvtomd
similarity index 100%
rename from bin/csvtomd
rename to bin/conversion/csvtomd
diff --git a/bin/iso-to-game-cube b/bin/conversion/iso-to-game-cube
similarity index 100%
rename from bin/iso-to-game-cube
rename to bin/conversion/iso-to-game-cube
diff --git a/bin/iso-to-wii b/bin/conversion/iso-to-wii
similarity index 100%
rename from bin/iso-to-wii
rename to bin/conversion/iso-to-wii
diff --git a/bin/otf2ttf b/bin/conversion/otf2ttf
similarity index 100%
rename from bin/otf2ttf
rename to bin/conversion/otf2ttf
diff --git a/bin/dmenu/README.md b/bin/dmenu/README.md
new file mode 100644
index 00000000..a5b360d8
--- /dev/null
+++ b/bin/dmenu/README.md
@@ -0,0 +1,5 @@
+# Dmenu Scripts
+
+Most of these scripts should work with dmenu although I have a dmenu symlinked to [rofi](https://github.com/davatorium/rofi) because I haven't yet got around to switching and testing these scripts with proper dmenu.
+
+
diff --git a/bin/dmenu/dmenu b/bin/dmenu/dmenu
new file mode 120000
index 00000000..9e42dbff
--- /dev/null
+++ b/bin/dmenu/dmenu
@@ -0,0 +1 @@
+/usr/bin/rofi
\ No newline at end of file
diff --git a/rofi/scripts/http-status-codes b/bin/dmenu/http-status-codes
similarity index 100%
rename from rofi/scripts/http-status-codes
rename to bin/dmenu/http-status-codes
diff --git a/rofi/scripts/ports-common.csv b/bin/dmenu/ports-common.csv
similarity index 100%
rename from rofi/scripts/ports-common.csv
rename to bin/dmenu/ports-common.csv
diff --git a/rofi/scripts/ports-uncommon.csv b/bin/dmenu/ports-uncommon.csv
similarity index 100%
rename from rofi/scripts/ports-uncommon.csv
rename to bin/dmenu/ports-uncommon.csv
diff --git a/rofi/scripts/rofi-reverse-shells b/bin/dmenu/rofi-reverse-shells
similarity index 56%
rename from rofi/scripts/rofi-reverse-shells
rename to bin/dmenu/rofi-reverse-shells
index 66e1f3b7..385b1987 100755
--- a/rofi/scripts/rofi-reverse-shells
+++ b/bin/dmenu/rofi-reverse-shells
@@ -1,12 +1,12 @@
 #!/usr/bin/env bash
 #
-#   Use rofi to pick a reverse shell
+#   Use dmenu to pick a reverse shell
 #
 #   Requirements:
-#     rofi, xsel, rsg (git@github.com:mthbernardes/rsg.git)
+#     dmenu, xsel
 #
 
-SHELLS='/home/jonathan/GitRepos/rsg/shells.txt'
+SHELLS="$(dirname $0)/shells.txt"
 
 function notify() {
 	if [ "$(command -v notify-send)" ]; then
@@ -41,22 +41,7 @@ function display() {
 	port=$(getPort)
 	reverseShell=$(getReverseShell $ip $port)
 
-
-	#reverseShell=$( echo "$reverseShell" | sed "s/\[IPADDR\]/$ip/g" | sed "s/\[PORT\]/$port/g" )
-	
 	echo -n "$reverseShell" | /usr/bin/xclip -i -selection clipboard
-	#emoji=$(cat "$UNICODE_FILE" | grep -v '^[[:space:]]*$')
-	#line=$(echo "$emoji" | rofi -dmenu -i -p Unicode -kb-custom-1 Ctrl+c $@)
-	#exit_code=$?
-
-	#line=($line)
-
-	#if [ $exit_code == 0 ]; then
-	#	xdotool type --clearmodifiers "${line[0]}"
-	#elif [ $exit_code == 10 ]; then
-	#	echo -n "${line[0]}" | /usr/bin/xclip -i -selection clipboard
-
-	#fi
 }
 
 
diff --git a/rofi/scripts/rofi-shutdown b/bin/dmenu/rofi-shutdown
similarity index 100%
rename from rofi/scripts/rofi-shutdown
rename to bin/dmenu/rofi-shutdown
diff --git a/bin/dmenu/unicode-character-select b/bin/dmenu/unicode-character-select
new file mode 100755
index 00000000..e467a5b2
--- /dev/null
+++ b/bin/dmenu/unicode-character-select
@@ -0,0 +1,52 @@
+#!/usr/bin/env bash
+#
+#   Use rofi to pick emoji because that's what this
+#   century is about apparently...
+#
+#   Requirements:
+#     rofi, xsel, xdotool, curl, xmllint
+#
+#   Usage:
+#     1. Download all emoji
+#        $ rofi-emoji --download
+#
+#     2. Run it!
+#        $ rofi-emoji
+#
+#   Notes:
+#     * You'll need a emoji font like "Noto Emoji" or "EmojiOne".
+#     * Confirming an item will automatically paste it WITHOUT
+#       writing it to your clipboard.
+#     * Ctrl+C will copy it to your clipboard WITHOUT pasting it.
+#
+
+# Where to save the emojis file.
+UNICODE_FILE="$(dirname "$0")/unicode.txt"
+
+
+function notify() {
+	if [ "$(command -v notify-send)" ]; then
+		notify-send "$1" "$2"
+	fi
+}
+
+
+function display() {
+	emoji=$(cat "$UNICODE_FILE" | grep -v '^[[:space:]]*$')
+	line=$(echo "$emoji" | dmenu -i -p Unicode -kb-custom-1 Ctrl+c $@)
+	exit_code=$?
+
+	line=($line)
+
+	if [ $exit_code == 0 ]; then
+		xdotool type --clearmodifiers "${line[0]}"
+	elif [ $exit_code == 10 ]; then
+		echo -n "${line[0]}" | /usr/bin/xclip -i -selection clipboard
+
+	fi
+}
+
+
+
+# display displays :)
+display
diff --git a/rofi/scripts/unicode.txt b/bin/dmenu/unicode.txt
similarity index 100%
rename from rofi/scripts/unicode.txt
rename to bin/dmenu/unicode.txt
diff --git a/bin/changeFontFamily b/bin/fonts/changeFontFamily
similarity index 100%
rename from bin/changeFontFamily
rename to bin/fonts/changeFontFamily
diff --git a/bin/fontFamily b/bin/fonts/fontFamily
similarity index 100%
rename from bin/fontFamily
rename to bin/fonts/fontFamily
diff --git a/bin/fontWeight b/bin/fonts/fontWeight
similarity index 100%
rename from bin/fontWeight
rename to bin/fonts/fontWeight
diff --git a/bin/git-cleaner b/bin/git/git-cleaner
similarity index 100%
rename from bin/git-cleaner
rename to bin/git/git-cleaner
diff --git a/bin/git-delete-submodule b/bin/git/git-delete-submodule
similarity index 100%
rename from bin/git-delete-submodule
rename to bin/git/git-delete-submodule
diff --git a/bin/git-initial-commit b/bin/git/git-initial-commit
similarity index 100%
rename from bin/git-initial-commit
rename to bin/git/git-initial-commit
diff --git a/bin/git-jump b/bin/git/git-jump
similarity index 100%
rename from bin/git-jump
rename to bin/git/git-jump
diff --git a/bin/git-nuke b/bin/git/git-nuke
similarity index 100%
rename from bin/git-nuke
rename to bin/git/git-nuke
diff --git a/bin/git-open b/bin/git/git-open
similarity index 100%
rename from bin/git-open
rename to bin/git/git-open
diff --git a/bin/git-recall b/bin/git/git-recall
similarity index 100%
rename from bin/git-recall
rename to bin/git/git-recall
diff --git a/bin/git-wtf b/bin/git/git-wtf
similarity index 100%
rename from bin/git-wtf
rename to bin/git/git-wtf
diff --git a/i3/i3exit b/bin/i3exit
similarity index 100%
rename from i3/i3exit
rename to bin/i3exit
diff --git a/bin/notifications/datetime b/bin/notifications/datetime
new file mode 100755
index 00000000..92779139
--- /dev/null
+++ b/bin/notifications/datetime
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+notify-send "$(date '+%T')" "$(date '+%A %d %Y')"
diff --git a/bin/search/searchcss b/bin/search/searchcss
new file mode 100755
index 00000000..860e88ce
--- /dev/null
+++ b/bin/search/searchcss
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+
+after=0
+before=0
+search=''
+if [ $# == 0 ]; then
+	echo "Usage: $0 [-A <after>] [-B <before>] query"
+	exit 1
+fi
+while [ $# != 0 ]; do
+	case "$1" in
+		-A)
+			after="$2"
+			shift
+			shift
+			;;
+		-B)
+			before="$2"
+			shift
+			shift
+			;;
+		*)
+			search="$search $1"
+			shift
+			;;
+	esac
+done
+
+grep -r -i -n --color="always" --include=\*.{css,less,scss,sass} --exclude=\*.min.css -A "$after" -B "$before" "$search" .
diff --git a/bin/search/searchhtml b/bin/search/searchhtml
new file mode 100755
index 00000000..e21bc057
--- /dev/null
+++ b/bin/search/searchhtml
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+
+after=0
+before=0
+search=''
+if [ $# == 0 ]; then
+	echo "Usage: $0 [-A <after>] [-B <before>] query"
+	exit 1
+fi
+while [ $# != 0 ]; do
+	case "$1" in
+		-A)
+			after="$2"
+			shift
+			shift
+			;;
+		-B)
+			before="$2"
+			shift
+			shift
+			;;
+		*)
+			search="$search $1"
+			shift
+			;;
+	esac
+done
+
+grep -r -i -n --color="always" --include=\*.{html,htm} -A "$after" -B "$before" "$search" .
diff --git a/bin/search/searchjs b/bin/search/searchjs
new file mode 100755
index 00000000..14e77901
--- /dev/null
+++ b/bin/search/searchjs
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+
+after=0
+before=0
+search=''
+if [ $# == 0 ]; then
+	echo "Usage: $0 [-A <after>] [-B <before>] query"
+	exit 1
+fi
+while [ $# != 0 ]; do
+	case "$1" in
+		-A)
+			after="$2"
+			shift
+			shift
+			;;
+		-B)
+			before="$2"
+			shift
+			shift
+			;;
+		*)
+			search="$search $1"
+			shift
+			;;
+	esac
+done
+
+grep -r -i -n --color="always" --include=\*.{js,es6} --exclude=\*.min.js -A "$after" -B "$before" "$search" .
diff --git a/bin/search/searchphp b/bin/search/searchphp
new file mode 100755
index 00000000..bb2df3f7
--- /dev/null
+++ b/bin/search/searchphp
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+
+after=0
+before=0
+search=''
+if [ $# == 0 ]; then
+	echo "Usage: $0 [-A <after>] [-B <before>] query"
+	exit 1
+fi
+while [ $# != 0 ]; do
+	case "$1" in
+		-A)
+			after="$2"
+			shift
+			shift
+			;;
+		-B)
+			before="$2"
+			shift
+			shift
+			;;
+		*)
+			search="$search $1"
+			shift
+			;;
+	esac
+done
+
+grep -r -i -n --color="always" --include=\*.{php,phtml} -A "$after" -B "$before" "$search" .
diff --git a/bin/where b/bin/search/where
similarity index 100%
rename from bin/where
rename to bin/search/where
diff --git a/bin/whoami b/bin/whoami
new file mode 100755
index 00000000..79bc6d22
--- /dev/null
+++ b/bin/whoami
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+/usr/bin/whoami > /tmp/testing
diff --git a/bin/aquarius-htaccess b/bin/wordpress/aquarius-htaccess
similarity index 100%
rename from bin/aquarius-htaccess
rename to bin/wordpress/aquarius-htaccess
diff --git a/bin/aquarius-plugin b/bin/wordpress/aquarius-plugin
similarity index 100%
rename from bin/aquarius-plugin
rename to bin/wordpress/aquarius-plugin
diff --git a/bin/aquarius-redirects b/bin/wordpress/aquarius-redirects
similarity index 100%
rename from bin/aquarius-redirects
rename to bin/wordpress/aquarius-redirects
diff --git a/bin/aquarius-wpconfig b/bin/wordpress/aquarius-wpconfig
similarity index 100%
rename from bin/aquarius-wpconfig
rename to bin/wordpress/aquarius-wpconfig
diff --git a/bin/wordpress/getthemepath b/bin/wordpress/getthemepath
new file mode 100755
index 00000000..d465fb2b
--- /dev/null
+++ b/bin/wordpress/getthemepath
@@ -0,0 +1,52 @@
+#!/usr/bin/env zsh
+
+# Small script that echos the path of a wordpress theme
+#
+# By default it will echo the path of the active theme. If an argument is given, it will grep the list of themes with the argment and return the path for the first
+#
+# It assumes that the wordpress is in a folder called public_html or public_html/wp. It should be run from inside this directory
+#
+# It can also be run inside a wiki directory if public_html is a sibling of wiki
+#
+# @author jab2870
+# @requires wp
+
+# Gets the public html folder from any sub folder or the wiki folder
+public_html="${${PWD%/public_html*}%/wiki*}/public_html"
+# Checks the public_html directory exists
+if [ -d $public_html ]; then
+
+	# Checks to see if wp is in a subdirectory called wp
+	if [ -d $public_html/wp ]; then
+		wpPath=$public_html/wp;
+	else
+		wpPath=$public_html;
+	fi
+
+	# This assumes the domain for the site. It should be changed according to your setup
+		# It assumes here that the domain is the same as public_html folder with .local.jh appended
+		# This is needed if using a multisite setup
+	domain="$(basename $(dirname $public_html ) ).local.jh"
+
+	# If we have an argument
+	if [ ! -z "$1" ]; then
+		# Try and find the theme containing the argument and return it's path
+		theme=$(dirname $(wp --path="$wpPath" --url="$domain" theme path $(wp --path="$wpPath" --url="$domain" theme list 2> /dev/null | grep "$1" | head -n 1 |  awk '{print $1}') 2> /dev/null ))
+	else
+		# Otherwise, get the active plugin
+		theme=$(dirname $(wp --path="$wpPath" --url="$domain" theme path $(wp --path="$wpPath" --url="$domain" theme list 2> /dev/null | grep "active" | grep -v "inactive" | awk '{print $1}') 2> /dev/null ))
+	fi
+
+	# If we have an answer
+	if [ -d $theme ]; then
+		# Echo it
+		echo $theme
+	else
+		# Otherwise we can fail
+		>&2 echo "cannot find theme"
+		exit 2
+	fi
+else
+	>&2 echo "Cannot find public_html"
+	exit 1
+fi
diff --git a/bin/update3rdPartyPlugins b/bin/wordpress/update3rdPartyPlugins
similarity index 100%
rename from bin/update3rdPartyPlugins
rename to bin/wordpress/update3rdPartyPlugins
diff --git a/bin/updatePlugin b/bin/wordpress/updatePlugin
similarity index 100%
rename from bin/updatePlugin
rename to bin/wordpress/updatePlugin
diff --git a/bin/wpLookup b/bin/wordpress/wpLookup
similarity index 100%
rename from bin/wpLookup
rename to bin/wordpress/wpLookup
diff --git a/bin/wp_urls b/bin/wordpress/wp_urls
similarity index 100%
rename from bin/wp_urls
rename to bin/wordpress/wp_urls
diff --git a/dwm b/dwm
index bdc4d25b..e3594813 160000
--- a/dwm
+++ b/dwm
@@ -1 +1 @@
-Subproject commit bdc4d25b7af384533e17fb47c2acceb7126dfd34
+Subproject commit e3594813917e8b8a162c701162432c9ee24a3551
diff --git a/rofi/scripts/rofi-emoji b/rofi/scripts/rofi-emoji
deleted file mode 100755
index a65c98e1..00000000
--- a/rofi/scripts/rofi-emoji
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/usr/bin/env bash
-#
-#   Use rofi to pick emoji because that's what this
-#   century is about apparently...
-#
-#   Requirements:
-#     rofi, xsel, xdotool, curl, xmllint
-#
-#   Usage:
-#     1. Download all emoji
-#        $ rofi-emoji --download
-#
-#     2. Run it!
-#        $ rofi-emoji
-#
-#   Notes:
-#     * You'll need a emoji font like "Noto Emoji" or "EmojiOne".
-#     * Confirming an item will automatically paste it WITHOUT
-#       writing it to your clipboard.
-#     * Ctrl+C will copy it to your clipboard WITHOUT pasting it.
-#
-
-# Where to save the emojis file.
-UNICODE_FILE="$HOME/.dotfiles/rofi/scripts/unicode.txt"
-
-# Urls of emoji to download.
-# You can remove what you don't need.
-URLS=(
-	'https://emojipedia.org/people/'
-	'https://emojipedia.org/nature/'
-	'https://emojipedia.org/food-drink/'
-	'https://emojipedia.org/activity/'
-	'https://emojipedia.org/travel-places/'
-	'https://emojipedia.org/objects/'
-	'https://emojipedia.org/symbols/'
-	'https://emojipedia.org/flags/'
-)
-
-
-function notify() {
-	if [ "$(command -v notify-send)" ]; then
-		notify-send "$1" "$2"
-	fi
-}
-
-
-function download() {
-	echo "Disabled the download"
-	#notify `basename "$0"` 'Downloading all emoji for your pleasure'
-
-	#echo "" > "$UNICODE_FILE"
-
-	#for url in "${URLS[@]}"; do
-	#	echo "Downloading: $url"
-
-	#	# Download the list of emoji and remove all the junk around it
-	#	emojis=$(curl -s "$url" | \
-	#		xmllint --html \
-	#		--xpath '//ul[@class="emoji-list"]' - 2>/dev/null)
-
-	#	# Get rid of starting/closing ul tags
-	#	emojis=$(echo "$emojis" | head -n -1 | tail -n +1)
-
-	#	# Extract the emoji and its description
-	#	emojis=$(echo "$emojis" | \
-	#		sed -rn 's/.*<span class="emoji">(.*)<\/span> (.*)<\/a><\/li>/\1 \2/p')
-
-	#	echo "$emojis" >> "$UNICODE_FILE"
-	#done
-
-	#notify `basename "$0"` "We're all set!"
-}
-
-
-function display() {
-	emoji=$(cat "$UNICODE_FILE" | grep -v '^[[:space:]]*$')
-	line=$(echo "$emoji" | rofi -dmenu -i -p Unicode -kb-custom-1 Ctrl+c $@)
-	exit_code=$?
-
-	line=($line)
-
-	if [ $exit_code == 0 ]; then
-		xdotool type --clearmodifiers "${line[0]}"
-	elif [ $exit_code == 10 ]; then
-		echo -n "${line[0]}" | /usr/bin/xclip -i -selection clipboard
-
-	fi
-}
-
-
-# Some simple argparsing
-if [[ "$1" =~ -D|--download ]]; then
-	download
-	exit 0
-elif [[ "$1" =~ -h|--help ]]; then
-	echo "usage: $0 [-D|--download]"
-	exit 0
-fi
-
-# Download all emoji if they don't exist yet
-if [ ! -f "$UNICODE_FILE" ]; then
-	download
-fi
-
-# display displays :)
-display
diff --git a/shells/functions b/shells/functions
index 781371b7..1ebee11b 100644
--- a/shells/functions
+++ b/shells/functions
@@ -7,7 +7,7 @@ function big-new-chromium () {
 }
 
 # make xclip work as I would expect. Copy to clipboard if piped data. Paste from otherwise
-function xclip(){
+function clip(){
 if command -v /usr/bin/xclip 1>/dev/null; then
 	if [[ -p /dev/stdin ]] ; then
 		# stdin is a pipe
@@ -113,36 +113,13 @@ function ptheme() {
 	fi
 }
 
-function get_theme() {
-	public_html="${${PWD%/public_html*}%/wiki*}/public_html"
-	if [ -d $public_html ]; then
-		if [ -d $public_html/wp ]; then
-			wpPath=$public_html/wp;
-		else
-			wpPath=$public_html;
-		fi
-		domain="$(basename $(dirname $public_html ) ).local.jh"
-		if [ ! -z "$1" ]; then
-			theme=$(dirname $(wp --path="$wpPath" --url="$domain" theme path $(wp --path="$wpPath" --url="$domain" theme list 2> /dev/null | grep "$1" | head -n 1 |  awk '{print $1}') 2> /dev/null ))
-		else
-			theme=$(dirname $(wp --path="$wpPath" --url="$domain" theme path $(wp --path="$wpPath" --url="$domain" theme list 2> /dev/null | grep "active" | grep -v "inactive" | awk '{print $1}') 2> /dev/null ))
-		fi
-		if [ -d $theme ]; then
-			echo $theme
-		else
-			echo ""
-		fi
-	else
-		echo ""
-	fi
-}
 
 #Takes you to the child theme
 function theme() {
 	if [ ! -z "$1" ]; then
-		ctheme=$(get_theme "$1")
+		ctheme=$(getthemepath "$1" 2> /dev/null)
 	else
-		ctheme=$(get_theme)
+		ctheme=$(getthemepath 2> /dev/null)
 	fi
 	if [ ! -z "$ctheme" ]; then
 		cd $ctheme
@@ -151,7 +128,7 @@ function theme() {
 
 #Takes you to the js folder child theme
 function js() {
-	ctheme=$(get_theme)
+	ctheme=$(getthemepath)
 	if [ ! -z "$ctheme" ]; then
 		cd $ctheme/js
 	fi
@@ -159,7 +136,7 @@ function js() {
 
 #Takes you to the css folder child theme
 function css() {
-	ctheme=$(get_theme)
+	ctheme=$(getthemepath)
 	if [ ! -z "$ctheme" ]; then
 		cd $ctheme/css
 	fi
@@ -210,40 +187,6 @@ function wooTemplates() {
 	fi
 }
 
-#Copies a woo tepmplate file to the theme
-function woocp() {
-	public_html=${PWD%/public_html*}/public_html
-	if [ -d $public_html ]; then
-		if [ -d $public_html/wp ]; then
-			wpPath=$public_html/wp;
-		else
-			wpPath=$public_html;
-		fi
-		woocommerce=$(dirname $(wp --path="$wpPath" plugin path woocommerce))
-		themes=$(dirname $(wp --path="$wpPath" theme path ))
-		if [ -d "$woocommerce" ]; then
-			#If we are here, we know what the woocommerce path is.
-			# If in WOO directory, we want to copy to the theme directory. If we are not in Woo directory, copy to the current directory
-			case $PWD/ in
-				$woocommerce/*)
-					theme=$(get_theme)
-					#if [[ $PWD = $woocommerce/templates
-					;;
-				$themes/*)
-					echo "in themes dir"
-					;;
-				*)
-					echo "soewhere else"
-					;;
-			esac
-		else
-			echo "Can't find woocommerce"
-		fi;
-	else
-		echo " Can't find public_html folder."
-	fi
-}
-
 #Takes you to the theme directory
 function themes() {
 	public_html=${${PWD%/public_html*}%/wiki*}/public_html
@@ -277,58 +220,12 @@ function debugToggle(){
 	fi
 }
 
-########################################
-##                                    ##
-##         Search Functions           ##
-##                                    ##
-########################################
-
-#These search functions use grep to search all sub-folders of the current working directory
-searchjs() {
-	# This will search through .js and .es6 files but won't search minified files
-	grep -r -i -n --color="always" --include=\*.{js,es6} --exclude=\*.min.js "$1" . | tee /tmp/lastSearch
-}
-searchcss() {
-	# This will search through .css and .less files but won't search minified files
-	grep -r -i -n --color="always" --include=\*.{css,less,scss,sass} --exclude=\*.min.css "$1" . | tee /tmp/lastSearch
-}
-searchphp() {
-	grep -r -i -n --color="always" --include=\*.{php,phtml} "$1" . | tee /tmp/lastSearch
-}
-searchhtml() {
-	grep -r -i -n --color="always" --include=\*.{html,htm} "$1" . | tee /tmp/lastSearch
-}
-
-ops() {
-	responce=$(cat /tmp/lastSearch | slmenu -b -l $(tput lines) | sed 's/\x1B\[[0-9;]\+[A-Za-z]//g')
-	echo "responce"
-	file=$(echo "$responce" | awk -F ':' '{print $1}')
-	line=$(echo "$responce" | awk -F ':' '{print $2}')
-	vim +${line} ${file}
+# Adds sub folders in by .bin directory to the PATH if they are not already in it
+function updatePath(){
+	for d in ~/.bin/*/; do
+		if [[ :$PATH: != *:"$d":* ]] ; then
+			PATH+=":$d"
+		fi
+	done
 }
 
-png() {
-    pngcrush -brute "$1"{,.} && du -b "$1"{,.}
-}
-gif() {
-    gifsicle -O "$1" -o "$1." && du -b "$1"{,.}
-}
-jpeg() {
-    jpegtran "$1" > "$1." && du -b "$1"{,.}
-}
-# Just for easy access in history
-mpng() {
-    mv "$1"{.,}
-}
-mgif() {
-    newsize=$(wc -c <"$1.")
-    oldsize=$(wc -c <"$1")
-    if [ $oldsize -gt $newsize ] ; then
-        mv "$1"{.,}
-    else
-        rm "$1."
-    fi  
-}
-mjpeg() {
-    mv "$1"{.,}
-}
diff --git a/shells/profile b/shells/profile
index 8742342d..1ebfa1e7 100644
--- a/shells/profile
+++ b/shells/profile
@@ -12,4 +12,9 @@ GEM_PATH=$GEM_HOME
 export PATH=$PATH:$GEM_HOME/bin
 export GEM_HOME=$(ruby -e 'print Gem.user_dir')
 
+# Adds sub folders in by .bin directory to the PATH
+for d in ~/.bin/*/; do
+    PATH+=":$d"
+done
+
 #echo -e "Please don't sabotage my computer while I'm away \n\nTo turn on the print server, run the command 'cups'" | /usr/bin/cowsay -f tux -W 80
diff --git a/vim b/vim
index 6fc7e108..16d377b8 160000
--- a/vim
+++ b/vim
@@ -1 +1 @@
-Subproject commit 6fc7e108bfbb023fa028db299ec8e4b28e2fbcab
+Subproject commit 16d377b884fc88a352d7ed04be36c4a000f4e8f0
diff --git a/x/xinitrc b/x/xinitrc
index c85053cf..06c6a412 100644
--- a/x/xinitrc
+++ b/x/xinitrc
@@ -5,6 +5,7 @@ xset r rate 200 70
 # Need this for making qt applications use gtk theme ( I think )
 export QT_QPA_PLATFORMTHEME=qt5ct
 export _JAVA_OPTIONS='-Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel -Dswing.crossplatformlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel'
+export _JAVA_AWT_WM_NONREPARENTING=1
 # Use gnome keyring
 killall gnome-keyring-d 2> /dev/null
 export `gnome-keyring-daemon -d`
@@ -13,9 +14,9 @@ export $(gnome-keyring-daemon --start --components=pkcs11,secrets,ssh,gpg)
 dbus-update-activation-environment --systemd DISPLAY
 #exec xrdb .Xresources
 #xbindkeys
-exec i3 -V >> ~/i3log-$(date + '%F-%k-%M-%S') 2>&1
-#while :; do
-#	dwm
-#done;
+#exec i3 -V >> ~/i3log-$(date + '%F-%k-%M-%S') 2>&1
+while :; do
+	dwm
+done;
 #exec sh /home/jonathan/.conky/conky-startup.sh
 #xcape