diff --git a/.bashrc b/.bashrc
index 40996b3..54623d6 100644
--- a/.bashrc
+++ b/.bashrc
@@ -34,6 +34,10 @@ export LESS=' -R '
 # Set text/background colors for ls
 export LS_COLORS="di=01;37"
 
+# Set language
+# export LANG="en_US.UTF-8"
+# export LC_MESSAGES="C"
+
 PS1='[\u@\h: \w]\$ '
 
 # Turn off noscroll
diff --git a/.bin/xmonadClose.sh b/.bin/xmonadClose.sh
index d11ba62..81facd5 100755
--- a/.bin/xmonadClose.sh
+++ b/.bin/xmonadClose.sh
@@ -24,19 +24,23 @@
 #       * Needs to check whether a reboot/shutdown is allowed (user must be in the group
 #         'power' and must be the only user logged in or they will be prompted for sudo's
 #         password to override)
+#       * Add support for the user to specify a timer
+#         - Needs to provide a way to cancel the time
+#         - Would be nice if there was some notification when there's n min left in the timer
 #       * re-write in haskell direct into ~/.xmonad/xmonad.hs using the dmenu extension(?)
 #         - issue with that is then the script could only be used within xmonad
 #         - perhaps consider taking a second argument when logout is passed as the first
 #           so that the second argument could be used as a 'logout command' and thus
 #           this script could be used with any wm
 
-actionNames=(cancel logout suspend hibernate hybrid-sleep shutdown)
+actionNames=(cancel logout suspend hibernate hybrid-sleep shutdown restart)
 actionExecs=(""
              "xdotool key super+control+shift+End"
 	     "xscreensaver-command -lock && systemctl suspend"
 	     "xscreensaver-command -lock && systemctl hibernate"
 	     "xscreensaver-command -lock && systemctl hybrid-sleep"
-	     "shutdown -h now")
+	     "shutdown -h now"
+	     "reboot")
 
 # Ask the user whether they want to logout, cancel, suspend, hibernate, hybrid-sleep, shutdown
 ask=`echo ${actionNames[*]} | tr ' ' '\n' | dmenu -b -i -nb '#040404' -nf '#525252' -sf '#ffa0ff' -sb '#000000'`
@@ -51,7 +55,6 @@ case "$ask" in
 		fi
 	    done
 	fi
-	break
 	;;
     cancel|*)
 	# Do nothing; the user entered cancel or a invalid input
