diff --git a/.Xresources b/.Xresources
index a4c829d..720b4fb 100644
--- a/.Xresources
+++ b/.Xresources
@@ -2,39 +2,45 @@
 ! Author: Collin J. Doering
 ! Date: Jan 18, 2014
 
+! Xterm Options
+XTerm*reverseVideo: on
+xterm*bellIsUrgent: true
+xterm*faceName: Terminus-12:antialias=false
+xterm*font: 7x13
+
 ! Smyck color scheme (http://color.smyck.org/)
 ! Black
-URxvt.color0: #000000
+*.color0: #000000
 ! Red
-URxvt.color1: #C75646
+*.color1: #C75646
 ! Green
-URxvt.color2: #8EB33B
+*.color2: #8EB33B
 ! Yellow
-URxvt.color3: #D0B03C
+*.color3: #D0B03C
 ! Blue
-URxvt.color4: #72B3CC
+*.color4: #72B3CC
 ! Purple
-URxvt.color5: #C8A0D1
+*.color5: #C8A0D1
 ! Cyan
-URxvt.color6: #218693
+*.color6: #218693
 ! White
-URxvt.color7: #B0B0B0
+*.color7: #B0B0B0
 ! Grey
-URxvt.color8: #5D5D5D
+*.color8: #5D5D5D
 ! Light Red
-URxvt.color9: #E09690
+*.color9: #E09690
 ! Light Green
-URxvt.color10: #CDEE69
+*.color10: #CDEE69
 ! Light Yellow
-URxvt.color11: #FFE377
+*.color11: #FFE377
 ! Light Blue
-URxvt.color12: #9CD9F0
+*.color12: #9CD9F0
 ! Light Purple    
-URxvt.color13: #FBB1F9
+*.color13: #FBB1F9
 ! Light Cyan
-URxvt.color14: #77DFD8
+*.color14: #77DFD8
 ! Light white
-URxvt.color15: #F8F8F8
+*.color15: #F8F8F8
 
 ! General URxvt visual options
 URxvt.buffered:           true
diff --git a/.config/dunst/dunstrc b/.config/dunst/dunstrc
index 9fcd105..2e99850 100644
--- a/.config/dunst/dunstrc
+++ b/.config/dunst/dunstrc
@@ -123,8 +123,8 @@
     browser = /usr/bin/conkeror
 
 [frame]
-    width = 3
-    color = "#aaaaaa"
+    width = 1
+    color = "#2fed55"
 
 [shortcuts]
     # shortcuts are specified as [modifier+][modifier+]...key
@@ -148,24 +148,18 @@
 [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"
-    background = "#073642"
+    background = "#3b615d"
     foreground = "#93a1a1"
-    timeout = 10
+    timeout = 5
 
 [urgency_normal]
-    #background = "#285577"
-    #foreground = "#ffffff"
-    background = "#002b36"
-    foreground = "#839496"
+    background = "#38A69A"
+    foreground = "#000000"
     timeout = 10
 
 [urgency_critical]
-    #background = "#900000"
-    #foreground = "#ffffff"
     background = "#dc322f"
-    foreground = "#002b36"
+    foreground = "#000000"
     timeout = 0
 
 
diff --git a/.config/mc/ini b/.config/mc/ini
index 5077d9a..b02a749 100644
--- a/.config/mc/ini
+++ b/.config/mc/ini
@@ -115,7 +115,7 @@ free_space=1
 
 horizontal_split=0
 vertical_equal=1
-left_panel_size=58
+left_panel_size=70
 horizontal_equal=1
 top_panel_size=27
 
diff --git a/.config/zathura/zathurarc b/.config/zathura/zathurarc
new file mode 100644
index 0000000..dee1c93
--- /dev/null
+++ b/.config/zathura/zathurarc
@@ -0,0 +1,5 @@
+set pages-per-row 2
+
+map [normal] 1 set "pages-per-row 1"
+map [normal] 2 set "pages-per-row 2"
+map [normal] 3 set "pages-per-row 3"
diff --git a/.mpdconf b/.mpdconf
index 83e1585..3c50bb1 100644
--- a/.mpdconf
+++ b/.mpdconf
@@ -10,7 +10,7 @@
 # be disabled and audio files will only be accepted over ipc socket (using
 # file:// protocol) or streaming files over an accepted protocol.
 #
-music_directory		"/media/dm/Music"
+music_directory		"/media/dm-sup/Music"
 #
 # This setting sets the MPD internal playlist directory. The purpose of this
 # directory is storage for playlists created by MPD. The server will use 
diff --git a/.ncmpcpp/config b/.ncmpcpp/config
index 94dac96..ccceeaa 100644
--- a/.ncmpcpp/config
+++ b/.ncmpcpp/config
@@ -11,11 +11,11 @@ mpd_host = "patchMeIn@localhost"
 #
 mpd_port = "6600"
 #
-mpd_music_dir = "/media/dm/Music"
+mpd_music_dir = "/media/dm-sup/Music"
 #
 #mpd_connection_timeout = "5"
 
-execute_on_song_change = "notify-send -t 3000 \"$(ncmpcpp --now-playing  '{%t\n%b - %a}|{%f}')\""
+execute_on_song_change = "notify-send -t 3000 \"$(ncmpcpp --now-playing '{%t\n%b - %a}|{%f}')\""
 playlist_display_mode = "columns"
 browser_display_mode = "columns"
 search_engine_display_mode = "columns"
diff --git a/.xinitrc b/.xinitrc
index 54c934f..58b9c3b 100755
--- a/.xinitrc
+++ b/.xinitrc
@@ -21,6 +21,9 @@ fi
 # Set the default curson used by all WM's
 xsetroot -cursor_name left_ptr
 
+# Allow swithing to/from US qwerty and dvorak layouts
+setxkbmap -layout us,us -variant ,dvorak -option grp:sclk_toggle
+
 # Initialize a local desktop session (run generic helper applications)
 function init_local_session() {
     # Set a desktop background
diff --git a/.xmonad/xmonad.hs b/.xmonad/xmonad.hs
index 9ac4966..6fb7128 100644
--- a/.xmonad/xmonad.hs
+++ b/.xmonad/xmonad.hs
@@ -46,7 +46,8 @@ import XMonad.Layout.WindowNavigation
 import XMonad.Layout.BoringWindows
 import XMonad.Layout.Tabbed
 import XMonad.Layout.Circle
-
+import XMonad.Layout.Spacing
+  
 import XMonad.Hooks.ManageDocks
 import XMonad.Hooks.DynamicLog
 import XMonad.Hooks.UrgencyHook
@@ -67,7 +68,7 @@ myFocusFollowsMouse = False
  
 -- Width of the window border in pixels.
 --
-myBorderWidth   = 3
+myBorderWidth   = 2
  
 -- modMask lets you specify which modkey you want to use. The default
 -- is mod1Mask ("left alt").  You may also consider using mod3Mask
@@ -112,8 +113,8 @@ myWorkspaces    = ["1:general","2:hack","3:code","4:prog","5:web","6:com","7:net
  
 -- Border colors for unfocused and focused windows, respectively.
 --
-myNormalBorderColor  = "#dddddd"
-myFocusedBorderColor = "#ff0000"
+myNormalBorderColor  = "#3B615D" -- "#dddddd"
+myFocusedBorderColor = "#2FED55" -- "#ff0000"
  
 ------------------------------------------------------------------------
 -- Key bindings. Add, modify or remove key bindings here.
@@ -335,7 +336,7 @@ myMouseBindings (XConfig {XMonad.modMask = modm}) = M.fromList $
 -- The available layouts.  Note that each layout is separated by |||,
 -- which denotes layout choice.
 --
-myLayout = smartBorders . avoidStruts $
+myLayout = smartSpacing 5 $ smartBorders . avoidStruts $
            toggleLayouts (noBorders Full) $
 -- for sublayouts but not currently used..see myGenericBindings above
 --           windowNavigation $ subTabbed $ boringWindows $