diff --git a/.gitignore b/.gitignore
index 27f203c..f6e9c81 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@ etc/mail/procmail/procmailrc
 
 etc/media/ncmpcpp/error.log
 etc/media/scmpc/scmpc.conf
+etc/media/mpdscribble/mpdscribble.conf
 
 etc/net/snownews
 
diff --git a/etc/media/mpd/mpd.conf b/etc/media/mpd/mpd.conf
index b49178b..e557fac 100644
--- a/etc/media/mpd/mpd.conf
+++ b/etc/media/mpd/mpd.conf
@@ -1,6 +1,10 @@
 # mpd.conf
 #
+<<<<<<< HEAD
 # Изменён: Вск 15 Сен 2013 18:30:00
+=======
+# Изменён: Чт 13 мар 2014 14:18:07
+>>>>>>> 752b4da... V5: настройка mpd & ncmpcpp & mpdscribble
 #
 
 #Директория с музыкой
@@ -38,6 +42,11 @@ port "6600"
 audio_output {
        type    "jack"
        name    "Sound Card"
+<<<<<<< HEAD
+=======
+       device  "hw:1,0"
+       mixer_control "Master"
+>>>>>>> 752b4da... V5: настройка mpd & ncmpcpp & mpdscribble
 }
 
 # audio_output {
diff --git a/etc/media/ncmpcpp/config b/etc/media/ncmpcpp/config
index d1dc3ce..af62c95 100644
--- a/etc/media/ncmpcpp/config
+++ b/etc/media/ncmpcpp/config
@@ -1,13 +1,23 @@
 # ncmpcpp
 #
+<<<<<<< HEAD
 # Изменён: Вс 25 авг 2013 01:08:52
+=======
+# Изменён: Чт 13 мар 2014 14:38:00
+>>>>>>> 752b4da... V5: настройка mpd & ncmpcpp & mpdscribble
 #
 
 #Общие настройки#{{{
 
+<<<<<<< HEAD
 mpd_music_dir			= "/media/2TB/Музыка/"
 mpd_connection_timeout		= "5"
 mpd_crossfade_time		= "0"
+=======
+mpd_music_dir = "/mnt/2TB/Музыка/"
+mpd_connection_timeout = "5"
+mpd_crossfade_time = "0"
+>>>>>>> 752b4da... V5: настройка mpd & ncmpcpp & mpdscribble
 
 #Задержка между песнями
 playlist_disable_highlight_delay = "0"
@@ -32,55 +42,55 @@ alternative_header_second_line_format = "$7{%a} - $5{%b} $3{(%y)}"
 
 #Настройки интерфейса#{{{
 
-user_interface                    = "alternative"
-playlist_display_mode             = "columns"
-browser_display_mode              = "columns"
-search_engine_display_mode        = "columns" #(classic/columns)
-incremental_seeking               = "yes"
-seek_time                         = "1"
-autocenter_mode                   = "yes"
-media_library_left_column         = "g"
-ignore_leading_the                = "yes"
-lyrics_database                   = "1"
-repeat_one_mode                   = "no"
-default_place_to_search_in        = "database"
-default_find_mode                 = "wrapped"
-default_space_mode                = "add"
-default_tag_editor_pattern        = "%n - %t"
-header_visibility                 = "yes"
-header_text_scrolling             = "yes"
-cyclic_scrolling                  = "yes"
-statusbar_visibility              = "yes"
-fancy_scrolling                   = "yes"
-follow_now_playing_lyrics         = "no"
-ncmpc_like_songs_adding           = "yes"
-display_screens_numbers_on_start  = "no"
-user_interface                    = "alternative"
-progressbar_look                  = "▬▶"
+user_interface = "alternative"
+playlist_display_mode = "columns"
+browser_display_mode = "columns"
+search_engine_display_mode = "columns" #(classic/columns)
+incremental_seeking = "yes"
+seek_time = "1"
+autocenter_mode = "yes"
+media_library_left_column = "g"
+ignore_leading_the = "yes"
+lyrics_database = "1"
+repeat_one_mode = "no"
+default_place_to_search_in = "database"
+default_find_mode = "wrapped"
+default_space_mode = "add"
+default_tag_editor_pattern = "%n - %t"
+header_visibility = "yes"
+header_text_scrolling = "yes"
+cyclic_scrolling = "yes"
+statusbar_visibility = "yes"
+fancy_scrolling = "yes"
+follow_now_playing_lyrics = "no"
+ncmpc_like_songs_adding = "yes"
+display_screens_numbers_on_start = "no"
+user_interface = "alternative"
+progressbar_look = "▬▶"
 jump_to_now_playing_song_at_start = "yes"