diff --git a/.config/dunst/dunstrc b/.config/dunst/dunstrc
new file mode 100644
index 0000000..2ef8c54
--- /dev/null
+++ b/.config/dunst/dunstrc
@@ -0,0 +1,206 @@
+[global]
+    font = Terminus-12
+
+    # The format of the message. Possible variables are:
+    #   %a  appname
+    #   %s  summary
+    #   %b  body
+    #   %i  iconname (including its path)
+    #   %I  iconname (without its path)
+    #   %p  progress value if set ([  0%] to [100%]) or nothing
+    format = "%s\n%b"
+
+    # Sort messages by urgency
+    sort = yes
+
+    # Show how many messages are currently hidden (because of geometry)
+    indicate_hidden = yes
+
+    # alignment of message text.
+    # Possible values are "left", "center" and "right"
+    alignment = center
+
+    # The frequency with wich text that is longer than the notification
+    # window allows bounces back and forth.
+    # This option conflicts with 'word_wrap'.
+    # Set to 0 to disable
+    bounce_freq = 0
+
+    # show age of message if message is older than show_age_threshold seconds.
+    # set to -1 to disable
+    show_age_threshold = 60
+
+    # split notifications into multiple lines if they don't fit into geometry
+    word_wrap = yes
+
+    # ignore newlines '\n' in notifications
+    ignore_newline = no
+
+
+    # the geometry of the window
+    # geometry [{width}]x{height}][+/-{x}+/-{y}]
+    # The geometry of the message window.
+    # The height is measured in number of notifications everything else in pixels. If the width
+    # is omitted but the height is given ("-geometry x2"), the message window
+    # expands over the whole screen (dmenu-like). If width is 0,
+    # the window expands to the longest message displayed.
+    # A positive x is measured from the left, a negative from the
+    # right side of the screen.  Y is measured from the top and down respectevly.
+    # The width can be negative. In this case the actual width is the
+    # screen width minus the width defined in within the geometry option.
+    geometry = "300x5-30+20"
+
+    # The transparency of the window. range: [0; 100]
+    # This option will only work if a compositing windowmanager is present (e.g. xcompmgr, compiz, etc..)
+    transparency = 35
+
+    # Don't remove messages, if the user is idle (no mouse or keyboard input)
+    # for longer than idle_threshold seconds.
+    # Set to 0 to disable.
+    idle_threshold = 120
+
+    # Which monitor should the notifications be displayed on.
+    monitor = 0
+
+    # Display notification on focused monitor. Possible modes are:
+    # mouse: follow mouse pointer
+    # keyboard: follow window with keyboard focus
+    # none: don't follow anything
+    #
+    # "keyboard" needs a windowmanager that exports the _NET_ACTIVE_WINDOW property.
+    # This should be the case for almost all modern windowmanagers.
+    #
+    # If this option is set to mouse or keyboard, the monitor option will be
+    # ignored.
+    follow = keyboard
+
+    # should a notification popped up from history be sticky or
+    # timeout as if it would normally do.
+    sticky_history = yes
+
+    # The height of a single line. If the height is smaller than the font height,
+    # it will get raised to the font height.
+    # This adds empty space above and under the text.
+    line_height = 0
+
+    # Draw a line of 'separatpr_height' pixel height between two notifications.
+    # Set to 0 to disable
+    separator_height = 2;
+
+    # padding between text and separator
+    padding = 8
+
+    # horizontal padding
+    horizontal_padding = 8
+
+    # Define a color for the separator.
+    # possible values are:
+    #  * auto: dunst tries to find a color fitting to the background
+    #  * foreground: use the same color as the foreground
+    #  * frame: use the same color as the frame.
+    #  * anything else will be interpreted as a X color
+    separator_color = frame
+
+    # print a notification on startup
+    # This is mainly for error detection, since dbus (re-)starts dunst
+    # automatically after a crash.
+    startup_notification = false
+
+    # dmenu path
+    dmenu = /usr/bin/dmenu -p dunst:
+
+    # browser for opening urls in context menu
+    browser = /usr/bin/conkeror
+
+[frame]
+    width = 3
+    color = "#aaaaaa"
+
+[shortcuts]
+    # shortcuts are specified as [modifier+][modifier+]...key
+    # available modifiers are 'ctrl', 'mod1' (the alt-key), 'mod2', 'mod3'
+    # and 'mod4' (windows-key)
+    # xev might be helpful to find names for keys
+
+    # close notification
+    close = ctrl+space
+
+    # close all notifications
+    close_all = ctrl+shift+space
+
+    # redisplay last message(s)
+    # On the US keyboard layout 'grave' is normally above TAB and left of '1'.
+    history = ctrl+grave
+
+    # context menu
+    context = ctrl+shift+period
+
+[urgency_low]
+    # IMPORTANT: colors have to be defined in quotation marks.
+    # Otherwise the '#' and following  would be interpreted as a comment.
+    background = "#222222"
+    foreground = "#888888"
+    timeout = 10
+
+[urgency_normal]
+    background = "#285577"
+    foreground = "#ffffff"
+    timeout = 10
+
+[urgency_critical]
+    background = "#900000"
+    foreground = "#ffffff"
+    timeout = 0
+
+
+# Every section that isn't one of the above is interpreted as a rules
+# to override settings for certain messages.
+# Messages can be matched by 'appname', 'summary', 'body' or 'icon'
+# and you can override the 'timeout', 'urgency', 'foreground', 'background'
+# and 'format'.
+# Shell-like globbing will get expanded.
+#
+# SCRIPTING
+# you can specify a script that gets run when the rule matches by setting
+# the 'script' option.
+# The script will be called as follows:
+# script appname summary body icon urgency
+# where urgency can be "LOW", "NORMAL" or "CRITICAL".
+#
+# NOTE: if you don't want a notification to be displayed, set the format to ""
+# NOTE: It might be helpful to run dunst -print in a terminal in order to find
+# fitting options for rules.
+
+#[espeak]
+#    summary = "*"
+#    script = dunst_espeak.sh
+
+#[script-test]
+#    summary = "*script*"
+#    script = dunst_test.sh
+
+#[ignore]
+## This notification will not be displayed
+#    summary = "foobar"
+#    format = ""
+
+#[signed_on]
+#    appname = Pidgin
+#    summary = "*signed on*"
+#    urgency = low
+#
+#[signed_off]
+#    appname = Pidgin
+#    summary = *signed off*
+#    urgency = low
+#
+#[says]
+#    appname = Pidgin
+#    summary = *says*
+#    urgency = critical
+#
+#[twitter]
+#    appname = Pidgin
+#    summary = *twitter.com*
+#    urgency = normal
+#
diff --git a/.config/mc/ini b/.config/mc/ini
index 9e274b0..16a3170 100644
--- a/.config/mc/ini
+++ b/.config/mc/ini
@@ -111,7 +111,7 @@ free_space=1
 
 horizontal_split=0
 vertical_equal=1
