diff --git a/etc/X/xinitrc.AuthenticAMD b/etc/X/xinitrc.AuthenticAMD
index 12d4b55..51b893e 100644
--- a/etc/X/xinitrc.AuthenticAMD
+++ b/etc/X/xinitrc.AuthenticAMD
@@ -1,4 +1,4 @@
-display -window root $SHELLRC/etc/wm/wallpaper.$(uname -i).jpg -display :0.0
+display -window root $SHELLRC/etc/wm/img/wallpaper.$(uname -i).jpg -display :0.0
 
 setxkbmap -option ""
 setxkbmap -model pc104 -layout us,ru,el -variant ,,polytonic
diff --git a/etc/X/xinitrc.GenuineIntel b/etc/X/xinitrc.GenuineIntel
index 01d5bd3..d8d1940 100644
--- a/etc/X/xinitrc.GenuineIntel
+++ b/etc/X/xinitrc.GenuineIntel
@@ -1,15 +1,20 @@
-display -window root $SHELLRC/etc/wm/wallpaper.$(uname -i).jpg
+display -window root $SHELLRC/etc/wm/img/wallpaper.$(uname -i).jpg
+xsetroot -cursor_name left_ptr
 
 setxkbmap -option ""
 setxkbmap -model pc104 -layout us,ru,el -variant ,,polytonic
 setxkbmap -option -option terminate:ctrl_alt_bksp,caps:escape,grp:lwin_toggle,compose:ralt
 
 xmodmap $SHELLRC/etc/X/Xmodmaprc.$(uname -i)
-xmodmap -e "keysym Menu = Super_R"
-
-exec musca
+xbindkeys -f $SHELLRC/etc/X/xbindkeysrc.$(uname -i)
+sh $SHELLRC/etc/X/xrandr.$(uname -i)
 
 export GTK_IM_MODULE="xim"
 export QT_IM_MODULE="xim"
 unset XMODIFIERS
 
+#exec musca
+#exec ck-launch-session xmonad
+
+exec bspwm
+
diff --git a/etc/X/xinitrc.x86_64 b/etc/X/xinitrc.x86_64
index 2ef8b12..e504b00 100644
--- a/etc/X/xinitrc.x86_64
+++ b/etc/X/xinitrc.x86_64
@@ -1,4 +1,4 @@
-display -window root $SHELLRC/etc/wm/wallpaper.$(uname -i).jpg
+display -window root $SHELLRC/etc/wm/img/wallpaper.$(uname -i).jpg
 
 setxkbmap -model pc104 -layout us,ru -variant ,
 setxkbmap -option -option terminate:ctrl_alt_bksp,caps:escape,grp:lwin_toggle
diff --git a/etc/shell/bash/aliases b/etc/shell/bash/aliases
index 93b4bb5..ad4b355 100755
--- a/etc/shell/bash/aliases
+++ b/etc/shell/bash/aliases
@@ -48,7 +48,7 @@ alias gq="geeqie . &"							#noindex
 alias emerge="emerge --ask"						#noindex
 alias rg='rg --no-heading --smart-case --color=auto --colors "match:bg:yellow" --colors "match:fg:blue"' #noindex
 alias eww='emerge --update --newuse --deep --with-bdeps=y --complete-graph=y --keep-going=y -av --verbose-conflicts -t @world' #noindex
-alias xlock="i3lock -i $SHELLRC/etc/wm/locker.png"			#noindex
+alias xlock="i3lock -i $SHELLRC/etc/wm/img/locker.png"			#noindex
 
 #- Замена стандартных путей для конфигурационных файлов
 alias mpd="mpd $SHELLRC/etc/media/mpd/mpd.conf"		        #noindex
@@ -212,14 +212,14 @@ vicd() { #noindex
 }
 
 function vifm() { #noindex
-	if [ -f ~/.vifm/lastdir ]; then
-		\rm ~/.vifm/lastdir
+	if [ -f ~/.config/vifm/lastdir ]; then
+		\rm ~/.config/vifm/lastdir
 	fi
 
 	# "command" prevents recursive call
 	TERM=xterm-256color command vifm .
-	if [ -f ~/.vifm/lastdir ]; then
-		cd "`cat ~/.vifm/lastdir`"
+	if [ -f ~/.config/vifm/lastdir ]; then
+		cd "`cat ~/.config/vifm/lastdir`"
 	fi
 }
 
diff --git a/etc/wm/locker.png b/etc/wm/img/locker.png
similarity index 100%
rename from etc/wm/locker.png
rename to etc/wm/img/locker.png
diff --git a/etc/wm/wallpaper.AuthenticAMD.1.jpg b/etc/wm/img/wallpaper.AuthenticAMD.1.jpg
similarity index 100%
rename from etc/wm/wallpaper.AuthenticAMD.1.jpg
rename to etc/wm/img/wallpaper.AuthenticAMD.1.jpg
diff --git a/etc/wm/wallpaper.AuthenticAMD.2.jpg b/etc/wm/img/wallpaper.AuthenticAMD.2.jpg
similarity index 100%
rename from etc/wm/wallpaper.AuthenticAMD.2.jpg
rename to etc/wm/img/wallpaper.AuthenticAMD.2.jpg
diff --git a/etc/wm/wallpaper.AuthenticAMD.jpg b/etc/wm/img/wallpaper.AuthenticAMD.jpg
similarity index 100%
rename from etc/wm/wallpaper.AuthenticAMD.jpg
rename to etc/wm/img/wallpaper.AuthenticAMD.jpg
diff --git a/etc/wm/img/wallpaper.GenuineIntel.jpg b/etc/wm/img/wallpaper.GenuineIntel.jpg
new file mode 100644
index 0000000..1f33209
Binary files /dev/null and b/etc/wm/img/wallpaper.GenuineIntel.jpg differ
diff --git a/etc/wm/wallpaper.GenuineIntel_old.jpg b/etc/wm/img/wallpaper.GenuineIntel_old.jpg
similarity index 100%
rename from etc/wm/wallpaper.GenuineIntel_old.jpg
rename to etc/wm/img/wallpaper.GenuineIntel_old.jpg
diff --git a/etc/wm/wallpaper.x86_64.jpg b/etc/wm/img/wallpaper.x86_64.jpg
similarity index 100%
rename from etc/wm/wallpaper.x86_64.jpg
rename to etc/wm/img/wallpaper.x86_64.jpg
diff --git a/etc/wm/wallpaper.GenuineIntel.jpg b/etc/wm/wallpaper.GenuineIntel.jpg
deleted file mode 100644
index 657865b..0000000
Binary files a/etc/wm/wallpaper.GenuineIntel.jpg and /dev/null differ