-display_volume_level              = "yes"
+display_volume_level = "yes"
 
 #}}}
 
 #Цветовая схема#{{{
 
-colors_enabled			= "yes"
-empty_tag_color			= "green"
-header_window_color		= "green"
-volume_color			= "green"
-state_line_color		= "blue"
-state_flags_color		= "blue"
-main_window_color		= "blue"
-color1				= "blue"
-color2				= "red"
-main_window_highlight_color	= "red"
-progressbar_color		= "blue"
-statusbar_color			= "green"
-active_column_color		= "green"
-window_border_color		= "green"
-active_window_border		= "magenta"
-active_window_border            = "red"
-alternative_ui_separator_color  = "blue"
+colors_enabled = "yes"
+empty_tag_color = "green"
+header_window_color = "green"
+volume_color = "green"
+state_line_color = "blue"
+state_flags_color = "blue"
+main_window_color = "blue"
+color1 = "blue"
+color2 = "red"
+main_window_highlight_color = "red"
+progressbar_color = "blue"
+statusbar_color = "green"
+active_column_color = "green"
+window_border_color = "green"
+active_window_border = "magenta"
+active_window_border = "red"
+alternative_ui_separator_color = "blue"
 
 #}}}
 
diff --git a/etc/shell/bash/aliases b/etc/shell/bash/aliases
index 9d20440..6ab1708 100755
--- a/etc/shell/bash/aliases
+++ b/etc/shell/bash/aliases
@@ -1,6 +1,6 @@
 #!/bin/bash ####################################################################
 #
-# Изменён: Чт 16 янв 2014 06:16:04
+# Изменён: Чт 13 мар 2014 15:25:48
 #
 ################################################################################
 #{{{				Псевдонимы
@@ -176,7 +176,7 @@ pnext() {
 a2mp3() { lame -b $2 --noreplaygain -q 0 -m s -k -p "$1"; }
 
 #- Лог scmpc/last.fm
-lastfmlog() { watch -n 1 "tail $SHELLRC/var/log/scmpc.log"; }
+lastfmlog() { watch -n 1 "tail $SHELLRC/var/log/mpdscribble.log"; }
 
 #}}} ###########################################################################
 #{{{ \033[00m\n\b------<Сетевые_функции>\n
diff --git a/etc/soft/conky/conkyrc.AuthenticAMD b/etc/soft/conky/conkyrc.AuthenticAMD
index 8ebcafa..50fb005 100644
--- a/etc/soft/conky/conkyrc.AuthenticAMD
+++ b/etc/soft/conky/conkyrc.AuthenticAMD
@@ -46,6 +46,7 @@ ${if_mounted /home}$color | home: ${color brown}${fs_free /home/maks}${endif}\
 ${if_mounted /mnt/DATA}$color | data: ${color brown}${fs_free /mnt/DATA}${endif}\
 ${if_mounted /mnt/MEDIA}$color | media: ${color brown}${fs_free /mnt/MEDIA}${endif}\
 ${if_mounted /mnt/FLASH}$color | flash: ${color brown}${fs_free /mnt/FLASH}${endif}\
+${if_mpd_playing}${offset 50}${color darkgreen}[$mpd_smart - $mpd_length/$mpd_percent%]$color${endif}\
 ${goto 1103}\
 ${color darkred} ${execi 86400 dates >/dev/null && echo "[✻] " || echo ""}$color\
 ${if_match ${battery_percent BAT0} <= 20}${color red}${endif}\