-left_panel_size=101
+left_panel_size=122
 horizontal_equal=1
 top_panel_size=113
 
@@ -120,7 +120,7 @@ timeformat_recent=%b %e %H:%M
 timeformat_old=%b %e  %Y
 ftp_proxy_host=gate
 ftpfs_password=anonymous@
-display_codepage=ASCII
+display_codepage=UTF-8
 source_codepage=Other_8_bit
 autodetect_codeset=
 clipboard_store=
diff --git a/.config/mc/panels.ini b/.config/mc/panels.ini
deleted file mode 100644
index d76479f..0000000
--- a/.config/mc/panels.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-
-[New Left Panel]
-display=listing
-reverse=0
-case_sensitive=1
-exec_first=0
-sort_order=name
-list_mode=user
-user_format=half type name | size | perm
-user_status0=half type name | size | perm
-user_status1=half type name | size | perm
-user_status2=half type name | size | perm
-user_status3=half type name | size | perm
-user_mini_status=0
-
-[New Right Panel]
-display=listing
-reverse=0
-case_sensitive=1
-exec_first=0
-sort_order=name
-list_mode=full
-user_format=half type name | size | perm
-user_status0=half type name | size | perm
-user_status1=half type name | size | perm
-user_status2=half type name | size | perm
-user_status3=half type name | size | perm
-user_mini_status=0
-
-[Dirs]
-other_dir=/home/collin
-current_is_left=false
diff --git a/.config/systemd/user/dunst.service b/.config/systemd/user/dunst.service
new file mode 100644
index 0000000..12612f2
--- /dev/null
+++ b/.config/systemd/user/dunst.service
@@ -0,0 +1,9 @@
+[Unit]
+Description = A customizable and lightweight notification-daemon
+
+[Service]
+ExecStart = /usr/bin/dunst
+Restart = always
+
+[Install]
+WantedBy = default.target
diff --git a/.config/systemd/user/mpd.service b/.config/systemd/user/mpd.service
index 28416f0..9722f42 100644
--- a/.config/systemd/user/mpd.service
+++ b/.config/systemd/user/mpd.service
@@ -1,8 +1,10 @@
 [Unit]
 Description = Music Player Daemon
+Requires = mpd.socket
+After = mpd.socket
 
 [Service]
