diff --git a/Xresources b/Xresources
index c57ce7c..3c870ed 100644
--- a/Xresources
+++ b/Xresources
@@ -1,134 +1,86 @@
 ! General
 
-!Xft.antialias: false
-!Xft.dpi: 80
-!Xft.rgba: rgb
-!Xft*font:             Tamsynmod:Regular:pixelsize=14
-!Xft*font:             Regular:pixelsize=14
-
-! dzen2
-dzen2*foreground:       #ffffff
-dzen2*background:       #000000
-!dzen2*font:            -*-fixed-*-*-*-*-10-*-*-*-*-*-*-*
-!dzen2*font:             Tamsynmod:Regular:pixelsize=14
+! rofi
+rofi.font: Iosevka, Regular, 8
+rofi.padding: 12
+rofi.separator-style: none
+rofi.color-enabled: true
+rofi.color-window: #bb000000
+rofi.color-normal: #00000000, #ffffff, #22000000, #88ffffff, #000000
+rofi.color-active: #44000000, #ffffff, #66000000, #44000000, #ffffff
+rofi.hide-scrollbar: true
 
 ! urxvt
+urxvt*internalBorder:   12
 urxvt*loginShell:       true
 urxvt*scrollBar:        false
 urxvt*secondaryScroll:  true
 urxvt*saveLines:        65535
 urxvt*cursorBlink:      false
 urxvt*urgentOnBell:     true
-urxvt*urlLauncher:      /usr/bin/luakit
+urxvt*urlLauncher:      firefox
 urxvt*termName:         rxvt-unicode-256color
-!urxvt*font:             -*-fixed-*-*-*-*-14-*-*-*-*-*-*-*
-!urxvt*boldFont:         -*-fixed-*-*-*-*-14-*-*-*-*-*-*-*
-!urxvt*font:             xft:Tamsyn:Regular:pixelsize=14,xft:Inconsolata for Powerline:Regular:pixelsize=14
-!urxvt*boldFont:         xft:Tamsyn:Bold:pixelsize=14,xft:Inconsolata for Powerline:Bold:pixelsize=14
-urxvt*font:             -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
-urxvt*boldFont:             -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
+! urxvt*font:             xft:Tamsyn:Regular:pixelsize=14,xft:Inconsolata for Powerline:Regular:pixelsize=14
+! urxvt*boldFont:         xft:Tamsyn:Bold:pixelsize=14,xft:Inconsolata for Powerline:Bold:pixelsize=14
 
 ! Colors
 urxvt*depth:            32
 urxvt*foreground:       #ffffff
 urxvt*background:       rgba:0000/0000/0000/cccc
 
