diff --git a/dotfiles/config/dunst/dunstrc b/dotfiles/config/dunst/dunstrc
index 9f776cb1..c58840ea 100644
--- a/dotfiles/config/dunst/dunstrc
+++ b/dotfiles/config/dunst/dunstrc
@@ -21,9 +21,6 @@
     horizontal_padding = 8
     separator_color = "#585858"
     startup_notification = false
-    # https://github.com/knopwob/dunst/issues/26#issuecomment-36159395
-    #icon_position = left
-    #icon_folders = /usr/share/icons/elementary/actions/16/
 
 [frame]
     width = 1
diff --git a/dotfiles/config/gtk-3.0/settings.ini b/dotfiles/config/gtk-3.0/settings.ini
index 699d27e5..98617029 100644
--- a/dotfiles/config/gtk-3.0/settings.ini
+++ b/dotfiles/config/gtk-3.0/settings.ini
@@ -1,11 +1,11 @@
 [Settings]
 gtk-key-theme-name=Emacs
 gtk-application-prefer-dark-theme=false
-gtk-theme-name=Adapta-Nokto-Eta
+gtk-theme-name=Paper
 gtk-fallback-icon-theme=gnome
 gtk-icon-theme-name=Numix
 gtk-font-name=Roboto 11
-gtk-cursor-theme-name=Adwaita
+gtk-cursor-theme-name=Paper
 gtk-cursor-theme-size=24
 gtk-toolbar-style=GTK_TOOLBAR_BOTH_HORIZ
 gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
diff --git a/dotfiles/config/systemd/user/wallpaper.service b/dotfiles/config/systemd/user/wallpaper.service
index 5e972ffb..e9fb1dd5 100644
--- a/dotfiles/config/systemd/user/wallpaper.service
+++ b/dotfiles/config/systemd/user/wallpaper.service
@@ -5,7 +5,7 @@ After=compton.service
 
 [Service]
 Type=simple
-ExecStart=/usr/bin/bash "wallpaper.sh"
+ExecStart=/usr/bin/env wallpaper.sh
 ExecStop=/usr/bin/pkill wallpaper.sh
 
 [Install]
diff --git a/dotfiles/emacs.d/README.org b/dotfiles/emacs.d/README.org
index 7c6e3070..ac6e1c2f 100644
--- a/dotfiles/emacs.d/README.org
+++ b/dotfiles/emacs.d/README.org
@@ -2448,8 +2448,10 @@ The following is taken from [[https://github.com/syl20bnr/spacemacs/blob/a650877
     (setq haskell-tags-on-save t)))
 #+END_SRC
 **** intero
+Intero seems to be causing hangs, so it has been disabled
 #+BEGIN_SRC emacs-lisp
 (use-package intero
+  :disabled t
   :demand t
   :after haskell-mode
   :config (add-hook 'haskell-mode-hook 'intero-mode))
@@ -3145,7 +3147,6 @@ This mode seems to be better maintained than plantuml-mode
 *** racket
 #+BEGIN_SRC emacs-lisp
 (use-package racket-mode
-  :bind (("C-r" . racket-run))
   :mode "\\.rkt\\'")
 #+END_SRC
 * Programming
diff --git a/dotfiles/lib/bin/system_password.sh b/dotfiles/lib/bin/system_password.sh
new file mode 100755
index 00000000..26df938f
--- /dev/null
+++ b/dotfiles/lib/bin/system_password.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+PASSWORD="$(keepasshttp.py --get -u "http://system.com" | jq '.[].password' | unescape.py)"
+sleep .1s
+xdotool type "$PASSWORD"
diff --git a/dotfiles/lib/python/unescape.py b/dotfiles/lib/python/unescape.py
index 1f251175..b0deb329 100755
--- a/dotfiles/lib/python/unescape.py
+++ b/dotfiles/lib/python/unescape.py
@@ -3,7 +3,7 @@ import sys
 
 
 def unescape(string):
-    print eval(string)
+    print(eval(string))
 
 
 if __name__ == '__main__':
diff --git a/dotfiles/xmonad/imalison-xmonad.cabal b/dotfiles/xmonad/imalison-xmonad.cabal
index 8e5556f2..4a6b3bd8 100644
--- a/dotfiles/xmonad/imalison-xmonad.cabal
+++ b/dotfiles/xmonad/imalison-xmonad.cabal
@@ -21,6 +21,9 @@ executable imalison-xmonad
   -- other-modules:       
   -- other-extensions:    
   build-depends:       base >=4.9 && <4.10,
-                       xmonad-contrib>=0.12
+                       xmonad-contrib>=0.12,
+                       X11>=1.6.1.2,
+                       xmonad>=0.12,
+                       taffybar>=0.4.6
   hs-source-dirs:      .
   default-language:    Haskell2010
