diff --git a/files/.config/dunst/dunstrc b/files/.config/dunst/dunstrc
index 6e349cd..c10a97d 100644
--- a/files/.config/dunst/dunstrc
+++ b/files/.config/dunst/dunstrc
@@ -48,7 +48,7 @@
 # Misc
 
     always_run_script = true
-    startup_notification = true
+    startup_notification = false
     verbosity = mesg
     corner_radius = 2
     force_xinerama = false
@@ -58,8 +58,8 @@
 
 
 [shortcuts]
-    close = ctrl+space
-    history = ctrl+shift+space
+    close = ctrl+Escape
+    history = ctrl+shift+Escape
     context = ctrl+shift+period
 
 
diff --git a/files/.config/i3/config b/files/.config/i3/config
index 7b437e9..18d1865 100644
--- a/files/.config/i3/config
+++ b/files/.config/i3/config
@@ -14,8 +14,8 @@ bindsym XF86AudioRaiseVolume exec --no-startup-id amixer set Master 1%+
 bindsym XF86AudioPlay exec --no-startup-id playerctl play-pause
 bindsym XF86AudioNext exec --no-startup-id playerctl next
 bindsym XF86AudioPrev exec --no-startup-id playerctl previous
-bindsym XF86MonBrightnessUp exec --no-startup-id light -A 10
-bindsym XF86MonBrightnessDown exec --no-startup-id light -U 10
+bindsym XF86MonBrightnessUp exec --no-startup-id light -A 5
+bindsym XF86MonBrightnessDown exec --no-startup-id light -U 5
 
 # kill focused window
 bindsym $mod+Shift+BackSpace kill
@@ -120,19 +120,20 @@ client.urgent           $red    $red    $white  $red      $black
 # flaoting on start
 for_window [class="Nautilus"] floating enable
 for_window [class="Pavucontrol"] floating enable
+for_window [title="Event Tester"] floating enable
 
 # border
 hide_edge_borders smart
 for_window [class="^.*"] border pixel 0
 
 # bar
-exec --no-startup-id polybar -r bar
+exec_always --no-startup-id /home/marc/dots/scripts/polybar.sh
 
 # gaps
 gaps inner 10
 
-# wallpaper and screen
-exec --no-startup-id /home/marc/.local/bin/screen.sh
+# wallpaper
+exec_always --no-startup-id feh --bg-fill /home/marc/data/Seafile/images/wallpaper/life_and_death.png
 
 # startup
 exec --no-startup-id nm-applet
@@ -140,3 +141,6 @@ exec --no-startup-id keepassxc
 exec --no-startup-id seafile-applet
 exec --no-startup-id fcitx5
 exec --no-startup-id picom --backend glx --no-vsync
+exec --no-startup-id enact --watch --pos top
+
+exec_always --no-startup-id notify-send -i ~/.emacs.d/dashboard.png "よろしくマルコさん！" "「i3」へようこそ。"
diff --git a/files/.config/polybar/config b/files/.config/polybar/config
index 818a2d5..ae5c8f5 100644
--- a/files/.config/polybar/config
+++ b/files/.config/polybar/config
@@ -1,7 +1,16 @@
+[colors]
+white = #ffffff
+black = #5c6773
+green = #a6cc70
+red = #ff3333
+
 [bar/bar]
 
 font-0 = "JuliaMono:pixelsize=10;3"
 font-1 = "Noto Sans Mono CJK JP:pixelsize=10;1"
+font-2 = "FontAwesome:pixelsize=10;3"
+
+monitor = ${env:MON}
 
 scroll-up = i3wm-wsprev
 scroll-down = i3wm-wsnext
@@ -11,8 +20,8 @@ fixed-center = true
 width = 100%
 height = 30
 
-background = #ffffff
-foreground = #5c6773
+background = ${colors.white}
+foreground = ${colors.black}
 
 bottom = false
 