-!*color0:  #1c1c1c
-!*color8:  #3d3a3a
-!*color1:  #d770af
-!*color9:  #d28abf
-!*color2 : #9acc79
-!*color10: #8fb676
-!*color3:  #d0d26b
-!*color11: #c8bc45
-!*color4 : #77b6c5
-!*color12: #8fa7b9
-!*color5:  #a488d9
-!*color13: #bd89de
-!*color6:  #7fcab3
-!*color14: #6ec2a8
-!*color7:  #8d8d8d
-!*color15: #dad3d3
-
-!! drop in Solarized colorscheme for Xresources
-!!
-!! ## Installation
-!! 1) Write to $HOME/.Xresources
-!! 2) If not using Xsession, you must add the line `xrdb -merge ~/.Xresources`
-!!    to `.xinitrc`. See http://manpages.ubuntu.com/Xsession for more details.
-!!
-!!SOLARIZED HEX     16/8 TERMCOL  XTERM/HEX   L*A*B      RGB         HSB
-!!--------- ------- ---- -------  ----------- ---------- ----------- -----------
-!!base03    #002b36  8/4 brblack  234 #1c1c1c 15 -12 -12   0  43  54 193 100  21
-!!base02    #073642  0/4 black    235 #262626 20 -12 -12   7  54  66 192  90  26
-!!base01    #586e75 10/7 brgreen  240 #585858 45 -07 -07  88 110 117 194  25  46
-!!base00    #657b83 11/7 bryellow 241 #626262 50 -07 -07 101 123 131 195  23  51
-!!base0     #839496 12/6 brblue   244 #808080 60 -06 -03 131 148 150 186  13  59
-!!base1     #93a1a1 14/4 brcyan   245 #8a8a8a 65 -05 -02 147 161 161 180   9  63
-!!base2     #eee8d5  7/7 white    254 #e4e4e4 92 -00  10 238 232 213  44  11  93
-!!base3     #fdf6e3 15/7 brwhite  230 #ffffd7 97  00  10 253 246 227  44  10  99
-!!yellow    #b58900  3/3 yellow   136 #af8700 60  10  65 181 137   0  45 100  71
-!!orange    #cb4b16  9/3 brred    166 #d75f00 50  50  55 203  75  22  18  89  80
-!!red       #dc322f  1/1 red      160 #d70000 50  65  45 220  50  47   1  79  86
-!!magenta   #d33682  5/5 magenta  125 #af005f 50  65 -05 211  54 130 331  74  83
-!!violet    #6c71c4 13/5 brmagenta 61 #5f5faf 50  15 -45 108 113 196 237  45  77
-!!blue      #268bd2  4/4 blue      33 #0087ff 55 -10 -45  38 139 210 205  82  82
-!!cyan      #2aa198  6/6 cyan      37 #00afaf 60 -35 -05  42 161 152 175  74  63
-!!green     #859900  2/2 green     64 #5f8700 60 -20  65 133 153   0  68 100  60
-
-#define S_base03        #002b36
-#define S_base02        #073642
-#define S_base01        #586e75
-#define S_base00        #657b83
-#define S_base0         #839496
-#define S_base1         #93a1a1
-#define S_base2         #eee8d5
-#define S_base3         #fdf6e3
-#define S_yellow        #b58900
-#define S_orange        #cb4b16
-#define S_red           #dc322f
-#define S_magenta       #d33682
-#define S_violet        #6c71c4
-#define S_blue          #268bd2
-#define S_cyan          #2aa198
-#define S_green         #859900
-
-!*background:            S_base03
-!*foreground:            S_base0
-*fading:                40
-*fadeColor:             S_base03
-*cursorColor:           S_base1
-*pointerColorBackground:S_base01
-*pointerColorForeground:S_base1
-
-!! black dark/light
-*color0:                S_base02
-*color8:                S_base03
-
-!! red dark/light
-*color1:                S_red
-*color9:                S_orange
-
-!! green dark/light
-*color2:                S_green
-*color10:               S_base01
-
-!! yellow dark/light
-*color3:                S_yellow
-*color11:               S_base00
-
-!! blue dark/light
-*color4:                S_blue
-*color12:               S_base0
-
-!! magenta dark/light
-*color5:                S_magenta
-*color13:               S_violet
-
-!! cyan dark/light
-*color6:                S_cyan
-*color14:               S_base1
-
-!! white dark/light
-*color7:                S_base2
-*color15:               S_base3
+! #define S_base03        #002b36
+! #define S_base02        #073642
+! #define S_base01        #586e75
+! #define S_base00        #657b83
+! #define S_base0         #839496
+! #define S_base1         #93a1a1
+! #define S_base2         #eee8d5
+! #define S_base3         #fdf6e3
+! #define S_yellow        #b58900
+! #define S_orange        #cb4b16
+! #define S_red           #dc322f
+! #define S_magenta       #d33682
+! #define S_violet        #6c71c4
+! #define S_blue          #268bd2
+! #define S_cyan          #2aa198
+! #define S_green         #859900
+! 
+! !*background:            S_base03
+! !*foreground:            S_base0
+! *fading:                40
+! *fadeColor:             S_base03
+! *cursorColor:           S_base1
+! *pointerColorBackground:S_base01
+! *pointerColorForeground:S_base1
+! 
+! !! black dark/light
+! *color0:                S_base02
+! *color8:                S_base03
+! 
+! !! red dark/light
+! *color1:                S_red
+! *color9:                S_orange
+! 
+! !! green dark/light
+! *color2:                S_green
+! *color10:               S_base01
+! 
+! !! yellow dark/light
+! *color3:                S_yellow
+! *color11:               S_base00
+! 
+! !! blue dark/light
+! *color4:                S_blue
+! *color12:               S_base0
+! 
+! !! magenta dark/light
+! *color5:                S_magenta
+! *color13:               S_violet
+! 
+! !! cyan dark/light
+! *color6:                S_cyan
+! *color14:               S_base1
+! 
+! !! white dark/light
+! *color7:                S_base2
+! *color15:               S_base3
diff --git a/polybar b/polybar
new file mode 100644
index 0000000..447f3e7
--- /dev/null
+++ b/polybar
@@ -0,0 +1,317 @@
+;=====================================================
+;
+;   To learn more about how to configure Polybar
+;   go to https://github.com/jaagr/polybar
+;
+;   The README contains alot of information
+;
+;=====================================================
+
+[colors]
+;background = ${xrdb:color0:#222}
+background = #88000000
+background-alt = #444
+;foreground = ${xrdb:color7:#222}
+foreground = #dfdfdf
+foreground-alt = #aaa
+primary = #ffb52a
+secondary = #e60053
+alert = #bd2c40
+
+[bar/top]
+;monitor = ${env:MONITOR:HDMI-1}
+width = 100%
+height = 25
+;offset-x = 1%
+;offset-y = 1%
+radius = 0.0
+fixed-center = false
+
+background = ${colors.background}
+foreground = ${colors.foreground}
+
+line-size = 2
+line-color = #f00
+
+border-size = 0
+border-color = #00000000
+
+padding-left = 0
+padding-right = 2
+
+module-margin-left = 1
+module-margin-right = 1
+
+font-0 = Iosevka:fontformat=truetype:size=8:antialias=false;0
+font-1 = fixed:pixelsize=10;1
+font-2 = unifont:fontformat=truetype:size=8:antialias=false;0
+font-3 = siji:pixelsize=10;1
+
+modules-left = workspace xwindow
+modules-center = 
+modules-right = filesystem volume xkeyboard memory cpu wlan eth battery temperature date powermenu
+
+tray-position = right
+tray-padding = 2
+;tray-transparent = true
+;tray-background = #0063ff
+
+;wm-restack = bspwm
+;wm-restack = i3
+
+;override-redirect = true
+
+;scroll-up = bspwm-desknext
+;scroll-down = bspwm-deskprev
+
+;scroll-up = i3wm-wsnext
+;scroll-down = i3wm-wsprev
+
+[module/xwindow]
+type = internal/xwindow
+label = %title:0:30:...%
+
+[module/xkeyboard]
+type = internal/xkeyboard
+blacklist-0 = num lock
+
+format-prefix = " "
+format-prefix-foreground = ${colors.foreground-alt}
+format-prefix-underline = ${colors.secondary}
+
+label-layout = %layout%
+label-layout-underline = ${colors.secondary}
+
+label-indicator-padding = 2
+label-indicator-margin = 1
+label-indicator-background = ${colors.secondary}
+label-indicator-underline = ${colors.secondary}
+
+[module/filesystem]
+type = internal/fs
+interval = 25
+
+mount-0 = /
+
+label-mounted = %{F#0a81f5}%mountpoint%%{F-}: %percentage_used%%
+label-unmounted = %mountpoint% not mounted
+label-unmounted-foreground = ${colors.foreground-alt}
+
+[module/workspace]
+type = internal/xworkspaces
+
+label-active = %icon% %name%
+label-active-background = ${colors.background-alt}
+label-active-foreground = ${colors.foreground}
+label-active-underline = ${colors.primary}
+label-active-padding = 2
+
+label-occupied = %index%
+label-occupied-padding = 2
+label-occupied-foreground = ${colors.foreground}
+
+label-urgent = %index%!
+label-urgent-background = ${colors.alert}
+label-urgent-foreground = ${colors.foreground}
+label-urgent-padding = 2
+
+label-empty = %index%
+label-empty-foreground = ${colors.foreground-alt}
+label-empty-padding = 2
+
+[module/mpd]
+type = internal/mpd
+format-online = <label-song>  <icon-prev> <icon-stop> <toggle> <icon-next>
+
+icon-prev = 
+icon-stop = 
+icon-play = 
+icon-pause = 
+icon-next = 
+
+label-song-maxlen = 25
+label-song-ellipsis = true
+
+[module/cpu]
+type = internal/cpu
+interval = 2
+format-prefix = " "
+format-prefix-foreground = ${colors.foreground-alt}
+format-underline = #f90000
+label = %percentage%%
+
+[module/memory]
+type = internal/memory
+interval = 2
+format-prefix = " "
+format-prefix-foreground = ${colors.foreground-alt}
+format-underline = #4bffdc
+label = %percentage_used%%
+
+[module/wlan]
+type = internal/network
+interface = wlp5s0
+interval = 3.0
+
+format-connected = <ramp-signal> <label-connected>
+format-connected-underline = #9f78e1
+label-connected = %essid%
+
+format-disconnected =
+;format-disconnected = <label-disconnected>
+;format-disconnected-underline = ${self.format-connected-underline}
+;label-disconnected = %ifname% disconnected
+;label-disconnected-foreground = ${colors.foreground-alt}
+
+ramp-signal-0 = 
+ramp-signal-1 = 
+ramp-signal-2 = 
+ramp-signal-3 = 
+ramp-signal-4 = 
+ramp-signal-foreground = ${colors.foreground-alt}
+
+[module/eth]
+type = internal/network
+interface = enp0s31f6
+interval = 3.0
+
+format-connected-underline = #55aa55
+format-connected-prefix = " "
+format-connected-prefix-foreground = ${colors.foreground-alt}
+label-connected = %local_ip%
+
+format-disconnected =
+;format-disconnected = <label-disconnected>
+;format-disconnected-underline = ${self.format-connected-underline}
+;label-disconnected = %ifname% disconnected
+;label-disconnected-foreground = ${colors.foreground-alt}
+
+[module/date]
+type = internal/date
+interval = 5
+
+date =
+date-alt = " %Y-%m-%d"
+
+time = %H:%M
+time-alt = %H:%M:%S
+
+format-prefix = 
+format-prefix-foreground = ${colors.foreground-alt}
+format-underline = #0a6cf5
+
+label = %date% %time%
+
+[module/volume]
+type = internal/volume
+
+format-volume = <label-volume> <bar-volume>
+label-volume = VOL
+label-volume-foreground = ${root.foreground}
+
+format-muted-prefix = " "
+format-muted-foreground = ${colors.foreground-alt}
+label-muted = sound muted
+
+bar-volume-width = 10
+bar-volume-foreground-0 = #55aa55
+bar-volume-foreground-1 = #55aa55
+bar-volume-foreground-2 = #55aa55
+bar-volume-foreground-3 = #55aa55
+bar-volume-foreground-4 = #55aa55
+bar-volume-foreground-5 = #f5a70a
+bar-volume-foreground-6 = #ff5555
+bar-volume-gradient = false
+bar-volume-indicator = |
+bar-volume-indicator-font = 2
+bar-volume-fill = ─
+bar-volume-fill-font = 2
+bar-volume-empty = ─
+bar-volume-empty-font = 2
+bar-volume-empty-foreground = ${colors.foreground-alt}
+
+[module/battery]
+type = internal/battery
+battery = BAT0
+adapter = ADP1
+full-at = 98
+
+format-charging = <animation-charging> <label-charging>
+format-charging-underline = #ffb52a
+
+format-discharging = <ramp-capacity> <label-discharging>
+format-discharging-underline = ${self.format-charging-underline}
+
+format-full-prefix = " "
+format-full-prefix-foreground = ${colors.foreground-alt}
+format-full-underline = ${self.format-charging-underline}
+
+ramp-capacity-0 = 
+ramp-capacity-1 = 
+ramp-capacity-2 = 
+ramp-capacity-foreground = ${colors.foreground-alt}
+
+animation-charging-0 = 
+animation-charging-1 = 
+animation-charging-2 = 
+animation-charging-foreground = ${colors.foreground-alt}
+animation-charging-framerate = 750
+
+[module/temperature]
+type = internal/temperature
+thermal-zone = 0
+warn-temperature = 60
+
+format = <ramp> <label>
+format-underline = #f50a4d
+format-warn = <ramp> <label-warn>
+format-warn-underline = ${self.format-underline}
+
+label = %temperature%
+label-warn = %temperature%
+label-warn-foreground = ${colors.secondary}
+
+ramp-0 = 
+ramp-1 = 
+ramp-2 = 
+ramp-foreground = ${colors.foreground-alt}
+
+[module/powermenu]
+type = custom/menu
+
+format-spacing = 1
+
+label-open = 
+label-open-foreground = ${colors.secondary}
+label-close =  cancel
+label-close-foreground = ${colors.secondary}
+label-separator = |
+label-separator-foreground = ${colors.foreground-alt}
+
+menu-0-0 = reboot
+menu-0-0-exec = menu-open-1
+menu-0-1 = power off
+menu-0-1-exec = menu-open-2
+
+menu-1-0 = cancel
+menu-1-0-exec = menu-open-0
+menu-1-1 = reboot
+menu-1-1-exec = sudo reboot
+
+menu-2-0 = power off
+menu-2-0-exec = sudo poweroff
+menu-2-1 = cancel
+menu-2-1-exec = menu-open-0
+
+[settings]
+screenchange-reload = true
+;compositing-background = xor
+;compositing-background = screen
+;compositing-foreground = source
+;compositing-border = over
+
+[global/wm]
+margin-top = 5
+margin-bottom = 5
+
+; vim:ft=dosini
diff --git a/symlinks.sh b/symlinks.sh
index 0c37e2e..8b01eb0 100644
--- a/symlinks.sh
+++ b/symlinks.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 rm ~/.zshrc; ln -s ~/dotfiles/zshrc ~/.zshrc
+rm -rf ~/.config/fish; mkdir -p ~/.config/fish; ln -s ~/dotfiles/config.fish ~/.config/fish/config.fish
 rm ~/.gemrc; ln -s ~/dotfiles/gemrc ~/.gemrc
 rm -rf ~/.ghc; mkdir ~/.ghc; ln -s ~/dotfiles/ghci.conf ~/.ghc/ghci.conf
 rm ~/.gitconfig; ln -s ~/dotfiles/gitconfig ~/.gitconfig
@@ -25,9 +26,9 @@ rm -rf ~/.khdrc; ln -s ~/dotfiles/khdrc ~/.khdrc
 touch ~/.hushlogin
 
 # linux only
-rm -rf ~/.i3; mkdir ~/.i3; ln -s ~/dotfiles/i3/config ~/.i3/config
 rm -rf ~/.Xresources; ln -s ~/dotfiles/Xresources ~/.Xresources
-rm -rf ~/.xinitrc; ln -s ~/dotfiles/xinitrc ~/.xinitrc
+rm -rf ~/.xmonad; mkdir ~/.xmonad; ln -s ~/dotfiles/xmonad.hs ~/.xmonad/xmonad.hs
+rm -rf ~/.config/polybar; mkdir -p ~/.config/polybar; ln -s ~/dotfiles/polybar ~/.config/polybar/config
 
 # Vim
 rm ~/.vimrc; ln -s ~/dotfiles/vimrc ~/.vimrc
diff --git a/xmonad.hs b/xmonad.hs
new file mode 100644
index 0000000..91f65b2
--- /dev/null
+++ b/xmonad.hs
@@ -0,0 +1,33 @@
+module Main where
+
+import XMonad
+import XMonad.Hooks.EwmhDesktops (ewmh)
+import XMonad.Hooks.ManageDocks
+import XMonad.Layout.Spacing
+import XMonad.Util.EZConfig
+import System.Taffybar.Hooks.PagerHints (pagerHints)
+
+lightBlue = "#66aaff"
+
+main = xmonad $ docks $ ewmh $ pagerHints defaultConfig
+    { terminal = "urxvt"
+    , modMask = mod4Mask
+    , workspaces = [ "1", "2", "3" ]
+    , borderWidth = 2
+    , normalBorderColor = "#000000"
+    , focusedBorderColor = lightBlue
+    , focusFollowsMouse = False
+    , layoutHook = avoidStruts $ spacingWithEdge 6 $ layoutHook defaultConfig
+    , startupHook = do
+        spawn "pkill polybar; polybar top &"
+        spawn "compton"
+        spawn "xsetroot -solid black -cursor_name left_ptr"
+        spawn "feh --bg-fill ~/Sync/Pictures/Wallpaper/space2.jpg"
+    }
+    `additionalKeysP`
+    [ ("M1-<Space>", spawn "rofi -show combi")
+    , ("M-p", spawn "rofi -show combi")
+    , ("<XF86AudioMute>", spawn "amixer set Master toggle")
+    , ("<XF86AudioLowerVolume>", spawn "amixer -q sset Master 5%-")
+    , ("<XF86AudioRaiseVolume>", spawn "amixer -q sset Master 5%+")
+    ]