diff --git a/Makefile b/Makefile
index 39d246c..1c5fc35 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,18 @@
 LN_FLAGS = -sfnv
 MKDIR_FLAGS = -pv
 
-home_symlinks = aliases Xresources xbindkeysrc xinitrc offlineimaprc urlview msmtprc mutt zprofile zshrc vimrc vim Xmodmap oh-my-zsh bash_profile tmux.conf
+home_symlinks = aliases Xresources xbindkeysrc xinitrc offlineimaprc urlview msmtprc zprofile zshrc vimrc vim Xmodmap oh-my-zsh bash_profile tmux.conf gitconfig
 
 config_copy = 
 
 config_symlinks = termite dircolors-solarized i3
 
+ssh_symlinks = config
 
-all: 
+gnupg_symlinks = gpg-agent.conf
 
-local_install: aliases Xresources xbindkeysrc xinitrc offlineimaprc urlview msmtprc mutt zprofile zshrc vimrc vim termite dircolors-solarized oh-my-zsh i3
+
+local_install: aliases Xresources xbindkeysrc xinitrc offlineimaprc urlview msmtprc zprofile zshrc vimrc vim termite dircolors-solarized oh-my-zsh i3 gitconfig config gpg-agent.conf
 
 remote_install: vim vimrc dircolors-solarized zshrc aliases oh-my-zsh zprofile tmux.conf
 
@@ -35,3 +37,15 @@ $(config_symlinks):
 	$(eval DESTDIR := $(shell dirname ~/.config/$@))
 	mkdir $(MKDIR_FLAGS) $(DESTDIR)
 	test -e $(CURDIR)/$@ && ln $(LN_FLAGS) $(CURDIR)/$@ ~/.config/$@
+
+.PHONY: $(ssh_symlinks)
+$(ssh_symlinks):
+	$(eval DESTDIR := $(shell dirname ~/.ssh/$@))
+	mkdir $(MKDIR_FLAGS) $(DESTDIR)
+	test -e $(CURDIR)/$@ && ln $(LN_FLAGS) $(CURDIR)/$@ ~/.ssh/$@
+
+.PHONY: $(gnupg_symlinks)
+$(gnupg_symlinks):
+	$(eval DESTDIR := $(shell dirname ~/.gnupg/$@))
+	mkdir $(MKDIR_FLAGS) $(DESTDIR)
+	test -e $(CURDIR)/$@ && ln $(LN_FLAGS) $(CURDIR)/$@ ~/.gnupg/$@
diff --git a/aliases b/aliases
index b15b2a0..aeba6b1 100644
--- a/aliases
+++ b/aliases
@@ -1,4 +1 @@
-alias irc="ssh -6 pew@paul.walko.org"
-alias irc-admin="ssh -6 ubuntu@paul.walko.org"
-alias hackbox="ssh -p2222 -6 paul@cabinet.walko.org"
 alias mutt="~/.mutt/runmutt.sh"
diff --git a/config b/config
new file mode 100644
index 0000000..68588bf
--- /dev/null
+++ b/config
@@ -0,0 +1,5 @@
+#madone
+#cabinet
+#fogcutter
+#bigdummy
+#TODO
diff --git a/gitconfig b/gitconfig
new file mode 100644
index 0000000..36234af
--- /dev/null
+++ b/gitconfig
@@ -0,0 +1,3 @@
+[user]
+    email = paul@walko.org
+    name = Paul Wako
diff --git a/gpg-agent.conf b/gpg-agent.conf
new file mode 100644
index 0000000..31a081a
--- /dev/null
+++ b/gpg-agent.conf
@@ -0,0 +1,3 @@
+max-cache-ttl 0
+default-cache-ttl 0
+enable-ssh-support
diff --git a/i3/config b/i3/config
index 60afeed..56a5a6d 100644
--- a/i3/config
+++ b/i3/config
@@ -156,7 +156,7 @@ bar {
 }
 
 # Custom stats
-new_window 1pixel
+default_border pixel 1
 exec $HOME/.screenlayout/main.sh
 #workspace 1 output DP-0
 #workspace 2 output HDMI-0
