diff --git a/README.md b/README.md
index d6e3bca..6014649 100644
--- a/README.md
+++ b/README.md
@@ -24,8 +24,11 @@
 ## Other Dependencies
 
 + [vim-plug](https://github.com/junegunn/vim-plug)
-+ fcitx + mozc: Japanese Keyboard
++ fcitx + mozc: Japanese Keyboard - Thanks to [THIS](https://www.youtube.com/watch?v=ptbFWnowvLo) guy!
 + fzf
++ light
++ pactl
++ playerctl
 + spicetify-cli
 
 ### Nvim LSP
@@ -36,9 +39,7 @@
 + [Java](https://github.com/neovim/nvim-lspconfig#jdtls)
 
 ## Fonts
-+ Fira Code Regular Nerd Font Complete Mono: General
-+ Heebo Normal: Polybar
++ Fira Code Regular Nerd Font Complete Mono: Terminal
++ Product Sans: Non-Monospaced Font
 + Noto Sans CJK JP: Japanese Characters
-+ [Siji](https://github.com/stark/siji): Icon Font for Polybar
-
-To get a siji icon: `clone, ./install.sh, ./view.sh, echo "\ue002"`
++ Material Design Icons: Polybar Icons
diff --git a/files/.config/alacritty/alacritty.yml b/files/.config/alacritty/alacritty.yml
index 43faca9..d7387a2 100644
--- a/files/.config/alacritty/alacritty.yml
+++ b/files/.config/alacritty/alacritty.yml
@@ -135,7 +135,7 @@ cursor:
 
   # If this is `true`, the cursor will be rendered as a hollow box when the
   # window is not focused.
-  unfocused_hollow: true
+  unfocused_hollow: false
 
 # Live config reload (changes require restart)
 live_config_reload: true
diff --git a/files/.config/dunst/dunstrc b/files/.config/dunst/dunstrc
index 6edeb8e..19f714d 100644
--- a/files/.config/dunst/dunstrc
+++ b/files/.config/dunst/dunstrc
@@ -64,7 +64,8 @@
     frame_width = 2
 
     # Defines color of the frame around the notification window.
-    frame_color = "#e06c75"
+    #frame_color = "#e06c75"
+    frame_color = "#ffffff"
 
     # Define a color for the separator.
     # possible values are:
@@ -86,7 +87,7 @@
 
     ### Text ###
 
-    font = Heebo Normal 11
+    font = Product Sans 11
 
     # The spacing between lines.  If the height is smaller than the
     # font height, it will get raised to the font height.
diff --git a/files/.config/i3/config b/files/.config/i3/config
index 52b01fe..59d2676 100644
--- a/files/.config/i3/config
+++ b/files/.config/i3/config
@@ -11,7 +11,7 @@ set $mod Mod4
 floating_modifier $mod
 
 # Font for Window Titles
-font pango:Heebo Normal 8
+font pango:Product Sans 8
 
 # ============================== Keybinds (except workspaces)
 #Terminal
@@ -47,13 +47,12 @@ bindsym $mod+Shift+v split h
 bindsym $mod+n workspace next
 bindsym $mod+p workspace prev
 
-# Rofi and dmenu
-# bindsym $mod+space exec rofi -show run
-
+# dmenu
 set $fg '#ffffff'
 set $bg '#000000'
 set $acc '#98c379'
 bindsym $mod+d exec "dmenu_run -fn 'FiraCode Nerd Font Mono' -nb $bg -sb $acc -nf $fg -sf $bg"
+bindsym $mod+space exec "dmenu_run -fn 'FiraCode Nerd Font Mono' -nb $bg -sb $acc -nf $fg -sf $bg"
 
 # Screenhot
 bindsym $mod+Shift+p exec "flameshot gui"
@@ -62,7 +61,7 @@ bindsym $mod+Shift+p exec "flameshot gui"
 bindsym XF86MonBrightnessUp exec light -A 5 # increase
 bindsym XF86MonBrightnessDown exec light -U 5 # decrease
 
-# Volume witg pactl
+# Volume with pactl
 bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +2%
 bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -2%
 bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle
@@ -77,32 +76,18 @@ bindsym XF86AudioPrev exec playerctl previous
 # ======================================== Open Applications
 bindsym $mod+e exec thunar
 
-mode "Open" {
-	bindsym c exec google-calendar-dark
-	bindsym d exec discord; exec Discord
-	bindsym f exec firefox
-	bindsym m exec thunderbird
-	bindsym n exec notion-app
-	bindsym p exec pavucontrol
-	bindsym s exec spotify
-	bindsym t exec telegram-desktop
-
-	bindsym Escape mode "default"
-	bindsym Return mode "default"
-}
-
-bindsym $mod+o mode "Open"
+bindsym $mod+Ctrl+c exec google-calendar-dark
+bindsym $mod+Ctrl+d exec discord; exec Discord
+bindsym $mod+Ctrl+f exec firefox
+bindsym $mod+Ctrl+m exec thunderbird
+bindsym $mod+Ctrl+n exec notion-app
+bindsym $mod+Ctrl+p exec pavucontrol
+bindsym $mod+Ctrl+s exec spotify
+bindsym $mod+Ctrl+t exec telegram-desktop
 
 # ======================================== Shutdown
-mode "Shutdown" {
-	bindsym l exec "~/scripts/lock.sh"
-	bindsym e exec "i3-nagbar -t warning -m 'Logout?' -B 'Yes!' 'i3-msg exit'"
-
-	bindsym Escape mode "default"
-	bindsym Return mode "default"
-}
-
-bindsym $mod+BackSpace mode "Shutdown"
+bindsym $mod+BackSpace exec "~/scripts/lock.sh"
+bindsym $mod+Shift+BackSpace exec "i3-nagbar -t warning -m 'Logout?' -B 'Yes!' 'i3-msg exit'"
 
 # ======================================== Workspaces
 set $ws1 "1"
diff --git a/files/.config/polybar/config b/files/.config/polybar/config
index 76183fe..f74ac50 100644
--- a/files/.config/polybar/config
+++ b/files/.config/polybar/config
@@ -12,12 +12,12 @@ accent-alt = #98c379
 [bar/laptop]
 monitor = ${env:MONITOR}
 
-font-0 = "Heebo Medium:pixelsize=10;1"
-font-1 = "Noto Sans CJK JP:antialiase=false:pixelsize=10;0"
-font-2 = "Siji:size=7;1"
-font-3 = "Wuncon Siji:size=7;1"
+font-0 = "Product Sans:pixelsize=11:weight=regular;3"
+font-1 = "Product Sans:pixelsize=11:weight=bold;3"
+font-2 = "Noto Sans CJK JP:antialiase=false:pixelsize=11;2"
+font-3 = "Material Design Icons:size=12;3"
 
-height = 27px
+height = 30px
 width = 100%
 
 module-margin-right = 2
@@ -28,17 +28,17 @@ padding-right = 2
 
 separator =
 
-modules-left = i3 xwindow
-modules-center = spotify
-modules-right = cpu temp memory network volume backlight battery date
+modules-left = i3 spotify
+modules-center = date time
+modules-right = cpu memory network volume backlight battery
 
 tray-position = right
 tray-padding = 1
 
 foreground = ${colors.foreground}
-background-0 = ${colors.background}
+background = ${colors.background}
 
-line-size = 2
+line-size = 0
 
 wm-name = i3
 wm-restack = i3
@@ -46,13 +46,12 @@ wm-restack = i3
 [bar/desktop]
 inherit = bar/laptop
 
-modules-right = update_yay cpu temp memory volume date
+modules-right = update_yay cpu memory volume
 
 [bar/desktop_second]
 inherit = bar/desktop
 
 tray-position = none
-modules-right = volume date
 
 ############################## MODULES
 [module/i3]
@@ -99,9 +98,17 @@ label-underline = ${colors.accent}
 
 [module/date]
 type = internal/date
-date = %a, %d.%b %Y  %H:%M
+date = %{T2}%A%{T-}, %B %d
 
-format-prefix = "  "
+format-prefix = "󰃭  "
+format-prefix-foreground = ${colors.accent-alt}
+format-underline = ${colors.accent}
+
+[module/time]
+type = internal/date
+date = %{T2}%H:%M%{T-}
+
+format-prefix = "󰥔  "
 format-prefix-foreground = ${colors.accent-alt}
 format-underline = ${colors.accent}
 
@@ -111,7 +118,7 @@ type = internal/backlight
 card = amdgpu_bl0
 label = %percentage%%
 
-format-prefix = "  "
+format-prefix = "󰃟  "
 format-prefix-foreground = ${colors.accent-alt}
 format-underline = ${colors.accent}
 
@@ -134,49 +141,50 @@ label-full = %percentage%%
 format-full-underline = ${colors.accent}
 
 ramp-capacity-foreground = ${colors.accent-alt}
-ramp-capacity-0 = 
-ramp-capacity-1 = 
-ramp-capacity-2 = 
-ramp-capacity-3 = 
-ramp-capacity-4 = 
-ramp-capacity-5 = 
-ramp-capacity-6 = 
-ramp-capacity-7 = 
-ramp-capacity-8 = 
-ramp-capacity-9 = 
+ramp-capacity-0 = 󰁺
+ramp-capacity-1 = 󰁻
+ramp-capacity-2 = 󰁼
+ramp-capacity-3 = 󰁽
+ramp-capacity-4 = 󰁾
+ramp-capacity-5 = 󰁿
+ramp-capacity-6 = 󰂀
+ramp-capacity-7 = 󰂁
+ramp-capacity-8 = 󰂂
+ramp-capacity-9 = 󰁹
 
-animation-charging-0 = 
-animation-charging-1 = 
-animation-charging-2 = 
-animation-charging-3 = 
-animation-charging-framerate = 750
+animation-charging-0 = 󰢜
+animation-charging-1 = 󰂇
+animation-charging-2 = 󰂇
+animation-charging-3 = 󰂈
+animation-charging-4 = 󰢝
+animation-charging-5 = 󰂉
+animation-charging-6 = 󰢞
+animation-charging-7 = 󰂊
+animation-charging-8 = 󰂋
+animation-charging-9 = 󰂅
+animation-charging-framerate = 200
 
 [module/volume]
 type = internal/pulseaudio
 format-volume = <label-volume>
 
-#bar-volume-width = 10
-#bar-volume-indicator = |
-#bar-volume-fill = ─
-#bar-volume-empty = ─
-#bar-volume-fill-foreground = #ffffff
-#
-#ramp-volume-0 = "  "
-#ramp-volume-1 = "  "
-#ramp-volume-2 = "  "
-#ramp-volume-3 = "  "
-#ramp-volume-4 = "  "
-#ramp-volume-foreground = ${colors.accent-alt}
-
 label-volume = %percentage%%
-format-volume-prefix = "  "
+format-volume-prefix = "󰕾  "
 format-volume-prefix-foreground = ${colors.accent-alt}
 format-volume-underline = ${colors.accent}
 
 label-muted = Muted
+format-muted-prefix = "󰖁  "
 format-muted-foreground = ${colors.urgent}
 format-muted-underline = ${colors.urgent}
 
+ramp-volume-0 = 󰕿
+ramp-volume-1 = 󰖀
+ramp-volume-2 = 󰕾
+
+ramp-headphones-0 = 󰋋
+ramp-headphones-1 = 󰟎
+
 [module/network]
 type = internal/network
 interface = wlo1
@@ -185,7 +193,7 @@ accumulate-stats = true
 unknown-as-up = true
 
 label-connected = %essid%
-format-connected-prefix = "  "
+format-connected-prefix = "󰤨  "
 format-connected-prefix-foreground = ${colors.accent-alt}
 format-connected-underline = ${colors.accent}
 
@@ -199,7 +207,7 @@ tail = true
 interval = 600
 click-left = alacritty -e yay &
 
-format-prefix = "  "
+format-prefix = "󰏗  "
 format-prefix-foreground = ${colors.accent-alt}
 format-underline = ${colors.accent}
 
@@ -208,7 +216,7 @@ type = custom/script
 exec = python ~/.config/polybar/scripts/spotify_status.py -f '{artist}: {song}'
 interval = 1
 
-format-prefix = "  "
+format-prefix = "󰓇  "
 format-prefix-foreground = ${colors.accent-alt}
 format-underline = ${colors.accent}
 
@@ -217,7 +225,7 @@ type = custom/script
 exec = ~/.config/polybar/scripts/cpu.sh
 click-left = ~/.config/polybar/scripts/cpu.sh --popup
 
-format-prefix = "  "
+format-prefix = "󰻠  "
 format-prefix-foreground = ${colors.accent-alt}
 format-underline = ${colors.accent}
 
@@ -226,7 +234,7 @@ type = custom/script
 exec = ~/.config/polybar/scripts/memory.sh
 click-left = ~/.config/polybar/scripts/memory.sh --popup
 
-format-prefix = "  "
+format-prefix = "󰍛  "
 format-prefix-foreground = ${colors.accent-alt}
 format-underline = ${colors.accent}
 
@@ -234,6 +242,6 @@ format-underline = ${colors.accent}
 type = custom/script
 exec = ~/.config/polybar/scripts/temp.sh
 
-format-prefix = "  "
+format-prefix = "󰔄 "
 format-prefix-foreground = ${colors.accent-alt}
 format-underline = ${colors.accent}
diff --git a/files/.vimrc b/files/.vimrc
index 06ce539..2f477c4 100644
--- a/files/.vimrc
+++ b/files/.vimrc
@@ -12,7 +12,7 @@ let mapleader = "\<Space>"
 " ============================== vim-plug
 call plug#begin()
 
-Plug 'joshdick/onedark.vim' " color
+Plug 'joshdick/onedark.vim' " color scheme
 
 Plug 'tpope/vim-sleuth' " intendations
 
@@ -62,7 +62,7 @@ set mouse=a " a=on, c=off
 set undolevels=1337
 set backspace=indent,eol,start
 set wildmenu " autocomplete :e
-set scrolloff=7 " min lines aboive or below the cursor
+set scrolloff=10 " min lines above or below the cursor
 
 " ============================== Statusline
 set laststatus=2
diff --git a/files/scripts/lock.sh b/files/scripts/lock.sh
index b5c11b6..3ad61a4 100755
--- a/files/scripts/lock.sh
+++ b/files/scripts/lock.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 xlock \
-    -mode maze \
-    -info ''
+    -mode matrix \
+    -info '' \
diff --git a/fonts/Heebo-Medium.ttf b/fonts/Heebo-Medium.ttf
deleted file mode 100644
index 66424ea..0000000
Binary files a/fonts/Heebo-Medium.ttf and /dev/null differ
diff --git a/fonts/Product Sans Bold.ttf b/fonts/Product Sans Bold.ttf
new file mode 100644
index 0000000..d847195
Binary files /dev/null and b/fonts/Product Sans Bold.ttf differ
diff --git a/fonts/Product Sans Regular.ttf b/fonts/Product Sans Regular.ttf
new file mode 100644
index 0000000..c0442ee
Binary files /dev/null and b/fonts/Product Sans Regular.ttf differ
diff --git a/fonts/materialdesignicons-webfont.ttf b/fonts/materialdesignicons-webfont.ttf
new file mode 100644
index 0000000..761dfaf
Binary files /dev/null and b/fonts/materialdesignicons-webfont.ttf differ
diff --git a/screenshots/pc.png b/screenshots/pc.png
index 80187e4..9fb797f 100644
Binary files a/screenshots/pc.png and b/screenshots/pc.png differ