@@ -30,12 +39,14 @@ modules-right = backlight pulseaudio battery
 
 [module/i3]
 strip-wsnumbers = true
+pin-workspaces = true
+index-sort = true
 wrapping-scroll = false
 type = internal/i3
 format = <label-state> <label-mode>
 
 label-focused = %index%
-label-focused-background = #a6cc70
+label-focused-background = ${colors.green}
 label-focused-padding = 1
 
 label-unfocused = %index%
@@ -45,26 +56,29 @@ label-visible = %index%
 label-visible-padding = 1
 
 label-urgent = %index%
-label-urgent-overline = #ff3333
+label-urgent-overline = ${colors.red}
 label-urgent-padding = 1
 
 [module/date]
 type = internal/date
 interval = 1.0
-date = %A, %B %d, %Y
+date =  %a, %d %b
 
 [module/time]
 type = internal/date
 interval = 1.0
-date = %H:%M:%S
+date =  %I:%M %p
 
 [module/pulseaudio]
 type = internal/pulseaudio
 sink = master
 use-ui-max = true
 interval = 5
-format-volume = 音 「<label-volume>」
-label-muted = muted
+
+format-volume =  <label-volume>
+
+format-muted-foreground = ${colors.red}
+label-muted =  Muted
 click-right = pavucontrol
 
 [module/title]
@@ -84,19 +98,42 @@ battery = BAT0
 adapter = ADP1
 time-format = %H:%M
 
-label-charging = 電池　「charging %percentage%% - %time%」
-label-discharging = 電池　「%percentage%%」
-label-full = 電池 「full」
+# charging
+format-charging = <animation-charging> <label-charging>
+label-charging = %percentage% - %time%
+animation-charging-0 = 
+animation-charging-1 = 
+animation-charging-2 = 
+animation-charging-3 = 
+animation-charging-4 = 
+animation-charging-framerate = 750
+
+# discharging
+format-discharging = <ramp-capacity> <label-discharging>
+label-discharging = %percentage%
+ramp-capacity-0 = 
+ramp-capacity-1 = 
+ramp-capacity-2 = 
+ramp-capacity-3 = 
+ramp-capacity-4 = 
+
+# full
+label-full =  100
 
 [module/backlight]
 type = internal/backlight
 card = amdgpu_bl0
-label = 電気 「%percentage%%」
+
+format = <ramp> <label>
+label = %percentage%
+
+ramp-0 = 
+ramp-1 = 
 
 [module/polywins]
 type = custom/script
-exec = /home/marc/dots/files/polywins.sh 2>/dev/null
+exec = /home/marc/dots/scripts/polywins.sh 2>/dev/null
 format = <label>
 label = %output%
 label-padding = 1
-tail = true
\ No newline at end of file
+tail = true
diff --git a/files/.profile b/files/.profile
index 4d221cc..a934861 100755
--- a/files/.profile
+++ b/files/.profile
@@ -6,6 +6,7 @@ xrdb -merge $HOME/.Xresources
 # map CAPS to ~
 setxkbmap -option caps:none
 xmodmap -e "keycode 66 = grave asciitilde"
+xmodmap -e "keycode 49 = Escape"
 setxkbmap eu
 
 # energy options
diff --git a/fonts/fontawesome.ttf b/fonts/fontawesome.ttf
new file mode 100644
index 0000000..f221e50
Binary files /dev/null and b/fonts/fontawesome.ttf differ
diff --git a/scripts/polybar.sh b/scripts/polybar.sh
new file mode 100755
index 0000000..769fb86
--- /dev/null
+++ b/scripts/polybar.sh
@@ -0,0 +1,7 @@
+killall -q polybar
+
+for mon in $(xrandr | grep 'connected' | awk '{print $1}'):
+do
+	echo ${mon}
+	MON=${mon} polybar -r bar &
+done
diff --git a/files/polywins.sh b/scripts/polywins.sh
similarity index 100%
rename from files/polywins.sh
rename to scripts/polywins.sh