diff --git a/mutt/accounts/gmail b/mutt/accounts/gmail
deleted file mode 100644
index 1554460..0000000
--- a/mutt/accounts/gmail
+++ /dev/null
@@ -1,6 +0,0 @@
-set from	    = "paulsw.pw@gmail.com"
-set sendmail	= "/usr/bin/msmtp -a gmail"
-set mbox	    = "+gmail/archive"
-set postponed	= "+gmail/drafts"
-
-color status	red default
diff --git a/mutt/accounts/vt b/mutt/accounts/vt
deleted file mode 100644
index e0f6d7e..0000000
--- a/mutt/accounts/vt
+++ /dev/null
@@ -1,6 +0,0 @@
-set from	= "pwalko@vt.edu"
-set sendmail	= "/usr/bin/msmtp -a vt"
-set mbox	= "+vt/archive"
-set postponed	= "+vt/drafts"
-
-color status	green default
diff --git a/mutt/accounts/vtluug b/mutt/accounts/vtluug
deleted file mode 100644
index fbda76d..0000000
--- a/mutt/accounts/vtluug
+++ /dev/null
@@ -1,7 +0,0 @@
-set from	    = "pew@vtluug.org"
-set imap_user   = pew
-set sendmail	= "/usr/bin/msmtp -a vtluug"
-set mbox	    = "+vtluug/archive"
-set postponed	= "+vtluug/drafts"
-
-color status	red default
diff --git a/mutt/accounts/walko b/mutt/accounts/walko
deleted file mode 100644
index ddb8ae4..0000000
--- a/mutt/accounts/walko
+++ /dev/null
@@ -1,6 +0,0 @@
-set from	= "paul@walko.org"
-set sendmail	= "/usr/bin/msmtp -a walko"
-set mbox	= "+walko/archive"
-set postponed	= "+walko/drafts"
-
-color status	cyan default
diff --git a/mutt/colors b/mutt/colors
deleted file mode 100644
index 4e01c01..0000000
--- a/mutt/colors
+++ /dev/null
@@ -1,161 +0,0 @@
-# Slightly edited solarized theme http://ethanschoonover.com/solarized
-# Colors
-# vim: filetype=muttrc
-
-mono index bold ~N
-mono index bold ~F
-mono index bold ~T
-mono index bold ~D
-#
-# make sure that you are using mutt linked against slang, not ncurses, or
-# suffer the consequences of weird color issues. use "mutt -v" to check this.
-
-# custom body highlights -----------------------------------------------
-# highlight my name and other personally relevant strings
-#color body          color136        color234        "(ethan|schoonover)"
-# custom index highlights ----------------------------------------------
-# messages which mention my name in the body
-#color index         color136        color234        "~b \"phil(_g|\!| gregory| gold)|pgregory\" !~N !~T !~F !~p !~P"
-#color index         J_cream         color230        "~b \"phil(_g|\!| gregory| gold)|pgregory\" ~N !~T !~F !~p !~P"
-#color index         color136        color37         "~b \"phil(_g|\!| gregory| gold)|pgregory\" ~T !~F !~p !~P"
-#color index         color136        J_magent        "~b \"phil(_g|\!| gregory| gold)|pgregory\" ~F !~p !~P"
-## messages which are in reference to my mails
-#color index         J_magent        color234        "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" !~N !~T !~F !~p !~P"
-#color index         J_magent        color230        "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" ~N !~T !~F !~p !~P"
-#color index         J_magent        color37         "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" ~T !~F !~p !~P"
-#color index         J_magent        color160        "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" ~F !~p !~P"
-
-# for background in 16 color terminal, valid background colors include:
-# base03, bg, black, any of the non brights
-
-# basic colors ---------------------------------------------------------
-color normal        color244        color234        
-color error         color160        color234        
-color tilde         color235        color234        
-color message       color37         color234        
-color markers       color160        color254        
-color attachment    color254        color234        
-color search        color61         color234        
-#color status        J_black         J_status        
-color status        color241        color235        
-color indicator     color234        color136        
-color tree          color136        color234                                    # arrow in threads
-
-# basic monocolor screen
-mono  bold          bold
-mono  underline     underline
-mono  indicator     reverse
-mono  error         bold
-
-# index ----------------------------------------------------------------
-
-# color index         color160        color234        "~D(!~p|~p)"                # deleted
-# color index         color235        color234        ~F                          # flagged
-# color index         color166        color234        ~=                          # duplicate messages
-# color index         color240        color234        "~A!~N!~T!~p!~Q!~F!~D!~P"   # the rest
-# color index         J_base          color234        "~A~N!~T!~p!~Q!~F!~D"       # the rest, new
-color index         color160        color234        "~A"                        # all messages
-color index         color166        color234        "~E"                        # expired messages
-color index         color015        color027        "~N"                        # new messages
-color index         color33         color234        "~O"                        # old messages
-color index         color61         color234        "~Q"                        # messages that have been replied to
-color index         color246        color234        "~R"                        # read messages
-color index         color015        color027        "~U"                        # unread messages
-color index         color015        color027        "~U~$"                      # unread, unreferenced messages
-color index         color241        color234        "~v"                        # messages part of a collapsed thread
-color index         color241        color234        "~P"                        # messages from me
-color index         color37         color234        "~p!~F"                     # messages to me
-color index         color015        color027        "~N~p!~F"                   # new messages to me
-color index         color015        color027        "~U~p!~F"                   # unread messages to me
-color index         color246        color234        "~R~p!~F"                   # messages to me
-color index         color160        color235        "~F"                        # flagged messages
-color index         color160        color235        "~F~p"                      # flagged messages to me
-color index         color160        color017        "~N~F"                      # new flagged messages
-color index         color160        color017        "~N~F~p"                    # new flagged messages to me
-color index         color160        color017        "~U~F~p"                    # new flagged messages to me
-color index         color235        color160        "~D"                        # deleted messages
-color index         color245        color234        "~v~(!~N)"                  # collapsed thread with no unread
-color index         color136        color234        "~v~(~N)"                   # collapsed thread with some unread
-color index         color64         color234        "~N~v~(~N)"                 # collapsed thread with unread parent
-# statusbg used to indicated flagged when foreground color shows other status
-# for collapsed thread
-color index         color160        color235        "~v~(~F)!~N"                # collapsed thread with flagged, no unread
-color index         color136        color235        "~v~(~F~N)"                 # collapsed thread with some unread & flagged
-color index         color64         color235        "~N~v~(~F~N)"               # collapsed thread with unread parent & flagged
-color index         color64         color235        "~N~v~(~F)"                 # collapsed thread with unread parent, no unread inside, but some flagged
-color index         color37         color235        "~v~(~p)"                   # collapsed thread with unread parent, no unread inside, some to me directly
-color index         color136        color160        "~v~(~D)"                   # thread with deleted (doesn't differentiate between all or partial)
-#color index         color136        color234        "~(~N)"                    # messages in threads with some unread
-#color index         color64         color234        "~S"                       # superseded messages
-color index         color076        color234        "~T"                       # tagged messages
-color index         color136        color160        "~="                       # duplicated messages
-
-# message headers ------------------------------------------------------
-
-#color header        color240        color234        "^"
-color hdrdefault    color240        color234        
-color header        color241        color234        "^(From)"
-color header        color33         color234        "^(Subject)"
-
-# body -----------------------------------------------------------------
-
-color quoted        color33         color234        
-color quoted1       color37         color234        
-color quoted2       color136        color234        
-color quoted3       color160        color234        
-color quoted4       color166        color234        
-
-color signature     color240        color234        
-color bold          color235        color234        
-color underline     color235        color234        
-color normal        color244        color234        
-#
-color body          color245        color234        "[;:][-o][)/(|]"    # emoticons
-color body          color245        color234        "[;:][)(|]"         # emoticons
-color body          color245        color234        "[*]?((N)?ACK|CU|LOL|SCNR|BRB|BTW|CWYL|\
-                                                     |FWIW|vbg|GD&R|HTH|HTHBE|IMHO|IMNSHO|\
-                                                     |IRL|RTFM|ROTFL|ROFL|YMMV)[*]?"
-color body          color245        color234        "[ ][*][^*]*[*][ ]?" # more emoticon?
-color body          color245        color234        "[ ]?[*][^*]*[*][ ]" # more emoticon?
-
-## pgp
-
-color body          color160        color234        "(BAD signature)"
-color body          color37         color234        "(Good signature)"
-color body          color234        color234        "^gpg: Good signature .*"
-color body          color241        color234        "^gpg: "
-color body          color241        color160        "^gpg: BAD signature from.*"
-mono  body          bold                            "^gpg: Good signature"
-mono  body          bold                            "^gpg: BAD signature from.*"
-
-# yes, an insance URL regex
-color body          color160        color234        "([a-z][a-z0-9+-]*://(((([a-z0-9_.!~*'();:&=+$,-]|%[0-9a-f][0-9a-f])*@)?((([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?|[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+)(:[0-9]+)?)|([a-z0-9_.!~*'()$,;:@&=+-]|%[0-9a-f][0-9a-f])+)(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?(#([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?|(www|ftp)\\.(([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?(:[0-9]+)?(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?(#([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?)[^].,:;!)? \t\r\n<>\"]"
-# and a heavy handed email regex
-#color body          J_magent        color234        "((@(([0-9a-z-]+\\.)*[0-9a-z-]+\\.?|#[0-9]+|\\[[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\]),)*@(([0-9a-z-]+\\.)*[0-9a-z-]+\\.?|#[0-9]+|\\[[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\]):)?[0-9a-z_.+%$-]+@(([0-9a-z-]+\\.)*[0-9a-z-]+\\.?|#[0-9]+|\\[[0-2]?[0-9]?[0-9]\\.[0-2]?[0-9]?[0-9]\\.[0-2]?[0-9]?[0-9]\\.[0-2]?[0-9]?[0-9]\\])"
-
-# Various smilies and the like
-#color body          color230        color234        "<[Gg]>"                            # <g>
-#color body          color230        color234        "<[Bb][Gg]>"                        # <bg>
-#color body          color136        color234        " [;:]-*[})>{(<|]"                  # :-) etc...
-# *bold*
-#color body          color33         color234        "(^|[[:space:][:punct:]])\\*[^*]+\\*([[:space:][:punct:]]|$)"
-#mono  body          bold                            "(^|[[:space:][:punct:]])\\*[^*]+\\*([[:space:][:punct:]]|$)"
-# _underline_
-#color body          color33         color234        "(^|[[:space:][:punct:]])_[^_]+_([[:space:][:punct:]]|$)"
-#mono  body          underline                       "(^|[[:space:][:punct:]])_[^_]+_([[:space:][:punct:]]|$)"
-# /italic/  (Sometimes gets directory names)
-#color body         color33         color234        "(^|[[:space:][:punct:]])/[^/]+/([[:space:][:punct:]]|$)"
-#mono body          underline                       "(^|[[:space:][:punct:]])/[^/]+/([[:space:][:punct:]]|$)"
-
-# Border lines.
-#color body          color33         color234        "( *[-+=#*~_]){6,}"
-
-#folder-hook .                  "color status        J_black         J_status        "
-#folder-hook gmail/inbox        "color status        J_black         color136        "
-#folder-hook gmail/important    "color status        J_black         color136        "
-
-
-## Colour definitions when on a mono screen                                                                                                                               
-mono bold bold
-mono underline underline
-mono indicator reverse
diff --git a/mutt/mailcap b/mutt/mailcap
deleted file mode 100644
index c981380..0000000
--- a/mutt/mailcap
+++ /dev/null
@@ -1,18 +0,0 @@
-# MS Word documents
-application/msword; ~/.mutt/view_attachment.sh %s "-" '/usr/bin/libreoffice'
-
-# Images
-image/jpg; ~/.mutt/view_attachment.sh %s jpg
-image/jpeg; ~/.mutt/view_attachment.sh %s jpg
-image/pjpeg; ~/.mutt/view_attachment.sh %s jpg
-image/png; ~/.mutt/view_attachment.sh %s png
-image/gif; ~/.mutt/view_attachment.sh %s gif
-
-# PDFs
-application/pdf; ~/.mutt/view_attachment.sh %s pdf
-
-# HTML
-text/html; ~/.mutt/view_attachment.sh %s html
-
-# Unidentified files
-application/octet-stream; ~/.mutt/view_attachment.sh %s "-"
diff --git a/mutt/muttrc b/mutt/muttrc
deleted file mode 100644
index 7227f12..0000000
--- a/mutt/muttrc
+++ /dev/null
@@ -1,62 +0,0 @@
-# Compose things
-set realname        = "Paul Walko"
-set sendmail        = "/usr/bin/msmtp"
-set sendmail_wait   = 0
-set editor          = "vim"
-
-# General things
-set folder            = ~/.mail
-set mailcap_path    = ~/.mutt/mailcap
-set tmpdir          = /tmp
-
-set wait_key        = no
-set mbox_type       = Maildir
-set timeout         = 3
-set mail_check      = 0
-unset move
-set delete
-unset confirmappend
-set quit
-source              ~/.mutt/colors
-set crypt_use_gpgme = yes
-
-# Sidebar thigns
-set sidebar_visible = yes
-set sidebar_width   = 14
-bind index <down>   sidebar-next
-bind index <up>     sidebar-prev
-bind index <right>  sidebar-open
-
-# Indexing
-bind index g        noop
-bind index gg       first-entry
-bind index G        last-entry
-bind index R        group-reply
-bind index <tab>    sync-mailbox
-
-# Pager bindings
-bind pager g            noop
-bind pager gg           top
-bind pager G            bottom
-bind pager R            group-reply
-bind attach <return>    view-mailcap
-
-# Macros
-macro pager \Cu "|urlview<enter>" "call urlview to open links"
-
-# Account Settings
-set spoolfile = "+vtluug/INBOX"
-
-mailboxes   +vtluug/INBOX \
-            +vt/INBOX \
-            +walko/INBOX \
-            +vt/A_vtluug \
-            +vt/B_ocvt \
-            +walko/0_updates \
-            +walko/1_social \
-#            +vt/N_misc.cisco \
-            
-folder-hook vt/*        source ~/.mutt/accounts/vt
-folder-hook walko/*     source ~/.mutt/accounts/walko
-#folder-hook gmail/*     source ~/.mutt/accounts/gmail
-folder-hook vtluug/*    source ~/.mutt/accounts/vtluug
diff --git a/mutt/offlineimap.py b/mutt/offlineimap.py
deleted file mode 100644
index 7e9cdb9..0000000
--- a/mutt/offlineimap.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from subprocess import check_output
-import os
-
-def get_pass(mailbox):
-    gpg = [
-        'pass', 'email/{}'.format(mailbox)
-    ]
-    return check_output(gpg).strip()
diff --git a/mutt/passwords/dumb.gpg b/mutt/passwords/dumb.gpg
deleted file mode 100644
index a30b449..0000000
Binary files a/mutt/passwords/dumb.gpg and /dev/null differ
diff --git a/mutt/runmutt.sh b/mutt/runmutt.sh
deleted file mode 100755
index 63b3daa..0000000
--- a/mutt/runmutt.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-export CURR_DIR=`echo $PWD`
-mutt
-cd $CURR_DIR
diff --git a/mutt/view_attachment.sh b/mutt/view_attachment.sh
deleted file mode 100755
index 2d5d38d..0000000
--- a/mutt/view_attachment.sh
+++ /dev/null
@@ -1,127 +0,0 @@
-#!/bin/bash
-#
-# Author:  Eric Gebhart
-#
-# Purpose:  To be called by mutt as indicated by .mailcap to handle mail attachments.
-#
-# Function: Copy the given file to a temporary directory so mutt
-#           Won't delete it before it is read by the application.
-#
-#           Along the way, discern the file type or use the type
-#           That is given.
-#
-#           Finally use 'open' or 'open -a' if the third argument is
-#           given.
-#
-#
-# Arguments:
-#
-#     $1 is the file
-#     $2 is the type - for those times when file magic isn't enough.
-#                      I frequently get html mail that has no extension
-#                      and file can't figure out what it is.
-#
-#                      Set to '-' if you don't want the type to be discerned.
-#                      Many applications can sniff out the type on their own.
-#                      And they do a better job of it too.
-#
-#                      Open Office and MS Office for example.
-#
-#     $3 is open with.  as in open -a 'open with this .app' foo.xls
-#
-# Examples:  These are typical .mailcap entries which use this program.
-#
-#     Image/JPEG; /Users/vdanen/.mutt/view_attachment %s
-#     Image/PNG; /Users/vdanen/.mutt/view_attachment %s
-#     Image/GIF; /Users/vdanen/.mutt/view_attachment %s
-#
-#     Application/PDF; /Users/vdanen/.mutt/view_attachment %s
-#
-#         #This HTML example passes the type because file doesn't always work and
-#         #there aren't always extensions.
-#
-#     text/html; /Users/vdanen/.mutt/view_attachment %s html
-#
-#         # If your Start OpenOffice.org.app is spelled with a space like this one, <--
-#         # then you'll need to precede the space with a \ .  I found that too painful
-#         # and renamed it with an _.
-#
-#     Application/vnd.ms-excel; /Users/vdanen/.mutt/view_attachment %s "-" '/Applications/OpenOffice.org1.1.2/Start_OpenOffice.org.app'
-#     Application/msword; /Users/vdanen/.mutt/view_attachment %s "-" '/Applications/OpenOffice.org1.1.2/Start_OpenOffice.org.app'
-#
-#
-# Debugging:  If you have problems set debug to 'yes'.  That will cause a debug file
-#             be written to /tmp/mutt_attach/debug so you can see what is going on.
-#
-# See Also:  The man pages for open, file, basename
-#
-
-# the tmp directory to use.
-tmpdir="$HOME/Desktop/.tmp/mutt_attach"
-
-# the name of the debug file if debugging is turned on.
-debug_file=$tmpdir/debug
-
-# debug.  yes or no.
-#debug="no"
-debug="yes"
-
-type=$2
-open_with=$3
-
-# make sure the tmpdir exists.
-mkdir -p $tmpdir
-
-# clean it out.  Remove this if you want the directory
-# to accumulate attachment files.
-rm -f $tmpdir/*
-
-# Mutt puts everything in /tmp by default.
-# This gets the basic filename from the full pathname.
-filename=`basename $1`
-
-# get rid of the extenson and save the name for later.
-file=`echo $filename | cut -d"." -f1`
-
-if [ $debug = "yes" ]; then
-    echo "1:" $1 " 2:" $2 " 3:" $3 > $debug_file
-    echo "Filename:"$filename >> $debug_file
-    echo "File:"$file >> $debug_file
-    echo "===========================" >> $debug_file
-fi
-
-# if the type is empty then try to figure it out.
-if [ -z $type ]; then
-    file  $1
-    type=`file -bi $1 | cut -d"/" -f2`
-fi
-
-# if the type is '-' then we don't want to mess with type.
-# Otherwise we are rebuilding the name.  Either from the
-# type that was passed in or from the type we discerned.
-if [ $type = "-" ]; then
-    newfile=$filename
-else
-    newfile=$file.$type
-fi
-
-newfile=$tmpdir/$newfile
-
-# Copy the file to our new spot so mutt can't delete it
-# before the app has a chance to view it.
-cp $1 $newfile
-
-if [ $debug = "yes" ]; then
-    echo "File:" $file "TYPE:" $type >> $debug_file
-    echo "Newfile:" $newfile >> $debug_file
-    echo "Open With:" $open_with >> $debug_file
-fi
-
-# If there's no 'open with' then we can let preview do it's thing.
-# Otherwise we've been told what to use.  So do an open -a.
-
-if [ -z $open_with ]; then
-    xdg-open $newfile
-else
-    xdg-open -a "$open_with" $newfile
-fi
diff --git a/mutt/xdg-utils.txt b/mutt/xdg-utils.txt
deleted file mode 100644
index 2099f11..0000000
--- a/mutt/xdg-utils.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-xdg-utils
-
-xdg-utils provides the official utilities for managing MIME types and default applications according to the #XDG standard. Most importantly, it provides /usr/bin/xdg-open which many applications use to open a file with its default application. It is desktop-environment-independent in the sense that it attempts to use each environment's native default application tool and provides its own mechanism if no known environment is detected. Examples:
-
-# determine a file's MIME type
-$ xdg-mime query filetype photo.jpeg
-image/jpeg
-
-# determine the default application for a MIME type
-$ xdg-mime query default image/jpeg
-gimp.desktop
-
-# change the default application for a MIME type
-$ xdg-mime default feh.desktop image/jpeg
-
-# open a file with its default application
-$ xdg-open photo.jpeg
-
-# shortcut to open all web MIME types with a single application
-$ xdg-settings set default-web-browser firefox.desktop
-
-# shortcut for setting the default application for a URL scheme
-$ xdg-settings set default-url-scheme-handler irc xchat.desktop
-
diff --git a/oh-my-zsh b/oh-my-zsh
index ebda8af..489be24 160000
--- a/oh-my-zsh
+++ b/oh-my-zsh
@@ -1 +1 @@
-Subproject commit ebda8af870acc295388ed187f0139a8bffa83196
+Subproject commit 489be2452a6410a2c7837910c4cd3c0ed47a7481
diff --git a/xbindkeysrc b/xbindkeysrc
index be5f222..c060cdb 100644
--- a/xbindkeysrc
+++ b/xbindkeysrc
@@ -28,5 +28,6 @@
 "chromium --app-id=bikioccmkafdpakkkcpdbppfkghcmihk"
 	XF86Explorer
 
-"i3lock"
-	Super_L
+#"i3lock"
+#	Super_L
+
diff --git a/xinitrc b/xinitrc
index 7340140..b90cf06 100644
--- a/xinitrc
+++ b/xinitrc
@@ -4,7 +4,7 @@
 xsetroot -cursor_name left_ptr
 
 xbindkeys
-xmodmap ~/.Xmodmap
+#xmodmap ~/.Xmodmap
 #nm-applet &
 #discord &
 #slack &
diff --git a/xmonad/.conky_dzen b/xmonad/.conky_dzen
deleted file mode 100644
index bb9d8a2..0000000
--- a/xmonad/.conky_dzen
+++ /dev/null
@@ -1,8 +0,0 @@
-background yes
-out_to_console yes
-out_to_x no
-# Update interval in seconds
-update_interval 1
- 
-TEXT
-^i($HOME/.xmonad/dzen2/cpu.xbm) ^fg(\#FFFFFF)${cpu}% ^i($HOME/.xmonad/dzen2/mem.xbm) ^fg(\#FFFFFF)${memperc}% ^fg(\#ebac54) ${if_existing /proc/net/route eth1} ^i($HOME/.xmonad/dzen2/net_wired.xbm) ^fg(\#00aa4a) ^i($HOME/.xmonad/dzen2/net_down_03.xbm)${downspeed eth1} ^fg(\#ff3333) ^i($HOME/.xmonad/dzen2/net_up_03.xbm)${upspeed eth1} ^fg(\#ebac54) ^i($HOME/.xmonad/dzen2/mpd.xbm) ^fg(\#00ffff)${exec rhythmbox-client --print-playing-format "%aa-%at-%tt" | cut -c-70} ^fg(\#ebac54) ^i($HOME/.xmonad/dzen2/volume.xbm) ^fg(\#00ffff)${exec amixer get Headphone | egrep -o "[0-9]+%" | head -1 | egrep -o "[0-9]*"}% ^fg(\#ebac54) ^i($HOME/.xmonad/dzen2/clock.xbm) ^fg(\#FFFFFF) ${time %m / %d / %Y} ^fg(\#ebac54) ${time %R}
diff --git a/xmonad/dzen2/ac.xbm b/xmonad/dzen2/ac.xbm
deleted file mode 100755
index b6dacef..0000000
--- a/xmonad/dzen2/ac.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define ac_width 8
-#define ac_height 8
-static unsigned char ac_bits[] = {
- 0xFF, 0xF8, 0xF0, 0xF6, 0x6F, 0x0F, 0x1F, 0xFF };
diff --git a/xmonad/dzen2/ac_01.xbm b/xmonad/dzen2/ac_01.xbm
deleted file mode 100755
index 66592d7..0000000
--- a/xmonad/dzen2/ac_01.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define ac_01_width 8
-#define ac_01_height 8
-static unsigned char ac_01_bits[] = {
- 0x30, 0x28, 0xE4, 0x27, 0x27, 0xE4, 0x28, 0x30 };
diff --git a/xmonad/dzen2/alert.xbm b/xmonad/dzen2/alert.xbm
deleted file mode 100644
index 8211008..0000000
--- a/xmonad/dzen2/alert.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define alert_width 16
-#define alert_height 16
-static unsigned char alert_bits[] = {
-   0xff, 0xff, 0x01, 0xf8, 0xf1, 0xf9, 0xe1, 0xc1, 0xe1, 0xc1, 0xe1, 0xc1,
-   0xe1, 0xc1, 0xe1, 0xc1, 0xe1, 0xc1, 0xe1, 0xc1, 0x01, 0xc0, 0xe1, 0xc1,
-   0xe1, 0xc1, 0x01, 0xc0, 0xff, 0xff, 0xff, 0xff};
diff --git a/xmonad/dzen2/arch.xbm b/xmonad/dzen2/arch.xbm
deleted file mode 100755
index 11cfe5a..0000000
--- a/xmonad/dzen2/arch.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define arch_width 8
-#define arch_height 8
-static unsigned char arch_bits[] = {
- 0x08, 0x08, 0x1C, 0x1C, 0x36, 0x22, 0x77, 0x41 };
diff --git a/xmonad/dzen2/arch_10x10.xbm b/xmonad/dzen2/arch_10x10.xbm
deleted file mode 100755
index c3ee46d..0000000
--- a/xmonad/dzen2/arch_10x10.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define arch_10x10_width 10
-#define arch_10x10_height 10
-static unsigned char arch_10x10_bits[] = {
- 0x10, 0x00, 0x10, 0x00, 0x38, 0x00, 0x38, 0x00, 0x7C, 0x00, 0x7C, 0x00,
- 0xEE, 0x00, 0xC6, 0x00, 0xC7, 0x01, 0x01, 0x01 };
diff --git a/xmonad/dzen2/arr_down.xbm b/xmonad/dzen2/arr_down.xbm
deleted file mode 100644
index 0379d29..0000000
--- a/xmonad/dzen2/arr_down.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define arr_down_width 12
-#define arr_down_height 12
-static unsigned char arr_down_bits[] = {
-   0x00, 0x00, 0xe0, 0x00, 0xe0, 0x00, 0xe0, 0x00, 0xe0, 0x00, 0xe0, 0x00,
-   0xe0, 0x00, 0xf8, 0x03, 0xf0, 0x01, 0xe0, 0x00, 0x40, 0x00, 0x00, 0x00};
diff --git a/xmonad/dzen2/arr_up.xbm b/xmonad/dzen2/arr_up.xbm
deleted file mode 100644
index f8fd718..0000000
--- a/xmonad/dzen2/arr_up.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define arr_up_width 12
-#define arr_up_height 12
-static unsigned char arr_up_bits[] = {
-   0x00, 0x00, 0x40, 0x00, 0xe0, 0x00, 0xf0, 0x01, 0xf8, 0x03, 0xe0, 0x00,
-   0xe0, 0x00, 0xe0, 0x00, 0xe0, 0x00, 0xe0, 0x00, 0xe0, 0x00, 0x00, 0x00};
diff --git a/xmonad/dzen2/ball.xbm b/xmonad/dzen2/ball.xbm
deleted file mode 100644
index 14737cf..0000000
--- a/xmonad/dzen2/ball.xbm
+++ /dev/null
@@ -1,8 +0,0 @@
-#define ball_width 19
-#define ball_height 19
-static unsigned char ball_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x0f, 0x00, 0xe0, 0x3f, 0x00,
-  0xf0, 0x7f, 0x00, 0x78, 0xfc, 0x00, 0x38, 0xf8, 0x00, 0x7c, 0xfe, 0x01,
-  0xfc, 0xff, 0x01, 0xfc, 0xff, 0x01, 0xfc, 0xff, 0x01, 0xfc, 0xff, 0x01,
-  0xf8, 0xff, 0x00, 0xf8, 0xff, 0x00, 0xf0, 0x7f, 0x00, 0xe0, 0x3f, 0x00,
-  0x80, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
diff --git a/xmonad/dzen2/bat_empty_01.xbm b/xmonad/dzen2/bat_empty_01.xbm
deleted file mode 100755
index cb916db..0000000
--- a/xmonad/dzen2/bat_empty_01.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define bat_empty_01_width 8
-#define bat_empty_01_height 8
-static unsigned char bat_empty_01_bits[] = {
- 0x18, 0x7E, 0x42, 0x42, 0x42, 0x42, 0x42, 0x7E };
diff --git a/xmonad/dzen2/bat_empty_02.xbm b/xmonad/dzen2/bat_empty_02.xbm
deleted file mode 100755
index e26be8c..0000000
--- a/xmonad/dzen2/bat_empty_02.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define bat_empty_02_width 8
-#define bat_empty_02_height 8
-static unsigned char bat_empty_02_bits[] = {
- 0x00, 0x7F, 0x41, 0xC1, 0xC1, 0x41, 0x7F, 0x00 };
diff --git a/xmonad/dzen2/bat_full_01.xbm b/xmonad/dzen2/bat_full_01.xbm
deleted file mode 100755
index 701149e..0000000
--- a/xmonad/dzen2/bat_full_01.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define bat_full_width 8
-#define bat_full_height 8
-static unsigned char bat_full_bits[] = {
- 0x18, 0x7E, 0x42, 0x5A, 0x5A, 0x5A, 0x42, 0x7E };
diff --git a/xmonad/dzen2/bat_full_02.xbm b/xmonad/dzen2/bat_full_02.xbm
deleted file mode 100755
index 93d2327..0000000
--- a/xmonad/dzen2/bat_full_02.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define bat_full_02_width 8
-#define bat_full_02_height 8
-static unsigned char bat_full_02_bits[] = {
- 0x00, 0x7F, 0x41, 0xDD, 0xDD, 0x41, 0x7F, 0x00 };
diff --git a/xmonad/dzen2/bat_low_01.xbm b/xmonad/dzen2/bat_low_01.xbm
deleted file mode 100755
index 29e974d..0000000
--- a/xmonad/dzen2/bat_low_01.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define bat_low_01_width 8
-#define bat_low_01_height 8
-static unsigned char bat_low_01_bits[] = {
- 0x18, 0x7E, 0x42, 0x42, 0x42, 0x5A, 0x42, 0x7E };
diff --git a/xmonad/dzen2/bat_low_02.xbm b/xmonad/dzen2/bat_low_02.xbm
deleted file mode 100755
index d80a464..0000000
--- a/xmonad/dzen2/bat_low_02.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define bat_low_02_width 8
-#define bat_low_02_height 8
-static unsigned char bat_low_02_bits[] = {
- 0x00, 0x7F, 0x41, 0xC5, 0xC5, 0x41, 0x7F, 0x00 };
diff --git a/xmonad/dzen2/battery.xbm b/xmonad/dzen2/battery.xbm
deleted file mode 100644
index ca37847..0000000
--- a/xmonad/dzen2/battery.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define battery_width 16
-#define battery_height 16
-static unsigned char battery_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x1f, 0xfc, 0x11,
-   0xfc, 0x71, 0xfc, 0x71, 0xfc, 0x71, 0xfc, 0x11, 0xfc, 0x1f, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
diff --git a/xmonad/dzen2/bluetooth.xbm b/xmonad/dzen2/bluetooth.xbm
deleted file mode 100755
index 3cc42d5..0000000
--- a/xmonad/dzen2/bluetooth.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define bluetooth_width 8
-#define bluetooth_height 8
-static unsigned char bluetooth_bits[] = {
- 0x18, 0x2A, 0x6C, 0x38, 0x38, 0x6C, 0x2A, 0x18 };
diff --git a/xmonad/dzen2/bug_01.xbm b/xmonad/dzen2/bug_01.xbm
deleted file mode 100755
index 8974034..0000000
--- a/xmonad/dzen2/bug_01.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define bug_width 8
-#define bug_height 8
-static unsigned char bug_bits[] = {
- 0xC3, 0x24, 0x18, 0xDB, 0x3C, 0x7E, 0xBD, 0x99 };
diff --git a/xmonad/dzen2/bug_02.xbm b/xmonad/dzen2/bug_02.xbm
deleted file mode 100755
index 051f2f5..0000000
--- a/xmonad/dzen2/bug_02.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define bug_02_width 8
-#define bug_02_height 8
-static unsigned char bug_02_bits[] = {
- 0xC3, 0x24, 0x24, 0xDB, 0x3C, 0x7E, 0x99, 0x42 };
diff --git a/xmonad/dzen2/cat.xbm b/xmonad/dzen2/cat.xbm
deleted file mode 100755
index d0bc6ab..0000000
--- a/xmonad/dzen2/cat.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define cat_width 8
-#define cat_height 8
-static unsigned char cat_bits[] = {
- 0x81, 0xC3, 0xBD, 0xFF, 0x99, 0xFF, 0x7E, 0xBD };
diff --git a/xmonad/dzen2/clock.xbm b/xmonad/dzen2/clock.xbm
deleted file mode 100755
index cd2fad2..0000000
--- a/xmonad/dzen2/clock.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define clock_width 8
-#define clock_height 8
-static unsigned char clock_bits[] = {
- 0x3C, 0x5E, 0xEF, 0xF7, 0x87, 0xFF, 0x7E, 0x3C };
diff --git a/xmonad/dzen2/cpu.xbm b/xmonad/dzen2/cpu.xbm
deleted file mode 100644
index 1b2768d..0000000
--- a/xmonad/dzen2/cpu.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define load_cpu_width 16
-#define load_cpu_height 16
-static unsigned char load_cpu_bits[] = {
-   0x00, 0x00, 0x48, 0x12, 0x48, 0x12, 0xfc, 0x3f, 0xfc, 0x3f, 0xfe, 0x7f,
-   0x1c, 0x38, 0x1c, 0x38, 0x1e, 0x78, 0x1c, 0x38, 0xfc, 0x3f, 0xfe, 0x7f,
-   0xfc, 0x3f, 0x48, 0x12, 0x48, 0x12, 0x00, 0x00 };
diff --git a/xmonad/dzen2/cpu.xpm b/xmonad/dzen2/cpu.xpm
deleted file mode 100644
index d93d0ec..0000000
--- a/xmonad/dzen2/cpu.xpm
+++ /dev/null
@@ -1,181 +0,0 @@
-/* XPM */
-static char *cpu[] = {
-/* columns rows colors chars-per-pixel */
-"24 24 151 2",
-"   c black",
-".  c #010101",
-"X  c #313527",
-"o  c #323527",
-"O  c #323627",
-"+  c #333728",
-"@  c #343829",
-"#  c #35392A",
-"$  c #383C2D",
-"%  c #393D2E",
-"&  c #393D2F",
-"*  c #3A3E30",
-"=  c #3B3F31",
-"-  c #3B402C",
-";  c #3C422D",
-":  c #3C4032",
-">  c #3D4032",
-",  c #3D4132",
-"<  c #3E4234",
-"1  c #3F4530",
-"2  c #404630",
-"3  c #434932",
-"4  c #434A33",
-"5  c #444A33",
-"6  c #454C34",
-"7  c #464C35",
-"8  c #464D35",
-"9  c #474E36",
-"0  c #4E553C",
-"q  c #4F563E",
-"w  c #51573F",
-"e  c #525A3E",
-"r  c #535B3F",
-"t  c #545C40",
-"y  c #565F42",
-"u  c #585E47",
-"i  c #586143",
-"p  c #596244",
-"a  c #5A6344",
-"s  c #5B6445",
-"d  c #5D6647",
-"f  c #5A614A",
-"g  c #5D634D",
-"h  c #5F6848",
-"j  c #606A49",
-"k  c #616A49",
-"l  c #616B4A",
-"z  c #636D4B",
-"x  c #646D4C",
-"c  c #656F4D",
-"v  c #626853",
-"b  c #696F5A",
-"n  c #696F5B",
-"m  c #66704D",
-"M  c #67714E",
-"N  c #68724F",
-"B  c #68734F",
-"V  c #697450",
-"C  c #6A7450",
-"Z  c #6B7551",
-"A  c #6B7651",
-"S  c #6C7652",
-"D  c #6C7653",
-"F  c #6C7752",
-"G  c #6D7752",
-"H  c #6D7853",
-"J  c #6E7953",
-"K  c #6E7954",
-"L  c #6F7A54",
-"P  c #6F7A55",
-"I  c #707B55",
-"U  c #707B56",
-"Y  c #727D57",
-"T  c #727D58",
-"R  c #737E59",
-"E  c #747E5A",
-"W  c #747F5A",
-"Q  c #757F5B",
-"!  c #757F5D",
-"~  c #6E7460",
-"^  c #737966",
-"/  c #797E6C",
-"(  c #7A7F6D",
-")  c #76805C",
-"_  c #77815D",
-"`  c #77825E",
-"'  c #78835F",
-"]  c #798360",
-"[  c #7A8461",
-"{  c #7C8663",
-"}  c #7C8664",
-"|  c #7D8765",
-" . c #7E8765",
-".. c #7A806D",
-"X. c #7B806E",
-"o. c #7C816F",
-"O. c #7D8270",
-"+. c #808A68",
-"@. c #808A69",
-"#. c #818B69",
-"$. c #828C6B",
-"%. c #838C6B",
-"&. c #848D6D",
-"*. c #858E6E",
-"=. c #808574",
-"-. c #838877",
-";. c #869070",
-":. c #879071",
-">. c #8A9375",
-",. c #8C9577",
-"<. c #8D9577",
-"1. c #90997B",
-"2. c #929B7E",
-"3. c #95948A",
-"4. c #95958C",
-"5. c #979F84",
-"6. c #A2A198",
-"7. c #ADADA3",
-"8. c #BDBDB6",
-"9. c #D7D19A",
-"0. c #D9D39C",
-"q. c #DAD39C",
-"w. c #DBD49D",
-"e. c #DDD69E",
-"r. c #DED79F",
-"t. c #C4C3BA",
-"y. c #C5C5BC",
-"u. c #E2DCA2",
-"i. c #E4DDA4",
-"p. c #E5DEA4",
-"a. c #E7E0A6",
-"s. c #E8E1A6",
-"d. c #E9E2A7",
-"f. c #E9E2A8",
-"g. c #EBE4A8",
-"h. c #EAE4AB",
-"j. c #EBE4AC",
-"k. c #ECE5A9",
-"l. c #EDE6AA",
-"z. c #EDE6AD",
-"x. c #EEE7B0",
-"c. c #C9C8C0",
-"v. c #CCCBC3",
-"b. c #D0D0C7",
-"n. c #D6D5CE",
-"m. c #DEDED7",
-"M. c #E0DFDA",
-"N. c #E0DFDC",
-"B. c #E0E0DC",
-"V. c #E1E0DC",
-"C. c None",
-/* pixels */
-"C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.",
-"C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.",
-"C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.",
-"C.C.C.C.                        C.C.C.C.C.C.C.C.",
-"C.C.C.C.  ! j._ j._ j.W j.W j.  C.C.C.C.C.C.C.C.",
-"C.C.C.C.  F p.F p.F s.Z i.J l.  C.C.C.C.C.C.C.C.",
-"C.C.C.  + O # & , * , * # O # O   C.C.C.C.C.C.C.",
-"      + ..-...=.( ^ n b b g f w +       C.C.C.C.",
-"  z.s.# ..5.2.>.>.&.:.%.] Y F 9 O e.l.  C.C.C.C.",
-"  _ J % O.1.*.} @.@._ T L J N 8 O N L   C.C.C.C.",
-"  h.f.& ..<.&.| B.B.M.b.L Z k 4 O 9.l.  C.C.C.C.",
-"  _ P , O.<. .} N.n.v.t.F F s 8 O N J   C.C.C.C.",
-"  j.s., ( ;._ [ m.c.y.6.Z m a 8 O e.f.  C.C.C.C.",
-"  ' Y < ~ @.[ T 8.7.4.3.z h a 8 + m L   C.C.C.C.",
-"  x.f.& v | T L L L L c h y r 8 O 9.l.  C.C.C.C.",
-"  _ Z + u _ L Z x k h t t r r 8 O c L   C.C.C.C.",
-"      + w 0 8 4 1 - - - 1 4 5 8 O       C.C.C.C.",
-"C.C.C.  + O O O + + + O O + + +   C.C.C.C.C.C.C.",
-"C.C.C.C.  M e.m 9.m 9.z 9.N 0.  C.C.C.C.C.C.C.C.",
-"C.C.C.C.  Y l.L l.Y l.Y l.L l.  C.C.C.C.C.C.C.C.",
-"C.C.C.C.                        C.C.C.C.C.C.C.C.",
-"C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.",
-"C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.",
-"C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C."
-};
diff --git a/xmonad/dzen2/dish.xbm b/xmonad/dzen2/dish.xbm
deleted file mode 100755
index 75e9f88..0000000
--- a/xmonad/dzen2/dish.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define dish_width 8
-#define dish_height 8
-static unsigned char dish_bits[] = {
- 0x81, 0x7B, 0x46, 0x4E, 0x5C, 0x3E, 0x77, 0xC3 };
diff --git a/xmonad/dzen2/diskette.xbm b/xmonad/dzen2/diskette.xbm
deleted file mode 100755
index 48e641b..0000000
--- a/xmonad/dzen2/diskette.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define diskette_width 8
-#define diskette_height 8
-static unsigned char diskette_bits[] = {
- 0xFF, 0x81, 0x81, 0x81, 0xBD, 0xB5, 0xB5, 0xFE };
diff --git a/xmonad/dzen2/empty.xbm b/xmonad/dzen2/empty.xbm
deleted file mode 100755
index 1086137..0000000
--- a/xmonad/dzen2/empty.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define empty_width 8
-#define empty_height 8
-static unsigned char empty_bits[] = {
- 0x3C, 0x42, 0x81, 0x81, 0x81, 0x81, 0x42, 0x3C };
diff --git a/xmonad/dzen2/envelope.xbm b/xmonad/dzen2/envelope.xbm
deleted file mode 100644
index c86e234..0000000
--- a/xmonad/dzen2/envelope.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define envelope_width 11
-#define envelope_height 11
-static unsigned char envelope_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0xfe, 0x03, 0x06, 0x03, 0x8a, 0x02, 0x72, 0x02,
-   0x22, 0x02, 0x02, 0x02, 0xfe, 0x03, 0x00, 0x00, 0x00, 0x00};
diff --git a/xmonad/dzen2/eye_l.xbm b/xmonad/dzen2/eye_l.xbm
deleted file mode 100755
index 3de8e26..0000000
--- a/xmonad/dzen2/eye_l.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define eye_l_width 8
-#define eye_l_height 8
-static unsigned char eye_l_bits[] = {
- 0x00, 0x00, 0x1B, 0x02, 0x02, 0x84, 0xF9, 0x02 };
diff --git a/xmonad/dzen2/eye_r.xbm b/xmonad/dzen2/eye_r.xbm
deleted file mode 100755
index 7a04951..0000000
--- a/xmonad/dzen2/eye_r.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define eye_r_width 8
-#define eye_r_height 8
-static unsigned char eye_r_bits[] = {
- 0x00, 0x00, 0xD8, 0x40, 0x40, 0x21, 0x9F, 0x40 };
diff --git a/xmonad/dzen2/fox.xbm b/xmonad/dzen2/fox.xbm
deleted file mode 100755
index 46735c3..0000000
--- a/xmonad/dzen2/fox.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define fox_width 8
-#define fox_height 8
-static unsigned char fox_bits[] = {
- 0x81, 0xC3, 0xBD, 0xFF, 0x99, 0xDB, 0x7E, 0x18 };
diff --git a/xmonad/dzen2/fs_01.xbm b/xmonad/dzen2/fs_01.xbm
deleted file mode 100755
index 1d012d2..0000000
--- a/xmonad/dzen2/fs_01.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define fs_01_width 8
-#define fs_01_height 8
-static unsigned char fs_01_bits[] = {
- 0x46, 0x99, 0xBC, 0x66, 0x66, 0x3D, 0x99, 0x62 };
diff --git a/xmonad/dzen2/fs_02.xbm b/xmonad/dzen2/fs_02.xbm
deleted file mode 100755
index 603e3a7..0000000
--- a/xmonad/dzen2/fs_02.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define fs_02_width 8
-#define fs_02_height 8
-static unsigned char fs_02_bits[] = {
- 0xF1, 0x5B, 0x3D, 0x67, 0xE6, 0xBC, 0xDA, 0x8F };
diff --git a/xmonad/dzen2/full.xbm b/xmonad/dzen2/full.xbm
deleted file mode 100755
index 1c97fde..0000000
--- a/xmonad/dzen2/full.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define full_width 12
-#define full_height 12
-static unsigned char full_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0xfc, 0x03, 0xfc, 0x03, 0x04, 0x02, 0x04, 0x02,
-   0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0xfc, 0x03, 0x00, 0x00};
diff --git a/xmonad/dzen2/fwd.xbm b/xmonad/dzen2/fwd.xbm
deleted file mode 100755
index 3f52ea9..0000000
--- a/xmonad/dzen2/fwd.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define fwd_width 8
-#define fwd_height 8
-static unsigned char fwd_bits[] = {
- 0x00, 0x12, 0x36, 0x7E, 0x7E, 0x36, 0x12, 0x00 };
diff --git a/xmonad/dzen2/half.xbm b/xmonad/dzen2/half.xbm
deleted file mode 100755
index 874323b..0000000
--- a/xmonad/dzen2/half.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define half_width 8
-#define half_height 8
-static unsigned char half_bits[] = {
- 0x3C, 0x4E, 0x8F, 0x8F, 0x8F, 0x8F, 0x4E, 0x3C };
diff --git a/xmonad/dzen2/has_win.xbm b/xmonad/dzen2/has_win.xbm
deleted file mode 100644
index 79d17e8..0000000
--- a/xmonad/dzen2/has_win.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define has_win_width 6
-#define has_win_height 11
-static unsigned char has_win_bits[] = {
-   0x1f, 0x1f, 0x1f, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
diff --git a/xmonad/dzen2/has_win_nv.xbm b/xmonad/dzen2/has_win_nv.xbm
deleted file mode 100644
index 77fde98..0000000
--- a/xmonad/dzen2/has_win_nv.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define has_win_nv_width 6
-#define has_win_nv_height 11
-static unsigned char has_win_nv_bits[] = {
-   0x1f, 0x11, 0x11, 0x11, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
diff --git a/xmonad/dzen2/info_01.xbm b/xmonad/dzen2/info_01.xbm
deleted file mode 100755
index f08c2fd..0000000
--- a/xmonad/dzen2/info_01.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define info_01_width 8
-#define info_01_height 8
-static unsigned char info_01_bits[] = {
- 0x3C, 0x66, 0xFF, 0xE7, 0xE7, 0xE7, 0x66, 0x3C };
diff --git a/xmonad/dzen2/info_02.xbm b/xmonad/dzen2/info_02.xbm
deleted file mode 100755
index 00b4df0..0000000
--- a/xmonad/dzen2/info_02.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define info_02_width 8
-#define info_02_height 8
-static unsigned char info_02_bits[] = {
- 0xFF, 0xE7, 0xFF, 0xE7, 0xE7, 0xE7, 0xE7, 0xFF };
diff --git a/xmonad/dzen2/info_03.xbm b/xmonad/dzen2/info_03.xbm
deleted file mode 100755
index 50103f8..0000000
--- a/xmonad/dzen2/info_03.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define info_width 8
-#define info_height 8
-static unsigned char info_bits[] = {
- 0x38, 0x38, 0x00, 0x3C, 0x38, 0x38, 0x38, 0x7C };
diff --git a/xmonad/dzen2/kalarm.xpm b/xmonad/dzen2/kalarm.xpm
deleted file mode 100644
index 0b1e629..0000000
--- a/xmonad/dzen2/kalarm.xpm
+++ /dev/null
@@ -1,276 +0,0 @@
-/* XPM */
-static char *kalarm[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 238 2",
-"   c black",
-".  c gray20",
-"X  c #3D3D3D",
-"o  c gray25",
-"O  c #555555",
-"+  c gray35",
-"@  c #646464",
-"#  c #7C7C7C",
-"$  c #8D3800",
-"%  c #953F00",
-"&  c #954300",
-"*  c #96470D",
-"=  c #9B4400",
-"-  c #9D4F09",
-";  c #974A12",
-":  c #9D520C",
-">  c #9E6538",
-",  c #A34C00",
-"<  c #A25202",
-"1  c #AB5200",
-"2  c #A85900",
-"3  c #AD5D09",
-"4  c #A45D18",
-"5  c #AA5810",
-"6  c #B05600",
-"7  c #B45B00",
-"8  c #BB5E00",
-"9  c #B15F10",
-"0  c #A06000",
-"q  c #AC6C00",
-"w  c #AE7400",
-"e  c #B26007",
-"r  c #B1630B",
-"t  c #B76F0E",
-"y  c #BB6300",
-"u  c #BA670B",
-"i  c #BE6806",
-"p  c #B86C0E",
-"a  c #B17600",
-"s  c #B17800",
-"d  c #B87200",
-"f  c #BE7904",
-"g  c #B2711C",
-"h  c #BE7B13",
-"j  c #BF7D18",
-"k  c #AF6820",
-"l  c #A56434",
-"z  c #B2712B",
-"x  c #B87E2C",
-"c  c #B57D3B",
-"v  c #BC7730",
-"b  c #996A4A",
-"n  c #B67B4E",
-"m  c #C36500",
-"M  c #C26801",
-"N  c #C46E08",
-"B  c #CB6C00",
-"V  c #C67205",
-"C  c #C57A00",
-"Z  c #CC7200",
-"A  c #C9730A",
-"S  c #CD7D0A",
-"D  c #D27400",
-"F  c #D47B02",
-"G  c #D17A0B",
-"H  c #DB7600",
-"J  c #E47D00",
-"K  c #B88300",
-"L  c #BC801F",
-"P  c #BB9500",
-"I  c #BF892A",
-"U  c #9F806B",
-"Y  c #B88040",
-"T  c #B78767",
-"R  c #BA8962",
-"E  c #BD9273",
-"W  c #CD8302",
-"Q  c #C78419",
-"!  c #CD8514",
-"~  c #C88519",
-"^  c #CA881A",
-"/  c #C69C00",
-"(  c #D38402",
-")  c #D4830A",
-"_  c #D48C01",
-"`  c #DB8302",
-"'  c #D18612",
-"]  c #D48C14",
-"[  c #D08F1A",
-"{  c #DB8B11",
-"}  c #D59700",
-"|  c #D99202",
-" . c #D99B00",
-".. c #DE9312",
-"X. c #DF941C",
-"o. c #C78327",
-"O. c #C5842E",
-"+. c #C88436",
-"@. c #CE8837",
-"#. c #CD9423",
-"$. c #CD9A2A",
-"%. c #DC9E20",
-"&. c #D7953C",
-"*. c #CCAA00",
-"=. c #CDB700",
-"-. c #DEAE00",
-";. c #D5B200",
-":. c #D9B600",
-">. c #D4AB37",
-",. c #DDAE30",
-"<. c #E18500",
-"1. c #E58B01",
-"2. c #EB990B",
-"3. c #E19D1B",
-"4. c #E89F16",
-"5. c #F19600",
-"6. c #F39A02",
-"7. c #FB9200",
-"8. c #FA9B00",
-"9. c #E0AC00",
-"0. c #E4A21D",
-"q. c #EBA81D",
-"w. c #E0BE00",
-"e. c #F1AE00",
-"r. c #FEA200",
-"t. c #F8A60B",
-"y. c #FFAA01",
-"u. c #FFAD0C",
-"i. c #FFB300",
-"p. c #FDB314",
-"a. c #FEBA1B",
-"s. c #E1A322",
-"d. c #E3AD2C",
-"f. c #E5B42F",
-"g. c #ECB62C",
-"h. c #E7B138",
-"j. c #E5BF3B",
-"k. c #EABC34",
-"l. c #FFBF20",
-"z. c #C69642",
-"x. c #C99052",
-"c. c #C69960",
-"v. c #C79F7C",
-"b. c #DFA24A",
-"n. c #DBA050",
-"m. c #DBBA66",
-"M. c #E2A549",
-"N. c #E8B343",
-"B. c #D5C400",
-"V. c #DBC100",
-"C. c #D8D200",
-"Z. c #DBDB00",
-"A. c #E4D300",
-"S. c #F6CB00",
-"D. c #FFC500",
-"F. c #FECA00",
-"G. c #FFC119",
-"H. c #FFCD11",
-"J. c #FFDC00",
-"K. c #E8C13D",
-"L. c #FFC325",
-"P. c #FDC428",
-"I. c #FFC92B",
-"U. c #FECD31",
-"Y. c #FFD134",
-"T. c #FFD639",
-"R. c #FFD93D",
-"E. c #E4E400",
-"W. c #ECEC00",
-"Q. c #FFE201",
-"!. c #FFEA00",
-"~. c #F4F400",
-"^. c #FEF300",
-"/. c #FEFE00",
-"(. c #F5D341",
-"). c #FDDC42",
-"_. c #F2D758",
-"`. c #F6DE53",
-"'. c #ECC46E",
-"]. c #EDCB73",
-"[. c #F2D761",
-"{. c #F3D96F",
-"}. c #F4DB78",
-"|. c #FFE045",
-" X c #FEE44A",
-".X c #FFE94E",
-"XX c #F8E65C",
-"oX c #FFED53",
-"OX c #FFEF59",
-"+X c #FFF05B",
-"@X c #FFF163",
-"#X c #FFF26B",
-"$X c #FFF374",
-"%X c #FFF37C",
-"&X c #828282",
-"*X c #909090",
-"=X c gray60",
-"-X c #AF9F94",
-";X c gray64",
-":X c #AEAEAE",
-">X c #B3AEAA",
-",X c gray72",
-"<X c #C5A48B",
-"1X c #C6AB9A",
-"2X c #CFB396",
-"3X c #DEBA90",
-"4X c #D1B6A5",
-"5X c #D6BFA5",
-"6X c #DBC1AF",
-"7X c #DFC9B5",
-"8X c #E3C888",
-"9X c #E3CA98",
-"0X c #F6DE80",
-"qX c #F7DF8A",
-"wX c #E6CFB4",
-"eX c #F8E985",
-"rX c #F8EB97",
-"tX c #FFF482",
-"yX c #FFF591",
-"uX c #FFF69B",
-"iX c #FFF7A2",
-"pX c #FFF7A8",
-"aX c #FCF1BA",
-"sX c #FFF8B2",
-"dX c #CBCBCB",
-"fX c gray83",
-"gX c #DED9D5",
-"hX c #DCDCDC",
-"jX c #E1D5C7",
-"kX c #E2D2C8",
-"lX c #EADACF",
-"zX c #E4E4E4",
-"xX c #EBEBEB",
-"cX c #F3EDE6",
-"vX c #F8F3ED",
-"bX c #F3F3F3",
-"nX c #FEFEFE",
-"mX c None",
-/* pixels */
-"mXmXmXmXmXmX$ : I z.Y ; $ mXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmX",
-"mXmXmXmXmX$ #. XOX$XyXrXz $ mXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmX",
-"mXmXmXmX& [ T.|.oXOX#X$X#Xg $ mXmXmXmXmXmX$ $ $ $ $ mXmXmXmXmXmX",
-"mXmXmXmX7 L.Y.R.|..XoXOXOXL $ $ $ $ mX$ ; x.9X8Xm.I $ mXmXmXmXmX",
-"mXmXmX, ) l.I.Y.R.|.|.).h s / / / s & 4 eXiXpXuXtX#X>.$ mXmXmXmX",
-"mXmXmX1 2.a.L.P.I.Y.s.f A./././././.w XX$X%XtX%X#XOXoX$.$ mXmXmX",
-"mXmXmX7 ` p.p.a.0.W :.~./././././.~.0 OX+X@X@X@XOXoX.X).- mXmXmX",
-"mXmXmXmXD 1.F B 1.8.r.r.i.F.^././.~.P K.oXOXoXoX.X.X|.R.j mXmXmX",
-"mXmXmXmX= < ` r.r.r.r.r.r.r.8.D.^./.C.t ). X X X|.).R.Y.^ mXmXmX",
-"mXmXmX$ = t.y.6.y k z z u F r.r.r.J.W.=.~ ).).).R.T.Y.I.! mXmXmX",
-"mXmX$ & t.u.V b >XfXzXxXhX1Xl F r.r.F.E.*.' U.Y.Y.Y.I.L.7 mXmXmX",
-"mXmX$ ) g.S n dXnXnXnXnXnXnXnX4Xr 8.r.D.E.B.W q.I.L.L...1 mXmXmX",
-"mXmX$ p.p.> ;XdXnXnXnXnXnXnXnXnXlX5 6.r.J.W.Z.;._ ) F , mXmXmXmX",
-"mXmX< a.^ -X@ . ;XnXnXnXnXnXnXnXnXlX9 r.y.^./.~.E.E.W.K $ mXmXmX",
-"mXmX3 L.p dX@ . X gXnXnXnXnXbX=XdXnX6XZ r.D./././././.V.$ mXmXmX",
-"mXmXr I.c hXxXO . + nXnXnXnX# . *XnXnXn 8.r.^././././.~.$ mXmXmX",
-"mXmX9 U.g hXnXxXO . =XnXnXhX. . :XnXbXkXD r.F./././././.& mXmXmX",
-"mXmX= Y.~ gXnXnXxX+ . gXnX@ . ;XbXbXbXbXv t.i./././././.q mXmXmX",
-"mXmX, d.f.<XnXnXnXbX+ X o X ;XbXbXbXbXxXT u.r./././././.< mXmXmX",
-"mXmX, ~ ).c nXnXnXnXdX. . @ bXbXbXbXxXxXE p.u.!././././.& mXmXmX",
-"mXmXmX1 (.,.wXnXnXnXzX. . # bXbXxXxXxXzXE p.p.Q./.^.^.w.= mXmXmX",
-"mXmXmX1 ~ oXO.vXnXnXnX,X&XhXbXxXxXxXzXzXR a.p.J.!.^.!.d = mXmXmX",
-"mXmXmXmX6 j.`.O.nXnXbXbXbXxXxXxXzXzXzXhXo.G.a.Q.!.Q.-., mXmXmXmX",
-"mXmXmXmX7 i _.[.+.cXbXbXxXxXxXzXzXhXhXv.0.L.G.Q.Q.9.1 , mXmXmXmX",
-"mXmXmXmX1 2 N {.}.&.wXxXxXzXzXzXhXhX2X! I.P.H.S.W 1 1 mXmXmXmXmX",
-"mXmXmXmX6 1._ A ].sX'.n.3XkXhXhX6Xx.%.T.Y.P.| y 2 mXmXmXmXmXmXmX",
-"mXmXmXmXm 7.5._ M M.aXsX0XN.h.d.k.).|.T.3.M C  .1 mXmXmXmXmXmXmX",
-"mXmXmXmX8 J 7.B 2 Z G M.qXyX%X@XOX|.g.S W } < y 1 mXmXmXmXmXmXmX",
-"mXmXmXmXM m B B mXmXmXD D D X.X.{ Z y } e.i.e = mXmXmXmXmXmXmXmX",
-"mXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmX= ( y.r.` = mXmXmXmXmXmXmXmX",
-"mXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmXM 8.8.J , mXmXmXmXmXmXmXmX",
-"mXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmXy B H 8 1 mXmXmXmXmXmXmXmX"
-};
diff --git a/xmonad/dzen2/kworldclock.xpm b/xmonad/dzen2/kworldclock.xpm
deleted file mode 100644
index cee61a9..0000000
--- a/xmonad/dzen2/kworldclock.xpm
+++ /dev/null
@@ -1,295 +0,0 @@
-/* XPM */
-static char *kworldclock[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 257 2",
-"   c #000000",
-".  c #00010A",
-"X  c #000311",
-"o  c #00031A",
-"O  c #000928",
-"+  c #000831",
-"@  c #00134B",
-"#  c #001849",
-"$  c #041C5A",
-"%  c #031D63",
-"&  c #001A6D",
-"*  c #0B225B",
-"=  c #052666",
-"-  c #062E75",
-";  c #01346A",
-":  c #013367",
-">  c #053972",
-",  c #003B78",
-"<  c #093E79",
-"1  c #0F3775",
-"2  c #15316F",
-"3  c #173679",
-"4  c #0D427B",
-"5  c #1B447B",
-"6  c #13457B",
-"7  c #22437D",
-"8  c #0017BE",
-"9  c #002992",
-"0  c #003A98",
-"q  c #1C3F89",
-"w  c #163C93",
-"e  c #0127A2",
-"r  c #0031A5",
-"t  c #0039AA",
-"y  c #113CAF",
-"u  c #103DDE",
-"i  c #0E2ECB",
-"p  c #0B4281",
-"a  c #0C5098",
-"s  c #124982",
-"d  c #11498C",
-"f  c #194489",
-"g  c #144D93",
-"h  c #124B99",
-"j  c #174497",
-"k  c #17518F",
-"l  c #18539D",
-"z  c #1B589C",
-"x  c #1A5498",
-"c  c #0143B4",
-"v  c #004DB9",
-"b  c #0049B7",
-"n  c #0751BB",
-"m  c #164EA6",
-"M  c #124EB9",
-"N  c #1A56A4",
-"B  c #1D59A5",
-"V  c #1C5AAE",
-"C  c #254182",
-"Z  c #2E4A8C",
-"A  c #2C559F",
-"S  c #304E91",
-"D  c #315984",
-"F  c #264B9A",
-"G  c #2344B4",
-"H  c #2658A7",
-"J  c #235ABB",
-"K  c #295CBE",
-"L  c #285CB2",
-"P  c #355CAB",
-"I  c #2662AB",
-"U  c #2866B8",
-"Y  c #316DAD",
-"T  c #3569B9",
-"R  c #3873B8",
-"E  c #1F61C2",
-"W  c #214DDA",
-"Q  c #2D5DD6",
-"!  c #2A54D4",
-"~  c #345FD0",
-"^  c #256CCA",
-"/  c #3066C4",
-"(  c #3E64C7",
-")  c #3B68C7",
-"_  c #336FD6",
-"`  c #3676C7",
-"'  c #387DD3",
-"]  c #2770E9",
-"[  c #2777F1",
-"{  c #3065E8",
-"}  c #3279EC",
-"|  c #3975E6",
-" . c #307CF0",
-".. c #4C759F",
-"X. c #527699",
-"o. c #4C6FBB",
-"O. c #4873BA",
-"+. c #5B79BD",
-"@. c #456BC0",
-"#. c #4478C5",
-"$. c #467AD6",
-"%. c #457DDB",
-"&. c #447FE4",
-"*. c #3C80C8",
-"=. c #3983D0",
-"-. c #3F84EE",
-";. c #4481BD",
-":. c #6D88A8",
-">. c #6A83B5",
-",. c #4886C7",
-"<. c #4B87D2",
-"1. c #598BCD",
-"2. c #568ECE",
-"3. c #5689D6",
-"4. c #5C94DB",
-"5. c #5A9BDC",
-"6. c #5397DF",
-"7. c #4986E5",
-"8. c #478BF2",
-"9. c #5992E3",
-"0. c #5B98E8",
-"q. c #5896F2",
-"w. c #568EE8",
-"e. c #5EA4E6",
-"r. c #5BAEFE",
-"t. c #56A7F0",
-"y. c #5DB0FF",
-"u. c #628ED5",
-"i. c #6194DB",
-"p. c #649EDC",
-"a. c #699CDC",
-"s. c #6695D4",
-"d. c #7694C4",
-"f. c #7D98D8",
-"g. c #6883C2",
-"h. c #6597E4",
-"j. c #629CF3",
-"k. c #769AE3",
-"l. c #74A2DE",
-"z. c #65A2E5",
-"x. c #65A7EA",
-"c. c #6AACEB",
-"v. c #69A7E7",
-"b. c #6DA5F5",
-"n. c #62AAF2",
-"m. c #62B2FF",
-"M. c #6AB5FD",
-"N. c #6DB8FF",
-"B. c #73A9E5",
-"V. c #7CABE4",
-"C. c #7EAAEB",
-"Z. c #76A5E6",
-"A. c #79ADF5",
-"S. c #71A6F3",
-"D. c #75B0EC",
-"F. c #7AB3EB",
-"G. c #75BBFE",
-"H. c #79BDFE",
-"J. c #78B5F1",
-"K. c #7DC0FE",
-"L. c #928F9A",
-"P. c #85A1BE",
-"I. c #A7A3AD",
-"U. c #ACACBA",
-"Y. c #B2B2BF",
-"T. c #8C9FD2",
-"R. c #969FC6",
-"E. c #8CA0DA",
-"W. c #87AFD6",
-"Q. c #98A9CA",
-"!. c #9DAAD8",
-"~. c #9AB2CA",
-"^. c #82A8E5",
-"/. c #82B3EB",
-"(. c #8BB2EA",
-"). c #88B7E8",
-"_. c #85BAF3",
-"`. c #8AB9F1",
-"'. c #94ADE4",
-"]. c #96BAEB",
-"[. c #91BEFB",
-"{. c #A0ACD8",
-"}. c #A0B2D5",
-"|. c #A2BCD6",
-" X c #ACB4D9",
-".X c #ABB3D8",
-"XX c #BEBECB",
-"oX c #B7B6C2",
-"OX c #B4B9DA",
-"+X c #BABCDB",
-"@X c #B9B6D4",
-"#X c #ACBEE6",
-"$X c #A5B8E7",
-"%X c #84C3FE",
-"&X c #89C6FF",
-"*X c #8DC8FE",
-"=X c #93CBFF",
-"-X c #9AC4F4",
-";X c #9ACEFD",
-":X c #9CC9F7",
-">X c #9DD0FF",
-",X c #ABC3DB",
-"<X c #AAC3EC",
-"1X c #A1C3F5",
-"2X c #AAC5F1",
-"3X c #A7CAF5",
-"4X c #A3D3FF",
-"5X c #AAD5FD",
-"6X c #AED8FF",
-"7X c #ABD0F6",
-"8X c #B1CBE5",
-"9X c #B9C8EC",
-"0X c #B1C6EB",
-"qX c #B9CCF1",
-"wX c #BAD4ED",
-"eX c #B4D1F2",
-"rX c #B3DBFE",
-"tX c #BAD4F1",
-"yX c #B9DDFE",
-"uX c #B5D7FA",
-"iX c #BDE0FE",
-"pX c #CFB6BE",
-"aX c #D2A3A8",
-"sX c #EBBBBF",
-"dX c #CBBDD2",
-"fX c #C1C1CB",
-"gX c #C4C4D2",
-"hX c #C6C6DA",
-"jX c #CBCBD3",
-"kX c #CACADC",
-"lX c #C6C9DB",
-"zX c #D8D5DB",
-"xX c #CCCDE1",
-"cX c #C3D7EB",
-"vX c #C9DFF5",
-"bX c #DEDEE3",
-"nX c #C2E3FE",
-"mX c #CAE8FF",
-"MX c #C9E3FA",
-"NX c #DBE0EB",
-"BX c #D4E5F7",
-"VX c #E7CDD0",
-"CX c #F8C4C5",
-"ZX c #FCD2D2",
-"AX c #F3DADD",
-"SX c #E4E4EA",
-"DX c #E9E9EE",
-"FX c #ECE7EB",
-"GX c #E3EEFA",
-"HX c #EDEDF1",
-"JX c #E4F3FE",
-"KX c #F1F1F4",
-"LX c #F6F6F8",
-"PX c #FDF2F2",
-"IX c #FCFCFD",
-"UX c #F2F8FD",
-"YX c None",
-/* pixels */
-"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXv ^ 4.l.^.).).V.l.3.n c YXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
-"YXYXYXt M <.(.qXtX0X#X<X0XtX7Xl.O.* YXYXYXYXYXYXYXYXYXYXYXYXYXYX",
-"YXYXYXK 3.2X<X!.@XxXgXkXkX X!.eX].o.3 YXYXYXYXYXYXYXYXYXYXYXYXYX",
-"YXYXy 3.-X'.OXjXDXKXSXHXHXSXgX.X'.).O./ / J t r YXYXYXYXYXYXYXYX",
-"YXe @.`.E.xXDXHXLXIXIXLXIXLXHXFXOX^.C.}.tX].4.J r t YXYXYXYXYXYX",
-"YXG h.Z.R.bXHXIXIXIXIXIXIXIXLXKXSXE.A.f.NXUXJXiXi.K e YXYXYXYXYX",
-"YX( h.f.dXU.,XHXIXIXIXIXIXIXIXIXSXlXi.k.}.GXGXGXnX/.T r YXYXYXYX",
-"YX( 8.$XDXSXjXY.jXKXIXPXPXLXKXFXKXSXT.8.d.BXBXBXBXuX_.#.9 YXYXYX",
-"YX~ } hXHXLXIXDXfXoXjXaXpXXXY.jXKXSX!. .+.vXMXMXvXvX).c.L & YXYX",
-"YXQ ] dXbXIXIXIXIXzXI.L.XXbXHXLXUXzXQ.] o.wXwXwXwXwXwX5.z.F   YX",
-"YXQ } hXHXIXIXIXIXCXVXbXKXIXIXIXUXSX{.} o.wXwX8X8X8X8XW.=.$.+ YX",
-"YXQ 8.#XDXLXIXIXZXCXIXIXIXIXIXIXLXSXT. .>.cX,X,X,X,X>.z a x.j X ",
-"YX! 8.T.kXDXUXZXCXIXIXIXIXIXIXIXSXhXk.7.:.P.~.~.d...s , < O.#.@ ",
-"YXi &.C.@XDXAXCXPXIXIXIXIXIXLXKXSX{.S.@.:.:.:.7 6 : ; ; : s a.3 ",
-"YX8 W j.'.dXsXFXLXLXIXLXIXKXHXSX@X(.7.f 6 4 4 > k 6 < p ; ; a.C ",
-"YXYXi { S.$X@XjXDXHXSXDXHXSXgXOX$Xw.F < 4 < < < p k I Y Y z p.D ",
-"YXYXYXu | b.<X+X+XkXfXhXhX+X+X1Xq.$.Y q p p p p p d *.,.e.*.l.Z ",
-"YXYXYXYX' / _ A.2XqX9X9XqX-XA.&.9.G.5.g d d d d l 6.m.,.Y p._.Z ",
-"YXYXYXYX' O.h m E ) $.$.%.&.7.t.M.N.e.z g g k d *.M.n.c.D.-X%X7 ",
-"YXYXYXYX' 2.h l l l I t.y.y.y.y.m.y.t.I l l B ` N.G.5.R ;.F.l.2 ",
-"YXYXYXYX^ a.N N B T <.M.m.y.y.y.r.y.y.` N N U 6.K.%Xz.B B 2.s.* ",
-"YXYXYXYXv 5.` V ,.K.K.G.G.N.N.N.M.N.N.n.V U x.K.K.D.V.U U ).A O ",
-"YXYXYXYXb ^ V.U D.=X%X%XK.K.K.G.G.G.G.H.x.J.%X&X_.v.;XV.a./.$   ",
-"YXYXYXYXYXb 5.4.B.;X=X=X*X&X&X%X%X%X&X&X&X=X=X;X;X>X6XrX7XP . YX",
-"YXYXYXYXYXv ^ F.a.;X4X;X;X;X=X=X=X=X=X=X;X;X;X4X5X6XrXiXs.*   YX",
-"YXYXYXYXYXYX0 U :XrXrX6X4X4X4X4X4X4X4X4X4X5X6XrXyXiXnXV.= . YXYX",
-"YXYXYXYXYXYXYX- R :XiXyXrXrXrX6X6X6X6XrXrXrXrXvXnXmXV.q X   YXYX",
-"YXYXYXYXYXYXYXYX# m V.uXiX3X7X6XrXyXyXiXnXnXmXmX7X1.% . YXYXYXYX",
-"YXYXYXYXYXYXYXYXYXO g #._.A.j.q.j.b.q.b.[.rXyXV.A * .   YXYXYXYX",
-"YXYXYXYXYXYXYXYXYXYXYXX - I 1.4.j.h.0.0.<.#.j @     YXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXYXYXYX. O = 1 5 7 7 3 * # X   YXYXYXYXYXYXYXYX"
-};
diff --git a/xmonad/dzen2/load.xbm b/xmonad/dzen2/load.xbm
deleted file mode 100644
index b9a1061..0000000
--- a/xmonad/dzen2/load.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define load_width 16
-#define load_height 16
-static unsigned char load_bits[] = {
-   0x00, 0x00, 0xfe, 0x7f, 0x02, 0x40, 0x02, 0x40, 0x02, 0x40, 0x02, 0x40,
-   0x02, 0x44, 0x02, 0x4a, 0x02, 0x71, 0x8e, 0x40, 0x52, 0x40, 0x22, 0x40,
-   0x02, 0x40, 0x02, 0x40, 0xfe, 0x7f, 0x00, 0x00 };
diff --git a/xmonad/dzen2/mail.xbm b/xmonad/dzen2/mail.xbm
deleted file mode 100755
index 295eb73..0000000
--- a/xmonad/dzen2/mail.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define mail_width 8
-#define mail_height 8
-static unsigned char mail_bits[] = {
- 0x00, 0xFF, 0x7E, 0xBD, 0xDB, 0xE7, 0xFF, 0x00 };
diff --git a/xmonad/dzen2/mem.xbm b/xmonad/dzen2/mem.xbm
deleted file mode 100644
index 5c5bc8e..0000000
--- a/xmonad/dzen2/mem.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define load_mem_width 16
-#define load_mem_height 16
-static unsigned char load_mem_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0x12, 0x48, 0x12, 0xfc, 0x3f,
-   0xfc, 0x3f, 0xfc, 0x3f, 0xfc, 0x3f, 0xfc, 0x3f, 0xfc, 0x3f, 0x48, 0x12,
-   0x48, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
diff --git a/xmonad/dzen2/mini.clock2.xpm b/xmonad/dzen2/mini.clock2.xpm
deleted file mode 100644
index 169d47a..0000000
--- a/xmonad/dzen2/mini.clock2.xpm
+++ /dev/null
@@ -1,23 +0,0 @@
-/* XPM */
-static char * jclock_xpm[] = {
-"14 14 6 1",
-" 	s None	c None",
-".	c gray45",
-"X	c gray60",
-"o	c white",
-"O	c gray70",
-"+	c black",
-"     .XXX.      ",
-"    .ooooo.     ",
-"   OoooooooO    ",
-"  .oooo+oooo.   ",
-" .ooooo+ooooo.  ",
-" .ooooo+ooooo.  ",
-" .ooooo+ooooo.  ",
-" .oooooo+oooo.  ",
-" .ooooooo+ooo.  ",
-"  .ooooooooo.   ",
-"   OoooooooO    ",
-"    .ooooo.     ",
-"     .XXX.      ",
-"                "};
diff --git a/xmonad/dzen2/mini.mail.xpm b/xmonad/dzen2/mini.mail.xpm
deleted file mode 100644
index 69df600..0000000
--- a/xmonad/dzen2/mini.mail.xpm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static char * mini-mail_xpm[] = {
-"14 14 4 1",
-" 	c None s None",
-".	c black",
-"X	c white",
-"o	c #808080",
-"                ",
-"                ",
-" .............  ",
-" .XXXXXXXXXXX.o ",
-" ..XXXXXXXXX..o ",
-" .X.XXXXXXX.X.o ",
-" .XX.XXXXX.XX.o ",
-" .XX..XXX..XX.o ",
-" .X.XX...XX.X.o ",
-" ..XXXXXXXXX..o ",
-" .............o ",
-"  ooooooooooooo ",
-"                ",
-"                "};
diff --git a/xmonad/dzen2/mini.mail2.xpm b/xmonad/dzen2/mini.mail2.xpm
deleted file mode 100644
index 1938b5d..0000000
--- a/xmonad/dzen2/mini.mail2.xpm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static char * jmail_xpm[] = {
-"14 14 4 1",
-" 	s None	c None",
-".	c gray85",
-"X	c white",
-"o	c gray60",
-"                ",
-"                ",
-" .XXXXXXXXXXX.  ",
-" XoXXXXXXXXXoX  ",
-" XXoXXXXXXXoXX  ",
-" XXXoXXXXXoXXX  ",
-" XXX.oXXXo.XXX  ",
-" XXXo.oXo.oXXX  ",
-" XXoXXXoXXXoXX  ",
-" XoXXXXXXXXXoX  ",
-" .XXXXXXXXXXX.  ",
-"                ",
-"                ",
-"                "};
diff --git a/xmonad/dzen2/mouse_01.xbm b/xmonad/dzen2/mouse_01.xbm
deleted file mode 100755
index 05e91b5..0000000
--- a/xmonad/dzen2/mouse_01.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define mouse_01_width 8
-#define mouse_01_height 8
-static unsigned char mouse_01_bits[] = {
- 0xEE, 0xEE, 0xEE, 0x82, 0xFE, 0xFE, 0xFE, 0x7C };
diff --git a/xmonad/dzen2/mpd.xbm b/xmonad/dzen2/mpd.xbm
deleted file mode 100644
index 8211667..0000000
--- a/xmonad/dzen2/mpd.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define mpd_width 16
-#define mpd_height 16
-static unsigned char mpd_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x1f, 0x40, 0x10,
-   0x40, 0x10, 0x40, 0x10, 0x40, 0x10, 0x40, 0x10, 0x70, 0x1c, 0x78, 0x1e,
-   0x30, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
diff --git a/xmonad/dzen2/mtall.xbm b/xmonad/dzen2/mtall.xbm
deleted file mode 100644
index 246fd37..0000000
--- a/xmonad/dzen2/mtall.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define mtall_width 12
-#define mtall_height 12
-static unsigned char mtall_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0xfc, 0x03, 0xfc, 0x03, 0xfc, 0x03, 0xfc, 0x03,
-   0xfc, 0x03, 0x00, 0x00, 0x6c, 0x03, 0x6c, 0x03, 0x6c, 0x03, 0x00, 0x00};
diff --git a/xmonad/dzen2/music.xbm b/xmonad/dzen2/music.xbm
deleted file mode 100644
index 86e32b5..0000000
--- a/xmonad/dzen2/music.xbm
+++ /dev/null
@@ -1,7 +0,0 @@
-#define music_width 16
-#define music_height 16
-static unsigned char music_bits[] = {
-   0x00, 0x00, 0xe0, 0x00, 0xe0, 0x03, 0x20, 0x1f, 0x20, 0x1c, 0x20, 0x10,
-   0x20, 0x10, 0x20, 0x10, 0x20, 0x10, 0x2c, 0x10, 0x3e, 0x10, 0x1e, 0x16,
-   0x0c, 0x1f, 0x00, 0x0f, 0x00, 0x06, 0x00, 0x00 };
-
diff --git a/xmonad/dzen2/musicS.xbm b/xmonad/dzen2/musicS.xbm
deleted file mode 100644
index 4f2bc3f..0000000
--- a/xmonad/dzen2/musicS.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define musicS_width 12
-#define musicS_height 12
-static unsigned char musicS_bits[] = {
-   0x00, 0x00, 0x70, 0x00, 0xd0, 0x03, 0x90, 0x03, 0x10, 0x02, 0x10, 0x02,
-   0x18, 0x02, 0x0e, 0x02, 0xce, 0x02, 0xc6, 0x03, 0xc0, 0x01, 0x00, 0x00};
diff --git a/xmonad/dzen2/net-wired.xbm b/xmonad/dzen2/net-wired.xbm
deleted file mode 100644
index d9655d7..0000000
--- a/xmonad/dzen2/net-wired.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define network_eth2_width 16
-#define network_eth2_height 16
-static unsigned char network_eth2_bits[] = {
-   0x00, 0x00, 0xfe, 0x7f, 0x02, 0x40, 0x02, 0x40, 0xc2, 0x43, 0xc2, 0x43,
-   0xc2, 0x43, 0xf2, 0x4f, 0xf2, 0x4f, 0xf2, 0x4f, 0xf2, 0x4f, 0xf2, 0x4f,
-   0x02, 0x40, 0x02, 0x40, 0xfe, 0x7f, 0x00, 0x00 };
diff --git a/xmonad/dzen2/net_down_01.xbm b/xmonad/dzen2/net_down_01.xbm
deleted file mode 100755
index 0940355..0000000
--- a/xmonad/dzen2/net_down_01.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define net_down_01_width 8
-#define net_down_01_height 8
-static unsigned char net_down_01_bits[] = {
- 0x1E, 0x3C, 0x3C, 0x3C, 0xFF, 0x7E, 0x3C, 0x18 };
diff --git a/xmonad/dzen2/net_down_02.xbm b/xmonad/dzen2/net_down_02.xbm
deleted file mode 100755
index 750ada5..0000000
--- a/xmonad/dzen2/net_down_02.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define net_down_02_width 8
-#define net_down_02_height 8
-static unsigned char net_down_02_bits[] = {
- 0x78, 0x3C, 0x3C, 0x3C, 0xFF, 0x7E, 0x3C, 0x18 };
diff --git a/xmonad/dzen2/net_down_03.xbm b/xmonad/dzen2/net_down_03.xbm
deleted file mode 100755
index 0502235..0000000
--- a/xmonad/dzen2/net_down_03.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define net_down_03_width 8
-#define net_down_03_height 8
-static unsigned char net_down_03_bits[] = {
- 0x38, 0x38, 0x38, 0x38, 0xFE, 0x7C, 0x38, 0x10 };
diff --git a/xmonad/dzen2/net_up_01.xbm b/xmonad/dzen2/net_up_01.xbm
deleted file mode 100755
index aac47a3..0000000
--- a/xmonad/dzen2/net_up_01.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define net_up_01_width 8
-#define net_up_01_height 8
-static unsigned char net_up_01_bits[] = {
- 0x18, 0x3C, 0x7E, 0xFF, 0x3C, 0x3C, 0x3C, 0x78 };
diff --git a/xmonad/dzen2/net_up_02.xbm b/xmonad/dzen2/net_up_02.xbm
deleted file mode 100755
index 9a53392..0000000
--- a/xmonad/dzen2/net_up_02.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define net_up_02_width 8
-#define net_up_02_height 8
-static unsigned char net_up_02_bits[] = {
- 0x18, 0x3C, 0x7E, 0xFF, 0x3C, 0x3C, 0x3C, 0x1E };
diff --git a/xmonad/dzen2/net_up_03.xbm b/xmonad/dzen2/net_up_03.xbm
deleted file mode 100755
index b21c007..0000000
--- a/xmonad/dzen2/net_up_03.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define net_up_03_width 8
-#define net_up_03_height 8
-static unsigned char net_up_03_bits[] = {
- 0x10, 0x38, 0x7C, 0xFE, 0x38, 0x38, 0x38, 0x38 };
diff --git a/xmonad/dzen2/net_wired.xbm b/xmonad/dzen2/net_wired.xbm
deleted file mode 100755
index 25cd20b..0000000
--- a/xmonad/dzen2/net_wired.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define net_wired_width 8
-#define net_wired_height 8
-static unsigned char net_wired_bits[] = {
- 0x00, 0x1C, 0x1C, 0x7F, 0x7F, 0x7F, 0x55, 0x7F };
diff --git a/xmonad/dzen2/next.xbm b/xmonad/dzen2/next.xbm
deleted file mode 100755
index 3937532..0000000
--- a/xmonad/dzen2/next.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define next_width 8
-#define next_height 8
-static unsigned char next_bits[] = {
- 0x00, 0x42, 0x4E, 0x7E, 0x7E, 0x4E, 0x42, 0x00 };
diff --git a/xmonad/dzen2/note.xbm b/xmonad/dzen2/note.xbm
deleted file mode 100755
index 21ba22b..0000000
--- a/xmonad/dzen2/note.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define note_width 8
-#define note_height 8
-static unsigned char note_bits[] = {
- 0xFC, 0xFC, 0x84, 0x84, 0x84, 0x84, 0xE7, 0xE7 };
diff --git a/xmonad/dzen2/pacman.xbm b/xmonad/dzen2/pacman.xbm
deleted file mode 100755
index 0f4fd22..0000000
--- a/xmonad/dzen2/pacman.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define pacman_width 8
-#define pacman_height 8
-static unsigned char pacman_bits[] = {
- 0x3C, 0x6E, 0xE7, 0xFF, 0x07, 0x1F, 0x7E, 0x3C };
diff --git a/xmonad/dzen2/pause.xbm b/xmonad/dzen2/pause.xbm
deleted file mode 100755
index 9d4e9a7..0000000
--- a/xmonad/dzen2/pause.xbm
+++ /dev/null
@@ -1,7 +0,0 @@
-#define pause_width 16
-#define pause_height 16
-static unsigned char pause_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x1e, 0x78, 0x1e, 0x78, 0x1e,
-   0x78, 0x1e, 0x78, 0x1e, 0x78, 0x1e, 0x78, 0x1e, 0x78, 0x1e, 0x78, 0x1e,
-   0x78, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
-
diff --git a/xmonad/dzen2/phones.xbm b/xmonad/dzen2/phones.xbm
deleted file mode 100755
index cab8c58..0000000
--- a/xmonad/dzen2/phones.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define phones_width 8
-#define phones_height 8
-static unsigned char phones_bits[] = {
- 0x3C, 0x42, 0x81, 0x81, 0xA5, 0xE7, 0xE7, 0x66 };
diff --git a/xmonad/dzen2/play.xbm b/xmonad/dzen2/play.xbm
deleted file mode 100755
index 46455df..0000000
--- a/xmonad/dzen2/play.xbm
+++ /dev/null
@@ -1,7 +0,0 @@
-#define play_width 16
-#define play_height 16
-static unsigned char play_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x78, 0x00, 0xf8, 0x01,
-   0xf8, 0x07, 0xf8, 0x1f, 0xf8, 0x1f, 0xf8, 0x07, 0xf8, 0x01, 0x78, 0x00,
-   0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
-
diff --git a/xmonad/dzen2/plug.xbm b/xmonad/dzen2/plug.xbm
deleted file mode 100755
index 92da02d..0000000
--- a/xmonad/dzen2/plug.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define plug_width 8
-#define plug_height 8
-static unsigned char plug_bits[] = {
- 0x03, 0x0F, 0x1E, 0x3E, 0x3C, 0x58, 0xA0, 0xC0 };
diff --git a/xmonad/dzen2/prev.xbm b/xmonad/dzen2/prev.xbm
deleted file mode 100755
index 8774315..0000000
--- a/xmonad/dzen2/prev.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define prev_width 8
-#define prev_height 8
-static unsigned char prev_bits[] = {
- 0x00, 0x42, 0x72, 0x7E, 0x7E, 0x72, 0x42, 0x00 };
diff --git a/xmonad/dzen2/rwd.xbm b/xmonad/dzen2/rwd.xbm
deleted file mode 100755
index 5170b21..0000000
--- a/xmonad/dzen2/rwd.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define rwd_width 8
-#define rwd_height 8
-static unsigned char rwd_bits[] = {
- 0x00, 0x48, 0x6C, 0x7E, 0x7E, 0x6C, 0x48, 0x00 };
diff --git a/xmonad/dzen2/scorpio.xbm b/xmonad/dzen2/scorpio.xbm
deleted file mode 100755
index befc2ca..0000000
--- a/xmonad/dzen2/scorpio.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define scorpio_width 8
-#define scorpio_height 8
-static unsigned char scorpio_bits[] = {
- 0x42, 0x81, 0xDB, 0x3C, 0xDB, 0x5A, 0x99, 0x30 };
diff --git a/xmonad/dzen2/shroom.xbm b/xmonad/dzen2/shroom.xbm
deleted file mode 100755
index 62df79f..0000000
--- a/xmonad/dzen2/shroom.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define shroom_width 8
-#define shroom_height 8
-static unsigned char shroom_bits[] = {
- 0x3C, 0x42, 0x81, 0x81, 0xFF, 0x3C, 0x3C, 0x3C };
diff --git a/xmonad/dzen2/spkr_01.xbm b/xmonad/dzen2/spkr_01.xbm
deleted file mode 100755
index 7c2ffc4..0000000
--- a/xmonad/dzen2/spkr_01.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define spkr_01_width 8
-#define spkr_01_height 8
-static unsigned char spkr_01_bits[] = {
- 0x08, 0x4C, 0x8F, 0xAF, 0xAF, 0x8F, 0x4C, 0x08 };
diff --git a/xmonad/dzen2/spkr_02.xbm b/xmonad/dzen2/spkr_02.xbm
deleted file mode 100755
index 8265bf8..0000000
--- a/xmonad/dzen2/spkr_02.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define spkr_02_width 8
-#define spkr_02_height 8
-static unsigned char spkr_02_bits[] = {
- 0x08, 0x0C, 0x0F, 0x1F, 0x1F, 0x0F, 0x0C, 0x08 };
diff --git a/xmonad/dzen2/spkr_03.xbm b/xmonad/dzen2/spkr_03.xbm
deleted file mode 100755
index fd45a6c..0000000
--- a/xmonad/dzen2/spkr_03.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define ysick_width 8
-#define ysick_height 8
-static unsigned char ysick_bits[] = {
- 0x4C, 0x93, 0x93, 0x97, 0x97, 0x93, 0x93, 0x4C };
diff --git a/xmonad/dzen2/stop.xbm b/xmonad/dzen2/stop.xbm
deleted file mode 100755
index f92b64d..0000000
--- a/xmonad/dzen2/stop.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define stop_width 8
-#define stop_height 8
-static unsigned char stop_bits[] = {
- 0x00, 0x7E, 0x7E, 0x7E, 0x7E, 0x7E, 0x7E, 0x00 };
diff --git a/xmonad/dzen2/tall.xbm b/xmonad/dzen2/tall.xbm
deleted file mode 100644
index 1a67757..0000000
--- a/xmonad/dzen2/tall.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define tall_width 12
-#define tall_height 12
-static unsigned char tall_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x7e, 0x07, 0x7e, 0x07, 0x7e, 0x00, 0x7e, 0x07,
-   0x7e, 0x07, 0x7e, 0x00, 0x7e, 0x07, 0x7e, 0x07, 0x00, 0x00, 0x00, 0x00};
diff --git a/xmonad/dzen2/temp.xbm b/xmonad/dzen2/temp.xbm
deleted file mode 100755
index b03d2f1..0000000
--- a/xmonad/dzen2/temp.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define temp_width 8
-#define temp_height 8
-static unsigned char temp_bits[] = {
- 0xC8, 0xE0, 0x72, 0x28, 0x16, 0x09, 0x09, 0x06 };
diff --git a/xmonad/dzen2/test.xbm b/xmonad/dzen2/test.xbm
deleted file mode 100755
index 756e899..0000000
--- a/xmonad/dzen2/test.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define test_width 8
-#define test_height 8
-static unsigned char test_bits[] = {
- 0x0E, 0x13, 0x21, 0x41, 0x82, 0x84, 0xC8, 0x70 };
diff --git a/xmonad/dzen2/usb.xbm b/xmonad/dzen2/usb.xbm
deleted file mode 100755
index 9b0eb08..0000000
--- a/xmonad/dzen2/usb.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define usb_width 8
-#define usb_height 8
-static unsigned char usb_bits[] = {
- 0x70, 0x88, 0xC4, 0xE2, 0x7E, 0x32, 0x09, 0x07 };
diff --git a/xmonad/dzen2/usb_02.xbm b/xmonad/dzen2/usb_02.xbm
deleted file mode 100755
index 77eeda0..0000000
--- a/xmonad/dzen2/usb_02.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define usb_02_width 8
-#define usb_02_height 8
-static unsigned char usb_02_bits[] = {
- 0x10, 0x50, 0x54, 0x54, 0x34, 0x18, 0x10, 0x10 };
diff --git a/xmonad/dzen2/volume.xbm b/xmonad/dzen2/volume.xbm
deleted file mode 100644
index aa97c38..0000000
--- a/xmonad/dzen2/volume.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define volume_width 10
-#define volume_height 10
-static unsigned char volume_bits[] = {
-   0x00, 0x00, 0x00, 0x01, 0xa0, 0x01, 0xac, 0x01, 0xae, 0x01, 0xae, 0x01,
-   0xac, 0x01, 0xa0, 0x01, 0x00, 0x01, 0x00, 0x00};
diff --git a/xmonad/dzen2/wclock.xpm b/xmonad/dzen2/wclock.xpm
deleted file mode 100644
index 0a1d9d2..0000000
--- a/xmonad/dzen2/wclock.xpm
+++ /dev/null
@@ -1,142 +0,0 @@
-/* XPM */
-static char *wclock[] = {
-/* columns rows colors chars-per-pixel */
-"12 12 124 2",
-"   c #000000010008",
-".  c #014105AE0CFD",
-"X  c #000004FD0FC4",
-"o  c #01510454131B",
-"O  c #0000070F1151",
-"+  c #0262072713EC",
-"@  c #03D00AD71E1E",
-"#  c #052D0B431828",
-"$  c #06060C101AB3",
-"%  c #02BB0E062054",
-"&  c #028B0DB2279F",
-"*  c #040C149030B5",
-"=  c #07F4177B337B",
-"-  c #130B204C3A5E",
-";  c #0DFA28785B5F",
-":  c #19FA30BD53F8",
-">  c #19FE32DB6044",
-",  c #0CC1309C61B9",
-"<  c #07033BBC7511",
-"1  c #1E063E6667FC",
-"2  c #25213E867BB7",
-"3  c #284840ED6B53",
-"4  c #2FD84D6D7E32",
-"5  c #31F64CE57905",
-"6  c #13E42D918498",
-"7  c #0BCC42828141",
-"8  c #147C483C8975",
-"9  c #1FA442EF8C5C",
-"0  c #1D154E5E8464",
-"q  c #1E3E59C9A1D1",
-"w  c #222A43C88935",
-"e  c #356957CF86BA",
-"r  c #3EBA5E2688AC",
-"t  c #32D35CE99D08",
-"y  c #22325ED6A30E",
-"u  c #22FB604CA850",
-"i  c #29CA61A5AFC7",
-"p  c #390D675FABA7",
-"a  c #355D6060BCD4",
-"s  c #3A5E6F07BD30",
-"d  c #33E87078BDED",
-"f  c #3A2A76A2C336",
-"g  c #3F937F0FC189",
-"h  c #478B6CA49828",
-"j  c #5C7C725290BC",
-"k  c #5C7473CF9169",
-"l  c #46D77090ADE1",
-"z  c #45997303B813",
-"x  c #43E0756DBCBC",
-"c  c #464E72BABEF6",
-"v  c #44507C4CBAFE",
-"b  c #4B377AE6B827",
-"n  c #54807DA9B1FD",
-"m  c #49797AA2C437",
-"M  c #58548454BF3F",
-"N  c #4E8E9129DAE2",
-"B  c #56F7812DC823",
-"V  c #508C8808CC84",
-"C  c #5ECA8A8AD548",
-"Z  c #5AF78ECEDB97",
-"A  c #5549925ED2BE",
-"S  c #5C849AE6E908",
-"D  c #5941A30EF595",
-"F  c #6763890DC2DA",
-"G  c #652590CCDAE6",
-"H  c #8058A62AD3FF",
-"J  c #6226A201E558",
-"K  c #65B1A2AEE332",
-"L  c #6068A67AEC43",
-"P  c #625AAF2FF970",
-"I  c #6BCFB73BFF3E",
-"U  c #6E4EB904FF9F",
-"Y  c #74E4BAE2FDB1",
-"T  c #7C74B7DBF38B",
-"R  c #82D6A64ED241",
-"E  c #92EAA8E4D9BD",
-"W  c #9605AE66E03F",
-"Q  c #9DEDB92CD79B",
-"!  c #91A1AB3FE332",
-"~  c #A15DB9CDE4C4",
-"^  c #A585B949E3B3",
-"/  c #A87CBB8BE464",
-"(  c #A9B1BD71E43F",
-")  c #B048BFE3E30E",
-"_  c #927AC448F5E9",
-"`  c #926ACB12FFB7",
-"'  c #93C7CBC7FFAB",
-"]  c #95D5CCC8FF8F",
-"[  c #9ADECF3AFF2A",
-"{  c #9F77D169FF06",
-"}  c #A787CFA7F7DF",
-"|  c #A41BCF32FC0F",
-" . c #A743D286FE2D",
-".. c #AD10D813FF16",
-"X. c #AFC3D80FFE61",
-"o. c #B165CA3DE2C2",
-"O. c #BA5AC6A6E302",
-"+. c #B83CD595F387",
-"@. c #BC78D4F0F29A",
-"#. c #BBE3DE59FCCC",
-"$. c #D80FCA62D013",
-"%. c #D51CD470DB3A",
-"&. c #C124CCACE8E4",
-"*. c #C2BACCECE890",
-"=. c #CDC5D353E6E6",
-"-. c #CF02D417E702",
-";. c #CA29E080F61D",
-":. c #D504D961E827",
-">. c #D78FDA0DE8A8",
-",. c #D393D924E9D5",
-"<. c #D7EBDB26E944",
-"1. c #DCC0E033E8C0",
-"2. c #DD8DDCD8E316",
-"3. c #EDF5D6E6DBD3",
-"4. c #F554DB8FDD20",
-"5. c #E61DE61DEAEE",
-"6. c #EC80EB12EE41",
-"7. c #F40BF40BF6CA",
-"8. c #F74AF6D2F8E0",
-"9. c #FB0EF49CF5C1",
-"0. c #FB5AF9A9FB06",
-"q. c #FB56FB56FC9E",
-"w. c #FC53FC53FD71",
-"e. c None",
-/* pixels */
-"e.* e j j r = e.e.e.e.e.",
-"@ B ) >.>.O.F 3 ; . e.e.",
-"2 E 1.w.w.8.( ~ @.c & e.",
-"w *.5.%.$.2.>.G ;.@.c # ",
-"w *.0.4.6.q.,.C o.Q v , ",
-"6 ! 3.9.w.7.^ l h 0 < t ",
-"o a ! -.=.o.Z 8 7 y g b ",
-"e.1 u d S D D i q L A M ",
-"e., f K Y U I N J T V 5 ",
-"e.+ d _ [ ' ` ] { ..R @ ",
-"e.e.% n } |  .X.#.R -   ",
-"e.e.e.. : p m z 5 $   e."
-};
diff --git a/xmonad/dzen2/wifi_01.xbm b/xmonad/dzen2/wifi_01.xbm
deleted file mode 100755
index 315d0f7..0000000
--- a/xmonad/dzen2/wifi_01.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define wifi_01_width 8
-#define wifi_01_height 8
-static unsigned char wifi_01_bits[] = {
- 0x80, 0xA0, 0xA8, 0xAB, 0xAB, 0xA8, 0xA0, 0x80 };
diff --git a/xmonad/dzen2/wifi_02.xbm b/xmonad/dzen2/wifi_02.xbm
deleted file mode 100755
index bd2b3ee..0000000
--- a/xmonad/dzen2/wifi_02.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define wifi_02_width 8
-#define wifi_02_height 8
-static unsigned char wifi_02_bits[] = {
- 0x40, 0x90, 0xA4, 0xA9, 0xA9, 0xA4, 0x90, 0x40 };
diff --git a/xmonad/dzen2/xin_scr.xbm b/xmonad/dzen2/xin_scr.xbm
deleted file mode 100644
index 417edda..0000000
--- a/xmonad/dzen2/xin_scr.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define xin_scr_width 6
-#define xin_scr_height 11
-static unsigned char xin_scr_bits[] = {
-   0x04, 0x04, 0x0e, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
diff --git a/xmonad/xmonad-x86_64-linux b/xmonad/xmonad-x86_64-linux
deleted file mode 100755
index 3b437d4..0000000
Binary files a/xmonad/xmonad-x86_64-linux and /dev/null differ
diff --git a/xmonad/xmonad.errors b/xmonad/xmonad.errors
deleted file mode 100644
index 41dd670..0000000
--- a/xmonad/xmonad.errors
+++ /dev/null
@@ -1,19 +0,0 @@
-
-xmonad.hs:35:75: warning: [-Wdeprecations]
-    In the use of ‘defaultConfig’
-    (imported from XMonad, but defined in XMonad.Config):
-    Deprecated: "Use def (from Data.Default, and re-exported by XMonad and XMonad.Config) instead."
-
-xmonad.hs:51:32: warning: [-Wdeprecations]
-    In the use of ‘defaultConfig’
-    (imported from XMonad, but defined in XMonad.Config):
-    Deprecated: "Use def (from Data.Default, and re-exported by XMonad and XMonad.Config) instead."
-
-xmonad.hs:58:32: warning: [-Wdeprecations]
-    In the use of ‘defaultConfig’
-    (imported from XMonad, but defined in XMonad.Config):
-    Deprecated: "Use def (from Data.Default, and re-exported by XMonad and XMonad.Config) instead."
-
-xmonad.hs:85:34: warning: [-Wdeprecations]
-    In the use of ‘defaultPP’ (imported from XMonad.Hooks.DynamicLog):
-    Deprecated: "Use def (from Data.Default, and re-exported by XMonad.Hooks.DynamicLog) instead."
diff --git a/xmonad/xmonad.hi b/xmonad/xmonad.hi
deleted file mode 100644
index 6a6b342..0000000
Binary files a/xmonad/xmonad.hi and /dev/null differ
diff --git a/xmonad/xmonad.hs b/xmonad/xmonad.hs
deleted file mode 100644
index ad5082b..0000000
--- a/xmonad/xmonad.hs
+++ /dev/null
@@ -1,103 +0,0 @@
--- Old Imports saved so I don't loose them
--- import qualified XMonad.StackSet as W
--- Also random comments for future reference:
--- https://gist.github.com/BinRoot/8154650
--- Fullscreen video hax Imports
--- https://www.reddit.com/r/xmonad/comments/4cnjhi/fullscreen_video_in_firefox/d1juwkl/
-
--- imports {{{
-import XMonad
-import XMonad.Wallpaper
-import XMonad.Config.Desktop
-import XMonad.Hooks.DynamicLog
-import XMonad.Hooks.FadeInactive 
-import XMonad.Hooks.ManageDocks
-import XMonad.Hooks.ManageHelpers
-import XMonad.Layout.Fullscreen
-import XMonad.Layout.NoBorders ( smartBorders )
-import XMonad.Layout.Spacing (smartSpacing)
-import XMonad.Util.EZConfig ( additionalKeys )
-import XMonad.Util.Run
-
-import System.IO
-import System.Exit
-
---}}}
-
--- fields {{{
--- set mod key (alt)
-myModMask     = mod1Mask
-
--- set terminal
-myTerminal    = "urxvt"
-
--- border spacing
-myLayoutHook  = smartSpacing 4 $ smartBorders ( avoidStruts $  layoutHook defaultConfig )
-
--- border sie
-myBorderWidth = 0
-
--- status bar
-myXmonadBar = "dzen2 -x '0' -y '0' -h '24' -w '1690' -ta 'l' -fg '#FFFFFF' -bg '#1B1D1E'"
-myStatusBar = "conky -c $HOME/.xmonad/.conky_dzen | dzen2 -x '1690' -w '2560' -h '24' -ta 'r' -bg '#1B1D1E' -fg '#FFFFFF' -y '0'"
-myBitmapsDir = "$HOME/.xmonad/dzen2"
---}}}
-
--- main-config {{{
-main = do
-    dzenLeftBar <- spawnPipe myXmonadBar
-    dzenRightBar <- spawnPipe myStatusBar
-    setRandomWallpaper ["$HOME/images/wallpaper"]
-    xmonad $ fullscreenSupport defaultConfig
-        { terminal        = myTerminal
-        , layoutHook      = myLayoutHook
-        , borderWidth     = myBorderWidth
-        , logHook         = myLogHook dzenLeftBar >> fadeInactiveLogHook 0xdddddddd
-        , handleEventHook = mconcat
-            [ docksEventHook
-            , handleEventHook  defaultConfig]
-        } `additionalKeys` myAdditionalKeys
---}}}
-
--- key-bindings {{{
-myAdditionalKeys =
-    [ ((myModMask,               xK_q), spawn "i3lock -i $HOME/images/lock.png")
-    ] ++
-    [ ((myModMask .|. shiftMask, xK_q), kill)
-    ] ++ 
-    [ ((myModMask,               xK_c), spawn "xmonad --recompile; xmonad --restart")
-    ] ++
-    [ ((myModMask .|. shiftMask, xK_c), io (exitWith ExitSuccess))
-    ]
---}}}
-
--- video-hax {{{
-myManageHooks = composeAll
-      [ isFullscreen --> doFullFloat
-      ]
---}}}
-
--- Hooks {{{
---Bar
-myLogHook :: Handle -> X ()
-myLogHook h = dynamicLogWithPP $ defaultPP
-    {
-        ppCurrent           =   dzenColor "#ebac54" "#1B1D1E" . pad
-      , ppVisible           =   dzenColor "white" "#1B1D1E" . pad
-      , ppHidden            =   dzenColor "white" "#1B1D1E" . pad
-      , ppHiddenNoWindows   =   dzenColor "#7b7b7b" "#1B1D1E" . pad
-      , ppUrgent            =   dzenColor "#ff0000" "#1B1D1E" . pad
-      , ppWsSep             =   " "
-      , ppSep               =   "  |  "
-      , ppLayout            =   dzenColor "#ebac54" "#1B1D1E" .
-                                (\x -> case x of
-                                    "ResizableTall"             ->      "^i(" ++ myBitmapsDir ++ "/tall.xbm)"
-                                    "Mirror ResizableTall"      ->      "^i(" ++ myBitmapsDir ++ "/mtall.xbm)"
-                                    "Full"                      ->      "^i(" ++ myBitmapsDir ++ "/full.xbm)"
-                                    "Simple Float"              ->      "~"
-                                    _                           ->      x
-                                )
-      , ppTitle             =   (" " ++) . dzenColor "white" "#1B1D1E" . dzenEscape
-      , ppOutput            =   hPutStrLn h
-    }
---}}}
diff --git a/xmonad/xmonad.o b/xmonad/xmonad.o
deleted file mode 100644
index eeef5b1..0000000
Binary files a/xmonad/xmonad.o and /dev/null differ
diff --git a/zprofile b/zprofile
index d7ab65c..f09ea07 100644
--- a/zprofile
+++ b/zprofile
@@ -1,5 +1 @@
-# Other settings
 xbindkeys &> /dev/null
-gpg2 --quiet --no-tty --batch -d $HOME/.mutt/passwords/dumb.gpg &> /dev/null
-
-export PATH="$HOME/.cargo/bin:$PATH"
diff --git a/zshrc b/zshrc
index f6c2d19..e84ecf5 100644
--- a/zshrc
+++ b/zshrc
@@ -1,40 +1,24 @@
-### ZSH Config
+source $HOME/.aliases
 
-## Set TERM for proper colors
+# Set TERM for proper tmux colors
 if [[ -z $TMUX ]]; then
     export TERM='xterm-256color'
 else
     export TERM='screen-256color'
 fi
 
-
-### For local binaries (vim 8)
-export PATH="$HOME/.cargo/bin:$PATH"
+# Local binaries
+export PATH=$HOME/.cargo/bin:$PATH
 export PATH=$HOME/.local/bin:$PATH
+export GOPATH=$HOME/go
 
-## Path to your oh-my-zsh installation.
+# ZSH
 export ZSH=$HOME/.oh-my-zsh
-
-## See https://github.com/robbyrussell/oh-my-zsh/wiki/Themes
 ZSH_THEME="steeef"
-
-## Plugins
 plugins=(git history-substring-search)
-
 source $ZSH/oh-my-zsh.sh
 
-
-### User configuration
-source $HOME/.aliases
-
-## GPG Auth method
-export GPG_TTY=$(tty)
-
-##  Vim stuff
-# Reduce delay swithing between normal & insert mode
-export KEYTIMEOUT=1
-
-# Keybindings
+## Keybindings
 bindkey '^K' history-beginning-search-backward
 bindkey '^J' history-beginning-search-forward 
 bindkey '^w' backward-kill-word
@@ -47,11 +31,17 @@ if [ -f /etc/os-release ]; then
     fi
 fi
 
-## Dircolors
+# GPG/SSH
+unset SSH_AGENT_PID
+if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
+  export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
+fi
+export GPG_TTY=$(tty)
+gpg-connect-agent updatestartuptty /bye >/dev/null
+
+# VIM
+## Reduce delay swithing between normal & insert mode
+export KEYTIMEOUT=1
+
+# Fancy tui dircolors
 eval `dircolors ~/.config/dircolors-solarized/dircolors.256dark`
-
-# The next line updates PATH for the Google Cloud SDK.
-if [ -f '/home/paul/.local/share/google-cloud-sdk/path.zsh.inc' ]; then . '/home/paul/.local/share/google-cloud-sdk/path.zsh.inc'; fi
-
-# The next line enables shell command completion for gcloud.
-if [ -f '/home/paul/.local/share/google-cloud-sdk/completion.zsh.inc' ]; then . '/home/paul/.local/share/google-cloud-sdk/completion.zsh.inc'; fi