-ExecStart = /usr/bin/mpd --no-daemon
+ExecStart = /usr/bin/mpd --no-daemon --stdout %h/.mpdconf
 Restart = always
 
 [Install]
diff --git a/.config/systemd/user/mpd.socket b/.config/systemd/user/mpd.socket
new file mode 100644
index 0000000..ff55c02
--- /dev/null
+++ b/.config/systemd/user/mpd.socket
@@ -0,0 +1,6 @@
+[Socket]
+ListenStream = 6600
+Service = mpd.service
+
+[Install]
+WantedBy = sockets.target
diff --git a/.emacs b/.emacs
index 2223f30..f0ff9ad 100644
--- a/.emacs
+++ b/.emacs
@@ -365,8 +365,8 @@
 (setq geiser-repl-use-other-window nil)
 (setq geiser-active-implementations '(racket))
 
-;; setup pastebin.el for use with pastebin.com
-(require 'pastebin) ;; ELPA
+;; setup pastebin.el for use with pastebin.com *BROKEN*
+;(require 'pastebin) ;; ELPA
 
 ;; yasnippet, auto-complete-mode and flyspell do not play nicely with one another due to
 ;; a conflict with the context of their tab binding *OLD*
@@ -582,6 +582,7 @@ consisting of lists of buffers opened by each respective FP argument."
  '(quack-fontify-style (quote plt))
  '(quack-programs (quote ("mzscheme" "bigloo" "csi" "csi -hygienic" "gosh" "gracket" "gsi" "gsi ~~/syntax-case.scm -" "guile" "kawa" "mit-scheme" "racket" "racket -il typed/racket" "rs" "scheme" "scheme48" "scsh" "sisc" "stklos" "sxi")))
  '(scroll-bar-mode nil)
+ '(send-mail-function (quote smtpmail-send-it))
  '(show-paren-mode t)
  '(w3m-content-type-alist (quote (("text/plain" "\\.\\(?:txt\\|tex\\|el\\)\\'" nil nil) ("text/html" "\\.s?html?\\'" ("conkeror" file) nil) ("text/sgml" "\\.sgml?\\'" nil "text/plain") ("text/xml" "\\.xml\\'" nil "text/plain") ("image/jpeg" "\\.jpe?g\\'" ("/usr/bin/display" file) nil) ("image/png" "\\.png\\'" ("/usr/bin/display" file) nil) ("image/gif" "\\.gif\\'" ("/usr/bin/display" file) nil) ("image/tiff" "\\.tif?f\\'" ("/usr/bin/display" file) nil) ("image/x-xwd" "\\.xwd\\'" ("/usr/bin/display" file) nil) ("image/x-xbm" "\\.xbm\\'" ("/usr/bin/display" file) nil) ("image/x-xpm" "\\.xpm\\'" ("/usr/bin/display" file) nil) ("image/x-bmp" "\\.bmp\\'" ("/usr/bin/display" file) nil) ("video/mpeg" "\\.mpe?g\\'" nil nil) ("video/quicktime" "\\.mov\\'" nil nil) ("application/dvi" "\\.dvi\\'" ("xdvi" file) nil) ("application/postscript" "\\.e?ps\\'" ("gs" file) nil) ("application/pdf" "\\.pdf\\'" nil nil) ("application/x-pdf" "\\.pdf\\'" nil nil) ("application/xml" "\\.xml\\'" nil w3m-detect-xml-type) ("application/rdf+xml" "\\.rdf\\'" nil "text/plain") ("application/rss+xml" "\\.rss\\'" nil "text/plain") ("application/xhtml+xml" nil nil "text/html"))) t))
 (custom-set-faces
diff --git a/.emacs.d/themes/manoj-transparent-theme.el b/.emacs.d/themes/manoj-transparent-theme.el
index 8e1a0e6..f1a573e 100644
--- a/.emacs.d/themes/manoj-transparent-theme.el
+++ b/.emacs.d/themes/manoj-transparent-theme.el
@@ -27,7 +27,7 @@ jarring angry fruit salad look to reduce eye fatigue.")
 
 (custom-theme-set-faces
  'manoj-transparent
- '(default ((t (:background "nil" :foreground "WhiteSmoke"))))
+ '(default ((t (:background nil :foreground "WhiteSmoke"))))
  ;; Font lock faces
  '(font-lock-builtin-face       ((t (:foreground "LightSteelBlue"))))
  '(font-lock-constant-face      ((t (:foreground "LightSlateBlue" :bold t))))
@@ -558,7 +558,7 @@ jarring angry fruit salad look to reduce eye fatigue.")
  '(paren-mismatch-face ((t (:bold t :background "white" :foreground "red"))))
  '(paren-no-match-face ((t (:bold t :background "white" :foreground "red"))))
  '(query-replace ((t (:foreground "brown4" :background "palevioletred2"))))
- '(region ((t (:background "blue3"))))
+ '(region ((t (:background "gray19"))))
  '(scroll-bar ((t (:background "grey75" :foreground "WhiteSmoke"))))
  '(secondary-selection ((t (:background "SkyBlue4"))))
  '(semantic-dirty-token-face ((t (:background "lightyellow"))))
diff --git a/.gitconfig b/.gitconfig
index 975fe55..88f0201 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,6 +1,8 @@
 [user]
 	email = rekahsoft@gmail.com
+	name = Collin J. Doering
 [color]
 	branch = auto
 	diff = auto
 	status = auto
+	ui = true
diff --git a/.gnus b/.gnus
index 90c6558..baa4295 100644
--- a/.gnus
+++ b/.gnus
@@ -3,49 +3,73 @@
 ;; Date: Jan 20, 2011
 ;; Description: Configuration file for gnus mail reader (in emacs-lisp)
 
+(require 'cl)
 (require 'smtpmail)
 
+(setq user-mail-address "collin.doering@gmail.com"
+      user-full-name "Collin J. Doering"
+      smtpmail-smtp-server "smtp.gmail.com"
+      smtpmail-smtp-service 587
+      smtpmail-auth-credentials "~/.authinfo.gpg"
+      message-send-mail-function 'smtpmail-send-it)
+
+(setq nnmail-expiry-wait 2
+      nnmail-resplit-incoming t)
+
 (setq smtpmail-debug-info t)
 
-(setq nnmail-expiry-wait 2)
-(setq nnmail-resplit-incoming t)
-(setq user-mail-address "rekahsoft@gmail.com")
-(setq mail-host-address "gmail.com")
-(setq gnus-message-archive-group "nnimap+rekahsoft:[Gmail]/Sent")
-(setq gnus-outgoing-message-group "nnimap+rekahsoft:[Gmail]/Sent")
+(setq smtpmail-stream-type nil) ;; If using TLS/SSL.  Use C-h v smtpmail-stream-type RET to see possible values
+(setq smtp-accounts
+      '(("collin.doering@gmail.com" "Collin J. Doering" "smtp.gmail.com")
+	("rekahsoft@gmail.com" "rekahsoft" "smtp.gmail.com")))
 
-;; use smtp to send mail
-(setq message-send-mail-function 'smtpmail-send-it
-      smtpmail-starttls-credentials '(("smtp.gmail.com" 587 nil nil))
-      smtpmail-auth-credentials "~/.authinfo.gpg"
-      smtpmail-default-smtp-server "smtp.gmail.com"
-      smtpmail-smtp-server "smtp.gmail.com"
-      smtpmail-smtp-service 587
-      smtpmail-local-domain "rekahsoft.dyndnshomelinux.org")
+(defun my-change-smtp ()
+  (save-excursion
+    (loop with from = (save-restriction
+			(message-narrow-to-headers)
+			(message-fetch-field "from"))
+	  for (addr fname server) in smtp-accounts
+	  when (string-match addr from)
+	  do (setq user-mail-address addr
+		   user-full-name fname
+		   smtpmail-smtp-server server))))
+
+(defadvice smtpmail-via-smtp
+  (before change-smtp-by-message-from-field (recipient buffer))
+  (with-current-buffer buffer (my-change-smtp)))
+
+(ad-activate 'smtpmail-via-smtp)
+	
+;; setting up posting styles
+(setq gnus-posting-styles
+      '((".*"
+	 (address "rekahsoft@gmail.com")
+	 (name "Collin J. Doering (RekahSoft)"))
+	("collin.doering@gmail.com"
+	 (address "collin.doering@gmail.com")
+	 (name "Collin J. Doering"))
+	("rekahsoft.mail@gmail.com"
+	 (address "rekahsoft.mail@gmail.com")
+	 (name "RekahSoft"))
+	))
 
 ;; set primary select method..
-(setq gnus-select-method '(nnimap "rekahsoft"
+(setq gnus-select-method '(nnimap "collin.doering"
 				  (remove-prefix "INBOX.")
 				  (nnimap-address "imap.gmail.com")
 				  (nnimap-server-port 993)
 				  (nnimap-stream ssl)
 				  (nnimap-authinfo-file "~/.authinfo.gpg")))
 
-;; can't get two imap gmail accounts to work simultaniously
-;; (setq gnus-secondary-select-methods
-;;       '(
-;; 	(nnimap "collin.doering"
-;; 		(remove-prefix "INBOX.")
-;; 		(nnimap-address "imap.gmail.com")
-;; 		(nnimap-server-port 993)
-;; 		(nnimap-stream ssl)
-;; 		(nnimap-authinfo-file "~/.authinfo-cd.gpg"))
-;; 	(nnimap "rekahsoft"
-;; 		(remove-prefix "INBOX.")
-;; 		(nnimap-address "imap.gmail.com")
-;; 		(nnimap-server-port 993)
-;; 		(nnimap-stream ssl)
-;; 		(nnimap-authinfo-file "~/.authinfo.gpg"))))
+;; set secondary select methods
+(setq gnus-secondary-select-methods
+      '((nnimap "rekahsoft"
+		(remove-prefix "INBOX.")
+		(nnimap-address "imap.gmail.com")
+		(nnimap-server-port 993)
+		(nnimap-stream ssl)
+		(nnimap-authinfo-file "~/.authinfo.gpg"))))
+
 ;;	(nnimap "rekahsoft.mail"
 ;;		(remove-prefix "INBOX.")
 ;;		(nnimap-address "imap.gmail.com")
@@ -57,17 +81,6 @@
              'gnus-summary-mark-read-and-unread-as-read)
 (add-hook 'gnus-mark-article-hook 'gnus-summary-mark-unread-as-read)
 
-
-;; setting up posting styles
-(setq gnus-posting-styles
-      '((".*"
-	 (address "rekahsoft@gmail.com")
-	 (name "Collin J. Doering (RekahSoft)"))
-	("collin.doering@gmail.com"
-	 (address "collin.doering@gmail.com")
-	 (name "Collin J. Doering"))
-	))
-
 ;;gnus-group-line-format's default value was
 ;;"%M%S%p%P%5y:%B%(%g%)%l %O\n"
 
@@ -95,7 +108,7 @@
 (setq gnus-sum-thread-tree-vertical "|")
 (setq gnus-sum-thread-tree-single-leaf "`-> ")
 
-(require 'gnus-demon)
-(setq gnus-use-demon t)
-(gnus-demon-add-handler 'gnus-group-get-new-news 10 2)
-(gnus-demon-init)
+;; (require 'gnus-demon)
+;; (setq gnus-use-demon t)
+;; (gnus-demon-add-handler 'gnus-group-get-new-news 10 2)
+;; (gnus-demon-init)
diff --git a/.local/share/mc/skins/gotar-mod.ini b/.local/share/mc/skins/gotar-mod.ini
index 3ad5ed5..316b7ea 100644
--- a/.local/share/mc/skins/gotar-mod.ini
+++ b/.local/share/mc/skins/gotar-mod.ini
@@ -41,7 +41,7 @@
 	_default_=brightcyan;default
 	dfocus=brightred;default
 	dhotnormal=brightred;
-	dhotfocus=yellow;default
+	dhotfocus=yellow;gray
 	dtitle=brightred;
 
 [error]
diff --git a/.mpdconf b/.mpdconf
index b6e6da4..4796044 100644
--- a/.mpdconf
+++ b/.mpdconf
@@ -78,7 +78,10 @@ state_file			"~/.mpd/state"
 # This setting can deny access to control of the daemon.
 #
 # For network
-#bind_to_address		"any"
+#bind_to_address		"127.0.0.1"
+#bind_to_address		"192.168.1.100"
+bind_to_address 		"any"
+
 #
 # And for Unix Socket
 #bind_to_address		"~/.mpd/socket"
@@ -170,7 +173,7 @@ auto_update	"yes"
 #
 # This setting specifies the permissions a user has who has not yet logged in. 
 #
-#default_permissions             "read,add,control,admin"
+#default_permissions             "read"
 #
 ###############################################################################
 
diff --git a/.ncmpcpp/config b/.ncmpcpp/config
index 26a6da6..7722cf9 100644
--- a/.ncmpcpp/config
+++ b/.ncmpcpp/config
@@ -15,7 +15,7 @@ mpd_music_dir = "/media/md-isk/Music"
 #
 #mpd_connection_timeout = "5"
 
-#execute_on_song_change = "notify-send -t 3000 -i \"/usr/share/icons/gnome/scalable/mimetypes/audio-x-generic-symbolic.svg\"  \"$(ncmpcpp --now-playing %t)\" \"$(ncmpcpp --now-playing '%b - %a')\""
+execute_on_song_change = "notify-send -t 3000 -i \"/usr/share/icons/gnome/scalable/mimetypes/audio-x-generic-symbolic.svg\"  \"$(ncmpcpp --now-playing %t)\" \"$(ncmpcpp --now-playing '%b - %a')\""
 playlist_display_mode = "columns"
 browser_display_mode = "columns"
 search_engine_display_mode = "columns"
diff --git a/.screenrc b/.screenrc
index eff3b7f..b387ffc 100644
--- a/.screenrc
+++ b/.screenrc
@@ -13,5 +13,8 @@ escape ^Tt
 # Switch to window 1 (irssi) *TODO*
 #screen -p select irssi
 
+# Use 256 colors
+terminfo rxvt-unicode 'Co#256:AB=\E[48;5;%dm:AF=\E[38;5;%dm'
+
 # Set hard status line
 hardstatus alwayslastline '%{gk}[ %{G}%H %{g}][%= %{wk}%?%-Lw%?%{=b kR}[%{W}%n%f %t%?(%u)%?%{=b kR}]%{= kw}%?%+Lw%?%?%=%{g}][%{Y}%l%{g}]%{=b C}[ %D %m/%d %C%a ]%{W}'
diff --git a/.xinitrc b/.xinitrc
index 57ee029..561cb3f 100755
--- a/.xinitrc
+++ b/.xinitrc
@@ -8,7 +8,7 @@
 
 # Usage: .xinitrc [window-manager] [session-type]
 #  where: window-manager is one of '(xmonad openbox stumpwm awesome pekwm)
-#         session-type is either "" or "remote"
+#         session-type is either "local" or "remote"; upon "" defaults to "local"
 
 # Runs system-wide xinitrc scripts
 if [ -d /etc/X11/xinit/xinitrc.d ]; then
@@ -41,7 +41,7 @@ function init_local_session() {
     #trayer --monitor 1 --edge top --align right --expand true --width 4 --height 2 --transparent true --tint 0x000000 &
     
     # Create variable GENERAL_SCREEN which is the pid of a screen called "general"
-    export GENERAL_SCREEN=`screen -ls | grep general | cut -f1 -d'.' | sed 's/\W//g'`
+    GENERAL_SCREEN=`screen -ls | grep general | cut -f1 -d'.' | sed 's/\W//g'`
     
     # Check to see if a general screen is already running
     if [ "x$GENERAL_SCREEN" == "x" ]; then
@@ -62,7 +62,7 @@ function init_remote_session() {
 }
 
 # Check the second cl parameter which denotes the session-type (E.g. remote, local)
-case $2 in
+case "$2" in
     # Remote session
     remote)
 	init_remote_session
@@ -77,23 +77,11 @@ esac
 # Check the first cl parameter which denotes the window-manager to use
 # Notice: in each case expression below "exec app" hands over execution to some app thus
 #          ceasing execution in this script so no "break" is required
-case $1 in
-    xmonad)
-	exec xmonad
-	;;
-    openbox)
-	exec ck-launch-session openbox
-	;;
-    stumpwm)
-	exec stumpwm
-	;;
-    awesome)
-	exec awesome
-	;;
-    pekwm)
-	exec pekwm
+case "$1" in
+    xmonad|openbox|stumpwm|awesome|pekwm)
+	exec "$1"
 	;;
     *)
