diff --git a/emacs/.emacs.d/config.org b/emacs/.emacs.d/config.org
index 4251d8d..221f681 100644
--- a/emacs/.emacs.d/config.org
+++ b/emacs/.emacs.d/config.org
@@ -257,6 +257,27 @@ Globaly highlight the current line in a slightly darker shade of grey.
 
 ** Ledger
    #+BEGIN_SRC emacs-lisp
+(custom-set-variables
+ ;; custom-set-variables was added by Custom.
+ ;; If you edit it by hand, you could mess it up, so be careful.
+ ;; Your init file should contain only one such instance.
+ ;; If there is more than one, they won't work right.
+ '(ledger-reports
+   (quote
+    (("budget" "ledger -f MyBudget.ledger bal Brieftasche$ Girokonto$")
+     ("bal" "%(binary) -f %(ledger-file) bal")
+     ("reg" "%(binary) -f %(ledger-file) reg")
+     ("payee" "%(binary) -f %(ledger-file) reg @%(payee)")
+     ("account" "%(binary) -f %(ledger-file) reg %(account)"))))
+ '(package-selected-packages
+   (quote
+    (ledger-mode smartparens rainbow-mode rainbow-delimiters ox-twbs material-theme google-this flycheck eclim counsel auto-complete-auctex auto-complete auctex anaconda-mode use-package))))
+(custom-set-faces
+ ;; custom-set-faces was added by Custom.
+ ;; If you edit it by hand, you could mess it up, so be careful.
+ ;; Your init file should contain only one such instance.
+ ;; If there is more than one, they won't work right.
+ )
 
    #+END_SRC
 
diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index c7d1a6e..1d4e71c 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -1,16 +1,2 @@
 (package-initialize)
 (org-babel-load-file "~/.emacs.d/config.org")
-(custom-set-variables
- ;; custom-set-variables was added by Custom.
- ;; If you edit it by hand, you could mess it up, so be careful.
- ;; Your init file should contain only one such instance.
- ;; If there is more than one, they won't work right.
- '(package-selected-packages
-   (quote
-    (ledger-mode smartparens rainbow-mode rainbow-delimiters ox-twbs material-theme google-this flycheck eclim counsel auto-complete-auctex auto-complete auctex anaconda-mode use-package))))
-(custom-set-faces
- ;; custom-set-faces was added by Custom.
- ;; If you edit it by hand, you could mess it up, so be careful.
- ;; Your init file should contain only one such instance.
- ;; If there is more than one, they won't work right.
- )
diff --git a/i3/.config/i3/config b/i3/.config/i3/config
index 18ca747..e30096e 100644
--- a/i3/.config/i3/config
+++ b/i3/.config/i3/config
@@ -114,6 +114,7 @@ exec --no-startup-id emacs --daemon
 exec --no-startup-id udiskie
 exec --no-startup-id polybar beep -r
 exec --no-startup-id polybar boop -r
+exec --no-startup-id setxkbmap -option "ctrl:swapcaps"
 ###############################################################################
 ################################# Keybindings #################################
 ###############################################################################
diff --git a/i3/.scripts/playstate b/i3/.scripts/playstate
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/i3/.scripts/playstate
@@ -0,0 +1 @@
+1
diff --git a/i3/.scripts/spotify-play.py b/i3/.scripts/spotify-play.py
new file mode 100755
index 0000000..d68fee1
--- /dev/null
+++ b/i3/.scripts/spotify-play.py
@@ -0,0 +1,24 @@
+#!/usr/bin/python
+import subprocess
+import time
+
+def main():
+    state = -1
+    while 1:
+        with open('/home/tuan/.scripts/playstate', 'r') as f:
+            try:
+                file_state = int(f.readline().strip('\n'))
+            except ValueError:
+                pass
+        if state != file_state:
+            state = file_state
+            if state == 0:
+                print("")
+                subprocess.run(["playerctl","pause"])
+            elif state == 1:
+                print("")
+                subprocess.run(["playerctl","play"])
+        time.sleep(0.5)
+        
+if __name__ == '__main__':
+    main()
diff --git a/polybar/.config/polybar/config b/polybar/.config/polybar/config
index b65a703..58ddd30 100644
--- a/polybar/.config/polybar/config
+++ b/polybar/.config/polybar/config
@@ -29,16 +29,16 @@ background = #00000000
 foreground = ${colors.foreground}
 
 module-margin-left = 1
-module-margin-right = 10
+module-margin-right = 1
 
 font-0 = fixed:pixelsize=10;1
 font-1 = unifont:fontformat=truetype:size=8:antialias=false;0
 font-2 = siji:pixelsize=10;1
 font-3 = FontAwesome:style=Regular:pixelsize=10
 
-modules-left = mpd
-modules-center = 
-modules-right = xkeyboard volume xbacklight wlan eth battery 
+modules-left = spotify 
+modules-center = spotify-prev spotify-play spotify-stop spotify-next 
+modules-right = xkeyboard volume xbacklight wlan eth battery date
 
 cursor-click = pointer
 cursor-scroll = ns-resize
@@ -55,6 +55,7 @@ background = ${colors.background}
 foreground = ${colors.foreground}
 
 line-size = 0
+
 line-color = ${colors.blue}
 
 border-size = 0
@@ -71,15 +72,15 @@ font-1 = unifont:fontformat=truetype:size=8:antialias=false;0
 font-2 = siji:pixelsize=10;1
 font-3 = FontAwesome:style=Regular:pixelsize=10
 
-modules-left = i3
-modules-center = 
-modules-right = date powermenu
+modules-left = 
+modules-center = i3
+modules-right = powermenu
 
 cursor-click = pointer
 cursor-scroll = ns-resize
 
 [module/xkeyboard]