diff --git a/dotfiles/xmonad/stack.yaml b/dotfiles/xmonad/stack.yaml
index f14ab04b..62a893b9 100644
--- a/dotfiles/xmonad/stack.yaml
+++ b/dotfiles/xmonad/stack.yaml
@@ -3,8 +3,9 @@ extra-package-dbs: []
 packages:
 - '.'
 extra-deps:
-- X11-xft-0.3.1
-- xmonad-contrib-0.12
+  - xmonad-contrib-0.12
+  - taffybar-0.4.6
+  - gtk-traymanager-0.1.6
 resolver: lts-7.0
 # For advanced use and comprehensive documentation of the format, please see:
 # http://docs.haskellstack.org/en/stable/yaml_configuration/
@@ -21,51 +22,3 @@ resolver: lts-7.0
 #  name: custom-snapshot
 #  location: "./custom-snapshot.yaml"
 resolver: lts-7.0
-
-# User packages to be built.
-# Various formats can be used as shown in the example below.
-# 
-# packages:
-# - some-directory
-# - https://example.com/foo/bar/baz-0.0.2.tar.gz
-# - location:
-#    git: https://github.com/commercialhaskell/stack.git
-#    commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a
-# - location: https://github.com/commercialhaskell/stack/commit/e7b331f14bcffb8367cd58fbfc8b40ec7642100a
-#   extra-dep: true
-#  subdirs:
-#  - auto-update
-#  - wai
-# 
-# A package marked 'extra-dep: true' will only be built if demanded by a
-# non-dependency (i.e. a user package), and its test suites and benchmarks
-# will not be run. This is useful for tweaking upstream packages.
-packages:
-- '.'
-# Dependency packages to be pulled from upstream that are not in the resolver
-# (e.g., acme-missiles-0.3)
-extra-deps: ["xmonad-contrib-0.12"]
-
-# Override default flag values for local packages and extra-deps
-flags: {}
-
-# Extra package databases containing global packages
-extra-package-dbs: []
-
-# Control whether we use the GHC we find on the path
-# system-ghc: true
-# 
-# Require a specific version of stack, using version ranges
-# require-stack-version: -any # Default
-# require-stack-version: ">=1.1"
-# 
-# Override the architecture used by stack, especially useful on Windows
-# arch: i386
-# arch: x86_64
-# 
-# Extra directories used by stack for building
-# extra-include-dirs: [/path/to/dir]
-# extra-lib-dirs: [/path/to/dir]
-# 
-# Allow a newer minor version of GHC than the snapshot specifies
-# compiler-check: newer-minor
diff --git a/dotfiles/xmonad/xmonad.hs b/dotfiles/xmonad/xmonad.hs
index ad1e6d0c..93535f12 100644
--- a/dotfiles/xmonad/xmonad.hs
+++ b/dotfiles/xmonad/xmonad.hs
@@ -4,6 +4,7 @@ import System.Taffybar.Hooks.PagerHints (pagerHints)
 import XMonad hiding ( (|||) )
 import XMonad.Actions.CycleWS
 import XMonad.Actions.WindowBringer
+import XMonad.Actions.WorkspaceNames
 import XMonad.Config ()
 import XMonad.Hooks.EwmhDesktops
 import XMonad.Hooks.ManageDocks
@@ -18,6 +19,7 @@ import XMonad.Layout.NoBorders
 import XMonad.Layout.Spacing
 import qualified XMonad.StackSet as W
 import XMonad.Util.CustomKeys
+import XMonad.Util.NamedWindows (getName)
 
 main = xmonad $ ewmh $ pagerHints def
        { modMask = mod4Mask
@@ -27,18 +29,31 @@ main = xmonad $ ewmh $ pagerHints def
        , logHook = myLogHook
        , handleEventHook = docksEventHook <+> fullscreenEventHook
        , startupHook = myStartup
-       , keys = customKeys (\x -> []) addKeys
+       , keys = customKeys (const []) addKeys
        }
 
-myLogHook :: X()
 myLogHook = fadeInactiveLogHook 0.9
 
+automaticallySetWorkspaceNames = do
+  ws <- gets windowset
+  mapM_ setWorkspaceNameToFocusedWindow (W.workspaces ws)
+        where setWorkspaceNameToFocusedWindow workspace = do
+                                   namedWindows <- mapM getName $ take 2 $ W.integrate' $ W.stack workspace
+                                   setWorkspaceName (W.tag workspace) (concatMap show namedWindows)
+
 shiftThenView i = W.greedyView i . W.shift i
 