-	exec $DEFAULT_WM
+	exec "$DEFAULT_WM"
 	;;
 esac
diff --git a/.xmonad/xmonad.hs b/.xmonad/xmonad.hs
index 80549e1..8d7c187 100644
--- a/.xmonad/xmonad.hs
+++ b/.xmonad/xmonad.hs
@@ -392,7 +392,7 @@ myManageHook = composeAll
     , resource =? "opennx" --> doMaxFloat
     , resource =? "Steam" --> doCenterFloat
     , title =? "Xnest" --> doCenterFloat
-    , resource =? "pavucontrol" --> doFullFloat
+    , resource =? "pavucontrol" --> doMaxFloat
     , resource =? "emacs-scratch" --> doMaxFloat
     , resource =? "mc-scratch" --> doMaxFloat
     , resource =? "qemu-system-x86_64" --> doFullFloat
diff --git a/.zshrc b/.zshrc
index 1073380..704b7d4 100644
--- a/.zshrc
+++ b/.zshrc
@@ -20,6 +20,13 @@ bindkey -e
 # Check for an interactive session
 [ -z "$PS1" ] && return
 
+# A small helper function to disable unclutter before running a command
+function disable_unclutter_run() {
+    systemctl --user stop unclutter
+    eval "$*"
+    systemctl --user start unclutter
+}
+
 # Alias' to make command output prettier (use color with some commands by default)
 alias ls='ls --color=auto'
 alias grep='grep --color=auto'
@@ -34,7 +41,7 @@ alias skreen='screen -c /dev/null'
 alias tranr='transmission-remote'
 alias ctlu='systemctl --user'
 alias sctl='sudo systemctl'
-alias qemu='qemu-system-x86_64 -enable-kvm'
+alias qemu='disable_unclutter_run qemu-system-x86_64 -enable-kvm'
 alias s='sudo'
 
 # Shortcuts for port-knocking on rekahsoft-mini *DEPRECIATED*
@@ -52,6 +59,12 @@ export LESS=' -R '
 # Set text/background colors for ls
 export LS_COLORS="di=01;37"
 
+# Set language * seems to be fixed by setting 256 color in .screerc)
+# Note: Breaks screen (characters show up incorrectly for ncmpcpp, alsamixer, perhaps others)
+# TODO: investigate and when solution found don't forget to port into ~/.bashrc
+# export LANG="en_US.UTF-8"
+# export LC_MESSAGES="C"
+
 PS1="[%n@%M: %~]%% "
 
 # Turn off noscroll