diff --git a/polybar/config.old b/polybar/config.old
deleted file mode 100644
index 20cd6e3..0000000
--- a/polybar/config.old
+++ /dev/null
@@ -1,563 +0,0 @@
-[colors]
-background = #c2171717
-foreground = #eee
-linecolor = #c2bf616a
-bordercolor = #ff252525
-accent = #c2bf616a
-
-[settings]
-screenchange-reload = true
-;throttle-output-for = 10
-;throttle-output = 5
-;throttle-input-for = 40
-
-;compositing-background = over
-;compositing-background = screen
-;compositing-foreground = xor
-;compositing-foreground = source
-;compositing-border = over
-
-[global/wm]
-margin-top = 0
-margin-bottom = 0
-
-[bar/top]
-enable-ipc = true
-monitor = ${env:MONITOR}
-width = 100%
-height = 22
-;radius = 5.0
-;fixed-center = false
-;override-redirect = true
-
-background = ${colors.background}
-foreground = ${colors.foreground}
-
-;background-0 = #333
-;background-1 = #222
-;background-2 = ${self.background-1}
-;background-3 = ${self.background-1}
-;background-4 = ${self.background-1}
-;background-5 = ${self.background-1}
-;background-6 = ${self.background-1}
-;background-7 = #111
-
-;line-color = ${colors.linecolor}
-;underline-size = 1
-;overline-size = 2
-
-;border-size = 5
-;border-color = 0
-;border-bottom-size = 0
-;border-bottom-size = 2
-;border-bottom-color = ${colors.bordercolor}
-
-padding-left = 1
-padding-right = 2
-module-margin-left = 1
-module-margin-right = 1
-
-font-0 = Ubuntu Mono:pixelsize=10;1
-font-1 = siji:pixelsize=20;1
-font-2 = FontAwesome:size=12;0
-
-modules-left = xwindow 
-;modules-center = mpd
-modules-center = i3
-modules-right = pavolume date  
-
-tray-position = right
-tray-padding = 4
-tray-maxsize = 18
-;tray-transparent = true
-;tray-detached = true
-;tray-offset-x = 50
-
-wm-restack = bspwm
-
-;dim-value = 0.2
-
-;click-left =
-;click-middle =
-;click-right =
-scroll-up = bspwm-deskprev
-scroll-down = bspwm-desknext
-;scroll-up = i3wm-wsnext
-;scroll-down = i3wm-wsprev
-;double-click-left = notify-send -u low doubleclick
-;double-click-right = notify-send -u low doubleclick2
-
-# bar/module specific vars
-bspwm-focused-overline = ${colors.linecolor}
-bspwm-focused-underline = #cc333333
-
-[bar/bottom]
-inherit = bar/top
-
-enable-ipc = true
-monitor = ${env:MONITOR:HDMI1}
-;monitor-fallback = eDP-1
-bottom = true
-;override-redirect = true
-
-underline-size = ${bar/top.overline-size}
-overline-size = ${bar/top.underline-size}
-
-;border-top-size = 2
-;border-top-color = ${colors.bordercolor}
-;border-bottom-size = 0
-
-modules-left = bspwm i3
-;modules-left =
-;modules-left = xwindow
-;modules-center = xwindow
-modules-center =
-modules-right = github fs-root date power-menu
-
-wm-restack = ${bar/top.wm-restack}
-
-tray-position = none
-
-# bar/module specific vars
-bspwm-focused-overline = #cc333333
-bspwm-focused-underline = ${colors.linecolor}
-
-#################################################################################
-#				MODULES						#
-#################################################################################
-[module/pavolume]
-type = custom/script
-tail = true
-label = %{F#666}%{F-} %output%
-exec = ~/.config/polybar/scripts/pavolume.sh --listen
-click-right = exec pavucontrol
-click-left = ~/.config/polybar/scripts/pavolume.sh --togmute
-scroll-up = ~/.config/polybar/scripts/pavolume.sh --up
-scroll-down = ~/.config/polybar/scripts/pavolume.sh --down
-
-[module/temperature]
-type = internal/temperature
-
-; Seconds to sleep between updates
-; Default: 1
-interval = 0.5
-
-; Thermal zone to use
-; To list all the zone types, run 
-; $ for i in /sys/class/thermal/thermal_zone*; do echo "$i: $(<$i/type)"; done
-; Default: 0
-thermal-zone = 0
-
-; Full path of temperature sysfs path
-; Use `sensors` to find preferred temperature source, then run
-; $ for i in /sys/class/hwmon/hwmon*/temp*_input; do echo "$(<$(dirname $i)/name): $(cat ${i%_*}_label 2>/dev/null || echo $(basename ${i%_*})) $(readlink -f $i)"; done
-; to find path to desired file
-; Default reverts to thermal zone setting
-hwmon-path = /sys/devices/platform/coretemp.0/hwmon/hwmon2/temp1_input
-
-; Base temperature for where to start the ramp (in degrees celsius)
-; Default: 0
-base-temperature = 20
-
-; Threshold temperature to display warning label (in degrees celsius)
-; Default: 80
-warn-temperature = 60
-; Whether or not to show units next to the temperature tokens (°C, °F)
-; Default: true
-units = false
-
-; Available tags:
-;   <label> (default)
-;   <ramp>
-format = <ramp> <label>
-
-; Available tags:
-;   <label-warn> (default)
-;   <ramp>
-format-warn = <ramp> <label-warn>
-
-; Available tokens:
-;   %temperature% (deprecated)
-;   %temperature-c%   (default, temperature in °C)
-;   %temperature-f%   (temperature in °F)
-label = %temperature-c%° C
-
-; Available tokens:
-;   %temperature% (deprecated)
-;   %temperature-c%   (default, temperature in °C)
-;   %temperature-f%   (temperature in °F)
-label-warn = %temperature-c%° C !
-label-warn-foreground = #f00
-
-; Requires the <ramp> tag
-; The icon selection will range from `base-temperature` to `warn-temperature`,
-; temperatures above `warn-temperature` will use the last icon
-; and temperatures below `base-temperature` will use `ramp-0`
-ramp-0 = Temp:
-ramp-1 = Temp:
-ramp-2 = Temp:
-ramp-foreground = #55
-
-[module/github]
-type = internal/github
-token = ${file:/home/elal/.git-token}
-
-;empty-notifications = true
-
-label = %{A1:web --new-window https\://github.com/notifications&:}%notifications%%{A}
-label-padding = 2
-label-background = #f0c209
-label-foreground = #000
-
-[module/fs-root]
-type = internal/fs
-mount-0 = /
-label-mounted = %{F#e60053}%percentage_used%%%{F-} used of %mountpoint%
-
-[module/bspwm]
-type = internal/bspwm
-
-enable-scroll = false
-
-format = <label-state> <label-mode>
-;format = <label-monitor> <label-state> <label-mode>
-;pin-workspaces = false
-
-;ws-icon-0 = term;
-;ws-icon-1 = web;
-;ws-icon-2 = code;
-;ws-icon-3 = music;
-;ws-icon-4 = irssi;
-;ws-icon-default = 
-ws-icon-default = x
-
-inline-mode = true
-
-;label-focused = %icon%
-label-focused = o
-label-focused-background = #bf616a
-label-focused-foreground = #000
-label-focused-overline = ${root.bspwm-focused-overline}
-label-focused-underline = ${root.bspwm-focused-underline}
-label-focused-padding = 1
-
-label-focused-occupied = %{O-1}⏺%{O-1}
-label-focused-occupied-background = ${self.label-focused-background}
-label-focused-occupied-foreground = ${self.label-focused-foreground}
-label-focused-occupied-overline = ${self.label-focused-overline}
-label-focused-occupied-underline = ${self.label-focused-underline}
-label-focused-occupied-padding = ${self.label-focused-padding}
-
-;label-occupied = %icon%
-label-occupied = %{O-1}⏺%{O-1}
-label-occupied-padding = 1
-
-;label-urgent = %icon%
-label-urgent = !
-label-urgent-background = #bd2c40
-label-urgent-padding = 1
-
-;label-empty = %icon%
-label-empty = x
-label-empty-foreground = #444
-label-empty-padding = 1
-
-label-monocle = 
-label-monocle-padding = 1
-label-monocle-background = #171717
-label-monocle-foreground = ${colors.accent}
-
-label-floating = 
-label-floating-padding = 1
-label-floating-background = #171717
-label-floating-foreground = ${colors.accent}
-
-label-locked = locked
-label-locked-padding = 1
-label-sticky = sticky
-label-sticky-padding = 1
-label-private = private
-label-private-padding = 1
-;label-pseudotiled = pseudo
-;label-pseudotiled-padding = 2
-;label-pseudotiled-background = #f09
-;label-tiled = tiled
-;label-tiled-padding = 2
-;label-tiled-background = #f90
-
-label-dimmed-background = ${root.background}
-label-dimmed-overline = ${root.background}
-label-dimmed-underline = ${root.background}
-label-dimmed-active-foreground = #f00
-
-[module/i3]
-type = internal/i3
-index-sort = true
-pin-workspaces = true
-wrapping-scroll = true
-strip-wsnumbers = true
-;reverse-scroll = false
-;enable-scroll = false
-
-format = <label-state> <label-mode>
-
-label-mode = %mode%
-label-mode-padding = 1
-label-mode-background = ${colors.accent}
-
-label-focused = %name%
-label-focused-background = ${module/bspwm.label-focused-background}
-label-focused-foreground = ${module/bspwm.label-focused-foreground}
-label-focused-overline= ${module/bspwm.label-focused-overline}
-label-focused-underline= ${module/bspwm.label-focused-underline}
-label-focused-padding = ${module/bspwm.label-focused-padding}
-
-label-unfocused = %name%
-label-unfocused-padding = ${module/bspwm.label-occupied-padding}
-
-label-urgent = %name%!
-label-urgent-background = ${module/bspwm.label-urgent-background}
-label-urgent-padding = ${module/bspwm.label-urgent-padding}
-
-label-visible = %name%
-label-visible-padding = ${module/bspwm.label-empty-padding}
-
-[module/cpu]
-type = internal/cpu
-interval = 2
-label = %percentage%%
-format-prefix = " CPU: "
-format-prefix-foreground = #666
-
-[module/memory]
-type = internal/memory
-interval = 2
-label = %percentage_used%%
-format-prefix = " mem: "
-format-prefix-foreground = #666
-
-[module/wifi]
-type = internal/network
-interface = enp0s31f6
-interval = 3.0
-;udspeed-minwidth = 0
-
-format-connected = <ramp-signal> <label-connected>
-format-connected-prefix = " "
-format-connected-prefix-foreground = #666
-format-connected-prefix-offset = -6
-label-connected = %downspeed:8%
-
-;format-disconnected = <label-disconnected>
-;format-disconnected-prefix = " "
-;format-disconnected-prefix-foreground = #666
-;label-disconnected = not connected
-;label-disconnected-foreground = #999
-
-ramp-signal-0 = 
-ramp-signal-1 = 
-ramp-signal-2 = 
-ramp-signal-3 = 
-ramp-signal-4 = 
-ramp-signal-foreground = #666
-
-[module/wired]
-type = internal/network
-interface = enp0s31f6
-interval = 3.0
-
-format-connected-prefix = " lan: "
-format-connected-prefix-foreground = #666
-label-connected = %local_ip%
-
-format-disconnected = <label-disconnected>
-format-disconnected-prefix = ""
-format-disconnected-prefix-foreground = #666
-label-disconnected = not connected
-label-disconnected-foreground = #999
-
-[module/date]
-type = internal/date
-label = %date%  %time%
-date = %Y-%m-%d
-time = %H:%M:%S
-interval = 1
-
-[module/xbacklight]
-type = internal/xbacklight
-format = <ramp> <label>
-ramp-0 = 
-ramp-1 = 
-ramp-2 = 
-ramp-foreground = #666
-label-foreground = ${root.foreground}
-
-[module/volume]
-type = internal/volume
-speaker-mixer = Speaker
-headphone-mixer = Headphone
-headphone-id = 9
-
-format-volume = <ramp-volume> <label-volume>
-label-volume = %percentage%%
-label-volume-foreground = ${root.foreground}
-
-format-muted-prefix = " "
-format-muted-foreground = #777
-label-muted = sound muted
-
-ramp-volume-0 = 
-ramp-volume-1 = 
-ramp-volume-2 = 
-ramp-volume-3 = 
-ramp-volume-foreground = #666
-
-ramp-headphones-0 = 
-ramp-headphones-1 = 
-ramp-headphones-foreground = #666
-
-[module/battery]
-type = internal/battery
-full-at = 98
-time-format = %H:%M
-
-format-charging = <animation-charging> <label-charging>
-label-charging = %percentage%% %time%
-
-format-discharging = <ramp-capacity> <label-discharging>
-label-discharging = %percentage%% %time%
-
-format-full = <label-full>
-format-full-prefix = " "
-format-full-prefix-foreground = #666
-
-ramp-capacity-0 = 
-ramp-capacity-1 = 
-ramp-capacity-2 = 
-ramp-capacity-foreground = #666
-
-animation-charging-0 = 
-animation-charging-1 = 
-animation-charging-2 = 
-animation-charging-foreground = #666
-animation-charging-framerate = 750
-
-;[module/battery-multi]
-;type = custom/script
-;exec = "count=$(acpi -b | wc -l); sum=$(acpi -b | egrep -o '[0-9]{1,3}%' | tr -d '%' | xargs -I% echo -n '+%'); echo $(date +%s) Avg capacity: $(( sum / count ))%"
-;exec-if = pgrep -x watch
-;interval = 3
-
-[module/mpd]
-type = internal/mpd
-
-;format-online = <label-time>  <bar-progress>  <label-song>  <icon-prev> <icon-stop> <toggle> <icon-next>  <icon-repeat> <icon-random>
-format-online = <label-time> %{F#88}|%{F-} <label-song> <icon-prev><icon-stop><toggle><icon-next> <icon-repeat><icon-random>
-format-online-spacing = 0
-format-online-background = #ee333333
-format-online-underline = #cc333333
-format-online-padding = 3
-
-format-offline = <label-offline>
-format-offline-foreground = #777
-
-label-offline = mpd is off
-
-label-song-maxlen = 45
-label-song-ellipsis = true
-
-label-time-foreground = #777
-
-icon-prev = 
-icon-stop = 
-icon-play = 
-icon-pause = 
-icon-next = 
-
-icon-random = 
-icon-repeat = 
-
-toggle-on-foreground = ${colors.accent}
-toggle-off-foreground = #777
-
-;bar-progress-width = 10
-;bar-progress-indicator = 
-;bar-progress-indicator-foreground = #bb
-;bar-progress-fill = ─
-;bar-progress-fill-foreground = #bb
-;bar-progress-fill-font = 3
-;bar-progress-empty = ─
-;bar-progress-empty-foreground = #44
-;bar-progress-empty-font = 3
-
-[module/power-menu]
-type = custom/menu
-
-label-open = 
-label-close = 
-label-separator = /
-label-separator-margin = 1
-
-menu-0-0 = Terminate WM
-menu-0-0-foreground = ${colors.accent}
-menu-0-0-exec = bspc quit -1
-menu-0-1 = Reboot
-menu-0-1-foreground = ${colors.accent}
-menu-0-1-exec = menu-open-1
-menu-0-2 = Power off
-menu-0-2-foreground = ${colors.accent}
-menu-0-2-exec = menu-open-2
-menu-0-3 = Lock
-menu-0-3-foreground = ${colors.accent}
-menu-0-3-exec = lockscreen
-
-menu-1-0 = Cancel
-menu-1-0-foreground = ${colors.accent}
-menu-1-0-exec = menu-open-0
-menu-1-1 = Reboot
-menu-1-1-foreground = ${colors.accent}
-menu-1-1-exec = sudo reboot
-
-menu-2-0 = Power off
-menu-2-0-foreground = ${colors.accent}
-menu-2-0-exec = sudo poweroff
-menu-2-1 = Cancel
-menu-2-1-foreground = ${colors.accent}
-menu-2-1-exec = menu-open-0
-
-[module/app-menu]
-type = custom/menu
-label-open = 
-label-close = 
-
-menu-0-0 = Vimperator
-menu-0-0-exec = web
-menu-0-1 = Termite
-menu-0-1-exec = termite
-menu-0-2 = Pcmanfm
-menu-0-2-exec = pcmanfm
-
-[module/xkeyboard]
-type = internal/xkeyboard
-
-blacklist-0 = num lock
-
-format-prefix = " "
-format-prefix-foreground = #666
-
-label-layout = %layout%
-
-label-indicator-padding = 2
-label-indicator-background = ${colors.accent}
-
-[module/xwindow]
-type = internal/xwindow
-format = <label>
-label-maxlen = 75
-
-[module/counter]
-type = internal/counter
-format = <counter>
-interval = 0.1
-
-; vim:ft=dosini
diff --git a/termite/config.old b/termite/config.old
new file mode 100644
index 0000000..44f6016
--- /dev/null
+++ b/termite/config.old
@@ -0,0 +1,36 @@
+# Copyright (c) 2016-present Arctic Ice Studio <development@arcticicestudio.com>
+# Copyright (c) 2016-present Sven Greb <code@svengreb.de>
+
+# Project:    Nord Termite
+# Repository: https://github.com/arcticicestudio/nord-termite
+# License:    MIT
+
+[options]
+font = Source Code Pro 9
+
+[colors]
+cursor = #d8dee9
+cursor_foreground = #2e3440
+
+foreground = #d8dee9
+foreground_bold = #d8dee9
+background = rgba(21, 21, 21, 0.94) 
+
+highlight = #4c566a
+
+color0  = #3b4252
+color1  = #bf616a
+color2  = #a3be8c
+color3  = #ebcb8b
+color4  = #81a1c1
+color5  = #b48ead
+color6  = #bf616a
+color7  = #e5e9f0
+color8  = #4c566a
+color9  = #bf616a
+color10 = #a3be8c
+color11 = #ebcb8b
+color12 = #81a1c1
+color13 = #b48ead
+color14 = #bf616a
+color15 = #eceff4