+layouts = multiCol [1, 1] 2 0.01 (-0.5) ||| Full ||| Tall 1 (3/100) (1/2)
+
+myLayoutHook = avoidStruts . smartSpacing 10 . noBorders . minimize
+               . boringWindows . mkToggle (MIRROR ?? EOT) $ layouts
+
+myStartup = spawn "systemctl --user start wm.target"
+
 addKeys conf@XConfig {modMask = modm} =
     [ ((modm, xK_p), spawn "rofi -show drun")
     , ((modm .|. shiftMask, xK_p), spawn "rofi -show run")
-    , ((modm, xK_g), spawn "rofi -show window")
+    , ((modm, xK_g), gotoMenuArgs' "rofi" ["-dmenu"])
     , ((modm .|. controlMask, xK_t), spawn
        "systemctl --user restart taffybar.service")
     , ((modm, xK_b), bringMenuArgs' "rofi" ["-dmenu"])
@@ -53,6 +68,7 @@ addKeys conf@XConfig {modMask = modm} =
     , ((mod3Mask, xK_e), moveTo Next EmptyWS)
     , ((mod3Mask .|. shiftMask, xK_e), shiftTo Next EmptyWS)
     , ((mod3Mask, xK_v), spawn "copyq_rofi.sh")
+    , ((mod3Mask, xK_p), spawn "system_password.sh")
 
     -- playerctl
     , ((mod3Mask, xK_f), spawn "playerctl play-pause")
@@ -68,7 +84,9 @@ addKeys conf@XConfig {modMask = modm} =
     , ((0, xF86XK_AudioMute), spawn "pactl set-sink-mute 0 toggle")
     , ((mod3Mask, xK_w), spawn "pactl set-sink-volume 0 +05%")
     , ((mod3Mask, xK_s), spawn "pactl set-sink-volume 0 -05%")
+
     ] ++
+
     -- Replace original moving stuff around + greedy view bindings
     [((additionalMask .|. modm, key), windows $ function workspace)
          | (workspace, key) <- zip (workspaces conf) [xK_1 .. xK_9]
@@ -77,12 +95,6 @@ addKeys conf@XConfig {modMask = modm} =
              , (W.shift, shiftMask)
              , (shiftThenView, controlMask)]]
 
-layouts = multiCol [1, 1] 2 0.01 (-0.5) ||| Full ||| tiled
-          where
-            tiled = Tall 1 (3/100) (1/2)
-
-myLayoutHook = avoidStruts . smartSpacing 10 . noBorders . minimize
-               . boringWindows . mkToggle (MIRROR ?? EOT) $ layouts
-
-myStartup = do
-  spawn "systemctl --user start wm.target"
+-- Local Variables:
+-- flycheck-ghc-args: ("-Wno-missing-signatures")
+-- End:
diff --git a/tasks/arch.py b/tasks/arch.py
index 790d3585..df1100c0 100644
--- a/tasks/arch.py
+++ b/tasks/arch.py
@@ -20,19 +20,20 @@ PACKAGES = [
     "network-manager-applet", "feh", "copyq", "imagemagick", "rcm", "rofi",
     "cabal-install", "pavucontrol", "lsof", "fbset", "git-subrepo", "trayer",
     "ttf-font-awesome", "conky", "lemonbar", "razercfg", "xdotool", "xclip",
-    "udiskie", "strace", "emojione-color-font", "hub", "plantuml",
-    "noto-fonts-cjk", "adapta-gtk-theme", "numix-icon-theme-git", "jq",
-    "android-sdk-platform-tools", "android-sdk", "keepassx-http", "global",
-    "screencloud", "mopidy-spotify", "rcm", "xsettingsd-git", "aspell-en",
-    "festival", "festival-freebsoft-utils", "hsetroot", "imwheel", "remmina",
-    "racket", "xorg-utils", "playerctl", "pasystray", "dunst", "otf-fira-code",
+    "udiskie", "strace", "emojione-color-font", "hub", "plantuml", "jq",
+    "noto-fonts-cjk", "adapta-gtk-theme", "numix-icon-theme-git", "global",
+    "android-sdk-platform-tools", "android-sdk", "keepassx-http", "aspell-en",
+    "screencloud", "mopidy-spotify", "rcm", "xsettingsd-git", "festival",
+    "festival-freebsoft-utils", "hsetroot", "imwheel", "remmina", "racket",
+    "xorg-utils", "playerctl", "pasystray", "dunst", "otf-fira-code",
     "ttf-mac-fonts", "otf-hermit", "ttf-font-awesome", "ttf-monaco", "tcpdump",
-    "ngrep", "wireshark-gtk",
+    "ngrep", "wireshark-gtk", "teamviewer", "mopidy-podcast",
+    "kdegraphics-okular",
 ]
 
 
 SERVICES = [
-    "sshd.socket", "nvidia-persistenced.service", "NetworkManager.service",
+    "sshd.socket", "nvidia-persistenced.service", "NetworkManager.service", "teamviewerd.service",
 ]