diff --git a/README.md b/README.md
index 7f076ff..5b41f99 100644
--- a/README.md
+++ b/README.md
@@ -32,6 +32,7 @@
 
 ## Fonts
 + Fira Code Regular Nerd Font Complete Mono: General
++ Heebo Normal: Polybar
 + Noto Sans CJK JP: Japanese Characters
 + [Siji](https://github.com/stark/siji): Icon Font for Polybar
 
diff --git a/files/.config/dunst/dunstrc b/files/.config/dunst/dunstrc
index 22fd605..01f243f 100644
--- a/files/.config/dunst/dunstrc
+++ b/files/.config/dunst/dunstrc
@@ -29,7 +29,7 @@
     # the top and down respectively.
     # The width can be negative.  In this case the actual width is the
     # screen width minus the width defined in within the geometry option.
-    geometry = "400x10-8+35"
+    geometry = "400x10-12+39"
 
     # Show how many messages are currently hidden (because of geometry).
     indicate_hidden = yes
@@ -64,7 +64,7 @@
     frame_width = 2
 
     # Defines color of the frame around the notification window.
-    frame_color = "#98c379"
+    frame_color = "#e06c75"
 
     # Define a color for the separator.
     # possible values are:
@@ -86,7 +86,7 @@
 
     ### Text ###
 
-    font = FiraCode Nerd Font Mono 10
+    font = Heebo Normal 11
 
     # The spacing between lines.  If the height is smaller than the
     # font height, it will get raised to the font height.
@@ -254,21 +254,21 @@
 [urgency_low]
     # IMPORTANT: colors have to be defined in quotation marks.
     # Otherwise the "#" and following would be interpreted as a comment.
-    background = "#000000"
+    background = "#1e2127"
     foreground = "#e5e9f0"
     timeout = 10
     # Icon for notifications with low urgency, uncomment to enable
     #icon = /path/to/icon
 
 [urgency_normal]
-    background = "#000000"
+    background = "#1e2127"
     foreground = "#e5e9f0"
     timeout = 10
     # Icon for notifications with normal urgency, uncomment to enable
     #icon = /path/to/icon
 
 [urgency_critical]
-    background = "#000000"
+    background = "#1e2127"
     foreground = "#e5e9f0"
     timeout = 0
     # Icon for notifications with critical urgency, uncomment to enable
diff --git a/files/.config/i3/config b/files/.config/i3/config
index e0db1d2..1466f41 100644
--- a/files/.config/i3/config
+++ b/files/.config/i3/config
@@ -19,7 +19,7 @@ bindsym $mod+Return exec --no-startup-id alacritty
 bindsym $mod+Ctrl+Return exec --no-startup-id xterm
 
 # Leaving
-bindsym $mod+Shift+BackSpace exec "~/scripts/lock.sh"
+#bindsym $mod+Shift+BackSpace exec "~/scripts/lock.sh"
 bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'Logout?' -B 'Yes!' 'i3-msg exit'"
 
 # Config refresh
@@ -56,7 +56,8 @@ bindsym $mod+p workspace prev
 
 set $fg '#ffffff'
 set $bg '#000000'
-bindsym $mod+d exec "dmenu_run -fn 'FiraCode Nerd Font Mono' -p 'run ' -nb $bg -sb $fg -nf $fg -sf $bg"
+set $acc '#98c379'
+bindsym $mod+d exec "dmenu_run -fn 'Heebo Normal' -p 'run ' -nb $bg -sb $acc -nf $fg -sf $bg"
 
 # Screenhot
 bindsym $mod+Shift+p exec "flameshot gui"
@@ -161,17 +162,18 @@ bindsym $mod+Ctrl+l move workspace to output right
 new_window 1pixel
 
 # Set Border
-for_window [class="^.*"] border pixel 1
+for_window [class="^.*"] border pixel 2
 
 set $red "#e06c75"
 set $termbg "#1e2127"
+set $border "#98c379"
 
 # class                 border  backgr. text    indic.  child_border
-client.focused          #ffffff #ffffff #000000 #ffffff #ffffff
-client.focused_inactive $termbg $termbg #ffffff $termbg $termbg
-client.unfocused        $termbg $termbg #ffffff $termbg $termbg
-client.urgent           $red    $red    #ffffff $red    $red
-client.background       #ffffff
+client.focused          $border $border #000000 $border $border
+client.focused_inactive $termbg $termbg $border $termbg $termbg
+client.unfocused        $termbg $termbg $border $termbg $termbg
+client.urgent           $red    $red    $border $red    $red
+client.background       $border
 
 gaps inner 8
 
diff --git a/files/.config/polybar/config b/files/.config/polybar/config
index 51c9473..8c542e1 100644
--- a/files/.config/polybar/config
+++ b/files/.config/polybar/config
@@ -4,19 +4,21 @@
 background = #000000
 foreground = #ffffff
 urgent = #e06c75
+accent = #98c379
 
 [bar/laptop]
 monitor = ${env:MONITOR}
 
-font-0 = "FiraCode Nerd Font Mono:pixelsize=9;2"
+font-0 = "Heebo Medium:pixelsize=10;1"
+#font-0 = "FiraCode Nerd Font Mono:pixelsize=9;2"
 font-1 = "Noto Sans CJK JP:antialiase=false:pixelsize=9;1"
 font-2 = "Siji:size=7;1"
 font-3 = "Wuncon Siji:size=7;1"
 
 height = 27px
 width = 100%
-module-margin-right = 1
-module-margin-left = 1
+module-margin-right = 2
+module-margin-left = 2
 
 padding-left = 1
 padding-right = 1
@@ -54,6 +56,8 @@ pin-workspaces = true
 wrapping-scroll = false
 format = <label-state> <label-mode>
 
+format-NAME-font = 1
+
 ws-icon-0 = 1;一
 ws-icon-1 = 2;二
 ws-icon-2 = 3;三
@@ -68,7 +72,7 @@ ws-icon-default = 
 
 label-focused = "%icon%"
 label-focused-foreground = ${colors.background}
-label-focused-background = ${colors.foreground}
+label-focused-background = ${colors.accent}
 label-focused-padding = 1
 
 label-unfocused = "%icon%"
@@ -81,9 +85,9 @@ label-urgent = "%icon%"
 label-urgent-background = ${colors.urgent}
 label-urgent-padding = 1
 
+label-mode = "%mode%"
 label-mode-padding = 1
-label-mode-background = ${colors.urgent}
-label-mode-foreground = ${colors.background}
+label-mode-foreground = ${colors.urgent}
 
 [module/xwindow]
 type = internal/xwindow
@@ -92,7 +96,7 @@ label-maxlen = 100
 
 [module/date]
 type = internal/date
-date = %a, %d.%m %H:%M
+date = %a, %d.%b %Y  %H:%M
 
 [module/backlight]
 type = internal/backlight
diff --git a/files/.config/ranger/plugins/__pycache__/__init__.cpython-38.opt-1.pyc b/files/.config/ranger/plugins/__pycache__/__init__.cpython-38.opt-1.pyc
new file mode 100644
index 0000000..8b6b512
Binary files /dev/null and b/files/.config/ranger/plugins/__pycache__/__init__.cpython-38.opt-1.pyc differ
diff --git a/files/.config/ranger/plugins/__pycache__/devicons.cpython-38.opt-1.pyc b/files/.config/ranger/plugins/__pycache__/devicons.cpython-38.opt-1.pyc
new file mode 100644
index 0000000..70e6213
Binary files /dev/null and b/files/.config/ranger/plugins/__pycache__/devicons.cpython-38.opt-1.pyc differ
diff --git a/files/.config/ranger/plugins/__pycache__/devicons_linemode.cpython-38.opt-1.pyc b/files/.config/ranger/plugins/__pycache__/devicons_linemode.cpython-38.opt-1.pyc
new file mode 100644
index 0000000..c36a90e
Binary files /dev/null and b/files/.config/ranger/plugins/__pycache__/devicons_linemode.cpython-38.opt-1.pyc differ
diff --git a/files/.vimrc b/files/.vimrc
index c637360..7208884 100644
--- a/files/.vimrc
+++ b/files/.vimrc
@@ -71,6 +71,7 @@ set scrolloff=7 " min lines aboive or below the cursor
 " ============================== Statusline
 let g:airline_theme='onedark'
 let g:airline#extensions#tabline#enabled = 1
+let g:airline#extensions#tabline#formatter = 'unique_tail'
 
 set laststatus=0
 set statusline=
diff --git a/files/.zshrc b/files/.zshrc
index 7a84282..ea06f9c 100644
--- a/files/.zshrc
+++ b/files/.zshrc
@@ -122,6 +122,7 @@ RPS2=$RPS1
 bindkey -v '^?' backward-delete-char
 
 # ============================== fzf
+export FZF_DEFAULT_COMMAND='find .'
 export FZF_DEFAULT_OPTS='--preview="head {}" --layout=reverse --bind=tab:down --bind=btab:up'
 
 ## fzf Bindings in zsh (C-r and C-t)
diff --git a/fonts/Heebo-Medium.ttf b/fonts/Heebo-Medium.ttf
new file mode 100644
index 0000000..66424ea
Binary files /dev/null and b/fonts/Heebo-Medium.ttf differ
diff --git a/screenshots/pc.png b/screenshots/pc.png
index b62e437..053d7a1 100644
Binary files a/screenshots/pc.png and b/screenshots/pc.png differ
diff --git a/wallpapers/sinon5k.png b/wallpapers/sinon5k.png
new file mode 100644
index 0000000..7ce9816
Binary files /dev/null and b/wallpapers/sinon5k.png differ