diff --git a/apps/xdg/config/user-dirs.dirs b/apps/xdg/config/user-dirs.dirs
new file mode 100644
index 0000000..8a24058
--- /dev/null
+++ b/apps/xdg/config/user-dirs.dirs
@@ -0,0 +1,8 @@
+XDG_DESKTOP_DIR="$HOME"
+XDG_DOCUMENTS_DIR="$HOME"
+XDG_DOWNLOAD_DIR="$HOME/downloads"
+XDG_MUSIC_DIR="$HOME"
+XDG_PICTURES_DIR="$HOME"
+XDG_PUBLICSHARE_DIR="$HOME"
+XDG_TEMPLATES_DIR="$HOME"
+XDG_VIDEOS_DIR="$HOME"
diff --git a/cli/haskell/local/bin/hoogle b/cli/haskell/local/bin/hoogle
new file mode 100755
index 0000000..008101e
--- /dev/null
+++ b/cli/haskell/local/bin/hoogle
@@ -0,0 +1,5 @@
+#!/usr/bin/bash
+
+[[ ! -d ~/.local/share/hoogle/ ]] && ~/.cache/cabal/bin/hoogle generate --database ~/.local/share/hoogle/database
+
+~/.cache/cabal/bin/hoogle --database ~/.local/share/hoogle/database $@
diff --git a/nvim/nvim/config/nvim.ln/lua/user/plugins.lua b/nvim/nvim/config/nvim.ln/lua/user/plugins.lua
index 1292fd3..8e75c99 100644
--- a/nvim/nvim/config/nvim.ln/lua/user/plugins.lua
+++ b/nvim/nvim/config/nvim.ln/lua/user/plugins.lua
@@ -93,6 +93,7 @@ return packer.startup(function(use)
 	-- Telescope
 	use "nvim-telescope/telescope.nvim"
 	use "folke/trouble.nvim"
+	use "psiska/telescope-hoogle.nvim"
 
 	-- Treesitter
 	use {
diff --git a/nvim/nvim/config/nvim.ln/lua/user/telescope.lua b/nvim/nvim/config/nvim.ln/lua/user/telescope.lua
index 05d02ae..083c770 100644
--- a/nvim/nvim/config/nvim.ln/lua/user/telescope.lua
+++ b/nvim/nvim/config/nvim.ln/lua/user/telescope.lua
@@ -94,3 +94,4 @@ telescope.setup {
 		-- please take a look at the readme of the extension you want to configure
 	},
 }
+telescope.load_extension("hoogle")
diff --git a/nvim/nvim/config/nvim.ln/lua/user/whichkey.lua b/nvim/nvim/config/nvim.ln/lua/user/whichkey.lua
index d5a8cd5..5c56f5b 100644
--- a/nvim/nvim/config/nvim.ln/lua/user/whichkey.lua
+++ b/nvim/nvim/config/nvim.ln/lua/user/whichkey.lua
@@ -161,7 +161,8 @@ local mappings = {
 		name = "Search",
 		b = { "<cmd>Telescope git_branches<cr>", "Checkout branch" },
 		c = { "<cmd>Telescope colorscheme<cr>", "Colorscheme" },
-		h = { "<cmd>Telescope help_tags<cr>", "Find Help" },
+		h = { "<cmd>Telescope hoogle list<CR>", "Hoogle" },
+		H = { "<cmd>Telescope help_tags<cr>", "Find Help" },
 		M = { "<cmd>Telescope man_pages<cr>", "Man Pages" },
 		r = { "<cmd>Telescope oldfiles<cr>", "Open Recent File" },
 		R = { "<cmd>Telescope registers<cr>", "Registers" },
diff --git a/xmonad/xmonad/config/xmonad.ln/build b/xmonad/xmonad/config/xmonad.ln/build
new file mode 100755
index 0000000..d4cc610
--- /dev/null
+++ b/xmonad/xmonad/config/xmonad.ln/build
@@ -0,0 +1,4 @@
+#!/usr/bin/bash
+
+stack build
+cp -uf $(stack path --local-install-root)/bin/xmonad "$1"
diff --git a/xmonad/xmonad/config/xmonad.ln/src/Lemonbar.hs b/xmonad/xmonad/config/xmonad.ln/src/Lemonbar.hs
index 98a37a4..545bc44 100644
--- a/xmonad/xmonad/config/xmonad.ln/src/Lemonbar.hs
+++ b/xmonad/xmonad/config/xmonad.ln/src/Lemonbar.hs
@@ -1,4 +1,4 @@
-module Lemonbar where
+    module Lemonbar where
 import Data.List.Utils (replace)
 import XMonad.Hooks.DynamicLog (wrap)
 
@@ -38,7 +38,7 @@ lemonbarFormatOne fmt = case fmt of
     (Overline color)        -> wrap (bracket ("o" <> color) <> bracket "+o") (bracket "-o")
     (Font index)            -> wrap (bracket ("T" <> show index)) (bracket "T-")
     (Offset size)           -> (bracket ("O" <> show size) <>)
-    (Action button cmd)     -> wrap (bracket (format "A{}:{}:" (fromMouseButton button, escape ':' cmd)))
+    (Action button cmd)     -> wrap (bracket ("A" <> (show . fromMouseButton) button <> ":" <> escape ':' cmd <> ":"))
                                     (bracket "A")
     where
         escape :: Char -> String -> String
diff --git a/xmonad/xmonad/config/xmonad.ln/src/Main.hs b/xmonad/xmonad/config/xmonad.ln/src/Main.hs
index 7e9e520..802757c 100644
--- a/xmonad/xmonad/config/xmonad.ln/src/Main.hs
+++ b/xmonad/xmonad/config/xmonad.ln/src/Main.hs
@@ -2,35 +2,21 @@
 
 module Main where
 
-import Data.Maybe (mapMaybe)
-import GHC.IO.Handle (hClose, hDuplicateTo, Handle)
-import Data.List.Utils (split)
-import System.Posix.Process (getProcessID)
-import System.Posix.Types (CPid(..))
-import Text.Read (readMaybe, Lexeme (String))
-import Text.Printf (printf)
-
-import Lemonbar
-
 import XMonad
-import XMonad.Actions.Navigation2D (withNavigation2DConfig)
-import XMonad.Config.Dmwit (outputOf)
-import XMonad.Hooks.DynamicLog (dynamicLogWithPP, PP (..), wrap, shorten)
 import XMonad.Hooks.EwmhDesktops (ewmh, ewmhFullscreen)
 import XMonad.Hooks.ManageDocks (docks, avoidStruts)
-import XMonad.Hooks.StatusBar
-import XMonad.Hooks.StatusBar.PP
 import XMonad.Layout.Named (named)
 import XMonad.Layout.NoBorders (noBorders)
-import XMonad.Util.Run (spawnPipe)
-import XMonad.Util.Loggers
+import XMonad.Util.WorkspaceCompare (getSortByIndex)
+import XMonad.Hooks.StatusBar.PP (PP(..))
+import XMonad.Hooks.StatusBar (StatusBarConfig, statusBarPipe, dynamicSBs)
 
 
 main :: IO ()
 main = xmonad
-     . ewmhFullscreen
-     . ewmh
-     . docks
+     -- . ewmhFullscreen
+     -- . ewmh
+     -- . docks
      . polybarEnable
      $ xConfig
 
@@ -38,28 +24,53 @@ polybarEnable :: XConfig a -> XConfig a
 polybarEnable = dynamicSBs barSpawner
   where
     barSpawner :: ScreenId -> IO StatusBarConfig
-    barSpawner x = statusBarPipe (barScript x) (polyPP x)
+    barSpawner x = statusBarPipe (barScript x) (pure basicPP)
 
     barScript (S x) = "~/.config/polybar/launch.sh " ++ show x
 
-polyPP :: ScreenId -> X PP
-polyPP sid = pure $ def
-  { ppCurrent = lemonbarFormat [Background accent]
-  , ppExtras  = [logTitlesOnScreen sid formatFocused formatUnfocused]
-  --, ppSep     = magenta " • "
+basicPP :: PP
+basicPP = def
+  { ppSep = "  "
+  , ppWsSep = " "
+  , ppTitleSanitize = filter (`notElem` ['%','{','}'])
+  , ppOrder = layoutFirstOrder
+  , ppSort = getSortByIndex
+  , ppExtras = []
+  , ppOutput = const mempty
   }
- where
-  formatFocused, formatUnfocused :: String -> String
-  formatFocused   = wrap (white    "[") (white    "]") . magenta . ppWindow
-  formatUnfocused = wrap (lowWhite "[") (lowWhite "]") . blue    . ppWindow
+  where
+    layoutFirstOrder (workspaces : layout : title : extras) =
+      [layout] ++ extras ++ [workspaces, title]
+    layoutFirstOrder other = other
 
-  -- | Windows should have *some* title, which should not not exceed a
-  -- sane length.
-  ppWindow :: String -> String
-  ppWindow = xmobarRaw
-           . (\w -> if null w then "untitled" else w)
-           . shorten 30
-           . xmobarStrip
+-- polyPP :: ScreenId -> X PP
+-- polyPP sid = pure $ basicPP
+--   { ppCurrent = lemonbarFormat [ Foreground accent, Background white, Underline magenta ]
+--   , ppVisible = lemonbarFormat [ Foreground blue, Background white, Underline magenta ]
+--   , ppVisibleNoWindows = Just $
+--       lemonbarFormat [ Foreground blue, Background white, Underline magenta ]
+--   , ppHidden = lemonbarFormat [ Foreground blue, Underline magenta ]
+--   , ppHiddenNoWindows = lemonbarFormat [ Foreground magenta ]
+--   , ppUrgent = lemonbarFormat [ Foreground blue, Background magenta ]
+--   , ppTitle = lemonbarFormat [ Foreground blue ] . shorten 50
+--   , ppLayout = lemonbarFormat [ Foreground blue ]
+--   }
+--   -- { ppCurrent = lemonbarFormat [Background accent]
+--   -- -- , ppExtras  = [logTitlesOnScreen sid formatFocused formatUnfocused]
+--   -- --, ppSep     = magenta " • "
+--   -- }
+--  where
+--   -- formatFocused, formatUnfocused :: String -> String
+--   -- formatFocused   = wrap (white    "[") (white    "]") . magenta . ppWindow
+--   -- formatUnfocused = wrap (lowWhite "[") (lowWhite "]") . blue    . ppWindow
+
+  -- -- | Windows should have *some* title, which should not not exceed a
+  -- -- sane length.
+  -- ppWindow :: String -> String
+  -- ppWindow = xmobarRaw
+  --          . (\w -> if null w then "untitled" else w)
+  --          . shorten 30
+  --          . xmobarStrip