diff --git a/i3/.config/i3/config b/i3/.config/i3/config
index 7961170..9638e13 100644
--- a/i3/.config/i3/config
+++ b/i3/.config/i3/config
@@ -200,7 +200,6 @@ client.placeholder      #000000 #0c0c0c #ffffff #000000   #0c0c0c
 client.background       #ffffff
 
 # Setup Russian layout siwtching with Alt+Shift
-exec --no-startup-id "setxkbmap -model pc105 -layout us,ru,fr -option grp:alts_toggle"
 
 exec --no-startup-id xrdb ~/.Xresources
 
diff --git a/i3/.xsession b/i3/.xsession
index 87295f2..e464dde 100644
--- a/i3/.xsession
+++ b/i3/.xsession
@@ -1,3 +1,5 @@
 WLAN=/sbin/ifconfig | grep wlp | tail -1 | cut -d ':' -f 1
 ETH=/sbin/ifconfig | grep veth | tail -1 | cut -d ':' -f 1
+setxkbmap -model pc105 -layout us,ru -option grp:ctrls_toggle
+setxkbmap -option caps:escape -option compose:ralt &
 i3
diff --git a/polybar/.config/polybar/config b/polybar/.config/polybar/config
index 6f8c935..5ed67f5 100644
--- a/polybar/.config/polybar/config
+++ b/polybar/.config/polybar/config
@@ -55,9 +55,9 @@ font-0 = Go Mono:pixelsize=10;1
 font-1 = unifont:fontformat=truetype:size=8:antialias=false;0
 font-2 = siji:pixelsize=10;1
 
-modules-left = i3 pulseaudio
+modules-left = i3
 modules-center = 
-modules-right = filesystem xbacklight xkeyboard memory cpu wlan eth battery temperature date
+modules-right = pulseaudio xkeyboard cpu wlan eth battery date
 
 tray-position = right
 tray-padding = 2
@@ -206,7 +206,7 @@ type = internal/cpu
 interval = 2
 format-prefix = "cpu "
 format-prefix-foreground = ${colors.foreground-alt}
-format-underline = #f90000
+format-underline = #4bffdc
 label = %percentage:2%%
 
 [module/memory]
@@ -214,7 +214,7 @@ type = internal/memory
 interval = 2
 format-prefix = "mem "
 format-prefix-foreground = ${colors.foreground-alt}
-format-underline = #4bffdc
+format-underline = #f90000
 label = %percentage_used%%
 
 [module/wlan]
@@ -341,8 +341,8 @@ format-full-prefix = " "
 format-full-prefix-foreground = ${colors.foreground-alt}
 format-full-underline = ${self.format-charging-underline}
 
-label-charging = %time% CHG
-label-discharging = %time% DIS
+label-charging = %percentage%% %time% CHG
+label-discharging = %percentage%% %time% DIS
 label-full = FULL
 
 ramp-capacity-0 = 