-type = internal/xkeyboard
+pptype = internal/xkeyboard
 blacklist-0 = num lock
 
 format-prefix = " "
@@ -94,6 +95,37 @@ label-indicator-margin = 1
 label-indicator-background = ${colors.magenta}
 label-indicator-underline = ${colors.magenta}
 
+[module/spotify]
+type = custom/script
+exec-if = pgrep -x spotify
+exec = echo "$(playerctl metadata xesam:artist) - $(playerctl metadata xesam:title)"
+
+[module/spotify-prev]
+type = custom/script
+exec-if = pgrep -x spotify
+exec = echo ""
+click-left  = bash -c "playerctl previous"
+
+[module/spotify-next]
+type = custom/script
+exec-if = pgrep -x spotify
+exec = echo ""
+click-left  = bash -c "playerctl next"
+
+[module/spotify-play]
+type = custom/script
+exec-if = pgrep -x spotify
+exec = python -u /home/tuan/.scripts/spotify-play.py
+tail = true
+click-left = bash -c "if [ `cat /home/tuan/.scripts/playstate` = 0 ]; then echo '1'>/home/tuan/.scripts/playstate;else echo '0'>/home/tuan/.scripts/playstate;fi"
+
+[module/spotify-stop]
+type = custom/script
+exec-if = pgrep -x spotify
+exec = echo ""
+tail = true
+click-left = bash -c "playerctl stop && echo '0'>/home/tuan/.scripts/playstate"
+
 [module/i3]
 type = internal/i3
 
@@ -122,7 +154,7 @@ ws-icon-5 = 6;
 ws-icon-6 = 7;
 ws-icon-7 = 8;
 ws-icon-8 = 9;
-ws-icon-default = \
+ws-icon-default = 
 
 format = <label-state>
 
@@ -148,35 +180,6 @@ label-urgent-foreground = ${colors.black}
 label-urgent-background = ${colors.red}
 label-urgent-padding = 4
 
-[module/mpd]
-type = internal/mpd
-format-online = <icon-prev> <icon-stop> <toggle> <icon-next> <icon-repeat> <icon-random> <bar-progress> <label-time> <label-song>
-
-icon-prev = 
-icon-stop = 
-icon-play = 
-icon-pause = 
-icon-next = 
-icon-random = 
-icon-repeat = 
-
-toggle-on-foreground = 
-toggle-on-background = #55
-bar-progress-width = 45
-bar-progress-format = %{A4:mpdseek+2: A5:mpdseek_2:}%fill%%indicator%%empty%%{A A}
-
-bar-progress-indicator = |
-bar-progress-indicator-foreground = #ff
-bar-progress-indicator-font = 3
-
-bar-progress-fill = ─
-bar-progress-fill-foreground = #bb
-bar-progress-fill-font = 3
-
-bar-progress-empty = ─
-bar-progress-empty-font = 3
-bar-progress-empty-foreground = #44
-
 [module/xbacklight]
 type = internal/xbacklight
 
diff --git a/termite/.config/termite/config b/termite/.config/termite/config
index 56e0af5..25e65e9 100644
--- a/termite/.config/termite/config
+++ b/termite/.config/termite/config
@@ -1,8 +1,8 @@
 [options]
-#allow_bold = true
+allow_bold = true
 #audible_bell = false
 #clickable_url = true
-#dynamic_title = true
+dynamic_title = true
 font = Dejavu Sans Mono 12
 #fullscreen = true
 #geometry = 640x480
@@ -12,8 +12,8 @@ mouse_autohide = true
 #scroll_on_keystroke = true
 # Length of the scrollback buffer, 0 disabled the scrollback buffer
 # and setting it to a negative value means "infinite scrollback"
-scrollback_lines = 10000
-#search_wrap = true
+scrollback_lines = -1
+search_wrap = true
 #urgent_on_bell = true
 hyperlinks = true
 
@@ -21,7 +21,7 @@ hyperlinks = true
 #browser = xdg-open
 
 # "system", "on" or "off"
-#cursor_blink = system
+cursor_blink = system
 
 # "block", "underline" or "ibeam"
 cursor_shape = ibeam
@@ -45,7 +45,7 @@ scrollbar = off
 foreground      = #eceff1
 foreground_bold = #eceff1
 cursor          = #eceff1
-background      = rgba(38, 50, 56, 0.8)
+background      = rgba(38, 50, 56, 0.7)
 
 # black
 color0  = #263238
diff --git a/zsh/.zshrc b/zsh/.zshrc
index dc8173e..12c2623 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -24,7 +24,7 @@ POWERLEVEL9K_STATUS_ERROR_FOREGROUND="red"
 
 POWERLEVEL9K_TIME_BACKGROUND="black"
 POWERLEVEL9K_TIME_FOREGROUND="color7"
-POWERLEVEL9K_TIME_FORMAT="%D{%H:%M:%S} "
+POWERLEVEL9K_TIME_FORMAT="%D{%H:%M:%S}"
 
 # Alias
 alias df="df -h"
@@ -37,8 +37,7 @@ alias -s cpp=e
 alias org="e ~/Nextcloud/orgs/man.org"
 alias neofetch="neofetch --block_range 0 16"
 alias diff="diff -s"
-alias ebudget="e ~/Nextcloud/orgs/Budget/MyBudget.ledger"
-alias budget="ledger -f ~/Nextcloud/orgs/Budget/MyBudget.ledger"
+alias budget="e ~/Nextcloud/orgs/Budget/MyBudget.ledger"
 source $ZSH/oh-my-zsh.sh
 
 # Variables