diff --git a/res/arrows.png b/res/arrows.png
new file mode 100644
index 0000000..a7c75bd
Binary files /dev/null and b/res/arrows.png differ
diff --git a/res/menu_icons.png b/res/menu_icons.png
index b798a89..73846cb 100755
Binary files a/res/menu_icons.png and b/res/menu_icons.png differ
diff --git a/res/mobile.js b/res/mobile.js
new file mode 100644
index 0000000..4d8089d
--- /dev/null
+++ b/res/mobile.js
@@ -0,0 +1,107 @@
+$(document).on('click', '.show_more_info_profile_link', (e) => {
+    $('.show_more_info_profile_content').toggleClass('active')
+    $('.show_more_info_profile_link').html([tr('mobile_user_info_show_details'), tr('mobile_user_info_hide')][Number($('.show_more_info_profile_content').hasClass('active'))])
+})
+
+u(document).on("click", ".post-like-button-natural", function(e) {
+    e.preventDefault();
+    
+    const thisBtn = u(e.target).closest('a');
+    const link    = thisBtn.attr("href");
+    const heart   = thisBtn.find('.like');
+    const counter = thisBtn.find('.likeCnt');
+    const likes   = counter.text() === "" ? 0 : counter.text();
+    const isLiked = Number(thisBtn.attr("data-liked")) == 1;
+
+    fetch(link, {
+        method: 'POST'
+    })
+
+    thisBtn.attr("data-liked", isLiked ? '1' : '0')
+
+    if(!isLiked) {
+        heart.attr("id", 'liked');
+    } else {
+        heart.attr("id", '');
+    }
+    
+    counter.text(parseInt(likes) + (isLiked ? -1 : 1));
+    if (counter.text() === "0") {
+        counter.text("");
+    }
+    
+    return false;
+})
+
+u(document).on('click', '#search_options_toggler', (e) => {
+    u('.search_options').toggleClass('hidden')
+    u('#search_options_toggler_arrow').toggleClass('shown')
+})
+
+u(document).on('click', '#__mobile_reset_search', (e) => {
+    u('.main .header_search_inputbt .sr_input').nodes[0].value = ''
+    u(`.page_search_options input[type='text']`).nodes.forEach(inp => {
+        inp.value = ''
+    })
+
+    u(`.page_search_options input[type='checkbox']`).nodes.forEach(chk => {
+        chk.checked = false
+    })
+
+    u(`.page_search_options input[type='radio']`).nodes.forEach(rad => {
+        if(rad.dataset.default) {
+            rad.checked = true
+            return
+        }
+
+        rad.checked = false
+    })
+
+    u(`.page_search_options select`).nodes.forEach(sel => {
+        sel.value = sel.dataset.default
+    })
+})
+
+function escapeHtml(text) {
+    var map = {
+      '&': '&',
+      '<': '&lt;',
+      '>': '&gt;',
+      '"': '&quot;',
+      "'": '&#039;'
+    };
+    
+    return text.replace(/[&<>"']/g, function(m) { return map[m]; });
+}
+
+// maybe сделать скрипт с подобными функциями чтобы не приходилось копипастить?
+function highlightText(searchText, container_selector, selectors = []) {
+    const container = u(container_selector)
+    const regexp = new RegExp(`(${searchText})`, 'gi')
+
+    function highlightNode(node) {
+        if(node.nodeType == 3) {
+            let newNode = escapeHtml(node.nodeValue)
+            newNode = newNode.replace(regexp, (match, ...args) => {
+                return `<span class='highlight'>${escapeHtml(match)}</span>`
+            })
+            
+            const tempDiv = document.createElement('div')
+            tempDiv.innerHTML = newNode
+
+            while(tempDiv.firstChild) {
+                node.parentNode.insertBefore(tempDiv.firstChild, node)
+            }
+            node.parentNode.removeChild(node)
+        } else if(node.nodeType === 1 && node.tagName !== 'SCRIPT' && node.tagName !== 'BR' && node.tagName !== 'STYLE') {
+            Array.from(node.childNodes).forEach(highlightNode);
+        }
+    }
+
+    selectors.forEach(selector => {
+        elements = container.find(selector)
+        if(!elements || elements.length < 1) return;
+
+        elements.nodes.forEach(highlightNode)
+    })
+}
diff --git a/res/mobile_audios.js b/res/mobile_audios.js
index 907266a..ecc94ae 100644
--- a/res/mobile_audios.js
+++ b/res/mobile_audios.js
@@ -45,14 +45,14 @@ function initPlayer(id, keys, url, length) {
         }
     };
 
-    player.querySelector(".tracks").style.display = "flex"
-
     const dashPlayer = dashjs.MediaPlayer().create();
     dashPlayer.initialize(audio, url, false);
     dashPlayer.setProtectionData(protData);
 
     playButton.addEventListener("click", (event) => {
         if(audio.paused) {
+            u('.tracks').attr('style', 'display:none;')
+            player.querySelector(".tracks").style.display = "flex"
             document.querySelectorAll('audio').forEach(el => el.pause());
             audio.play()
         } else {
@@ -84,7 +84,7 @@ function initPlayer(id, keys, url, length) {
             nextPlayer = player.nextElementSibling
         }
 
-        if(!nextPlayer) return
+        if(!nextPlayer || nextPlayer.classList.contains('withdrawn')) return
 
         initPlayer(nextPlayer.dataset.id, 
         JSON.parse(nextPlayer.dataset.keys), 
@@ -122,7 +122,7 @@ function initPlayer(id, keys, url, length) {
                 player.querySelector(".lengthTrack .usedPart").style.width = `${ ps}%`;
         })
     } catch(e) {
-        console.log("Что-то ёбнулось")
+        console.log("Что-то сломалось.")
     }
 
     // тяжело без jquery
@@ -195,4 +195,36 @@ $(document).on("click", "#bookmarkPlaylist, #unbookmarkPlaylist", (e) => {
                 fastError(response.flash.message)
         }
     })
-})
\ No newline at end of file
+})
+
+u(document).on('click', '.litePlayer .add-icon, .litePlayer .del-icon', (e) => {
+    const target = u(e.target)
+    const act = target.hasClass('add-icon') ? 'add' : 'remove'
+    const id  = Number(target.attr('data-id'))
+    $.ajax({
+        type: 'POST',
+        url: `/audio${id}/action?act=${act}`,
+        data: {
+            hash: u("meta[name=csrf]").attr("value"),
+        },
+        beforeSend: () => {
+            target.addClass('lagged')
+        },
+        success: (response) => {
+            target.removeClass('lagged')
+            if(response.success) {
+                if(act == 'add') {
+                    target.addClass('del-icon')
+                    target.removeClass('add-icon')
+                } else {
+                    target.removeClass('del-icon')
+                    target.addClass('add-icon')
+                }
+                
+                return
+            }
+                
+            console.error(response)
+        }
+    })
+})
diff --git a/res/podrobnee.js b/res/podrobnee.js
deleted file mode 100755
index 2587f0c..0000000
--- a/res/podrobnee.js
+++ /dev/null
@@ -1,90 +0,0 @@
-let p_bt = null
-let p_content = null
-if(document.querySelector('.podrobnee') != null) {
-
-    p_bt = document.querySelector('.podrobnee');
-    p_content = document.querySelector('.podrobnee_content');
-
-    p_bt.addEventListener('click', function(){
-        let text = ["Показать подробнее", "Скрыть"];
-        p_bt.innerText = text[Number(p_bt.innerText === text[0])]
-        p_content.classList.toggle('active');
-    });
-}
-
-/*u(".post-like-button").on("click", function(e) {
-    e.preventDefault();
-    
-    var thisBtn = u(this).first();
-    var link    = u(this).attr("href");
-    var heart   = u(".like", thisBtn);
-    var counter = u(".likeCnt", thisBtn);
-    var likes   = counter.text() === "" ? 0 : counter.text();
-    var isLiked = heart.attr("id") === 'liked';
-    
-    ky(link);
-    heart.attr("id", isLiked ? '' : 'liked');
-    counter.text(parseInt(likes) + (isLiked ? -1 : 1));
-    if (counter.text() === "0") {
-        counter.text("");
-    }
-    
-    return false;
-});*/
-
-function mobileRepost(postId) {
-    let el   = document.getElementById("post"+postId+"_actions")
-    let hash = document.querySelector("meta[name=csrf]").getAttribute("value");
-
-    if(document.querySelector("#post"+postId+"_actions #mobile_repost"+postId) == null) {
-        el.insertAdjacentHTML("beforeend", `
-            <div class="mobile_repost" id="mobile_repost${postId}">
-                ${tr('your_comment')}:
-                <textarea name="text" id='uRepostMsgInput_${postId}'></textarea><br/>
-                <input type="hidden" name="hash" value="${hash}">
-                <input id="repSubmit" class="button" type="button" value="${tr('send')}">
-            </div>
-        `)
-
-        repSubmit.onclick = () => {
-            text = document.querySelector("#uRepostMsgInput_"+postId).value;
-            type = "wall";
-
-            let xhr = new XMLHttpRequest()
-            xhr.open("POST", "/wall"+postId+"/repost?hash="+encodeURIComponent(hash), true);
-            xhr.setRequestHeader('Content-type', 'application/x-www-form-urlencoded');
-            xhr.onload = (function() {
-                if(xhr.responseText.indexOf("wall_owner") === -1) {
-                    el.innerHTML = "can't repost"
-                } else {
-                    let jsonR = JSON.parse(xhr.responseText);
-                    location.href = "/wall" + jsonR.wall_owner
-                }
-            });
-
-            xhr.send('text='+encodeURI(text) + '&type='+type);
-        }
-    } else {
-        document.getElementById("post"+postId+"_actions").innerHTML = ""
-    }
-}
-
-if(document.querySelector("#_noteDelete") != null) {
-    document.querySelector("#_noteDelete").addEventListener("click", (e) => {
-        let link = e.currentTarget.href
-        let hash = document.querySelector("meta[name=csrf]").getAttribute("value")
-        let id   = e.currentTarget.dataset.id
-    
-        let xhr = new XMLHttpRequest()
-        xhr.open("POST", link)
-        xhr.setRequestHeader('Content-type', 'application/x-www-form-urlencoded');
-    
-        xhr.onload = () => {
-            location.href = "/notes"+id
-        }
-        
-        xhr.send('hash='+encodeURIComponent(hash));
-    
-        e.preventDefault()
-    })
-}
\ No newline at end of file
diff --git a/stylesheet.css b/stylesheet.css
index cf7a22a..fe97ca8 100755
--- a/stylesheet.css
+++ b/stylesheet.css
@@ -1,9 +1,5 @@
 input[type=checkbox],
 input[type=radio] {
-    background-color: transparent;
-    -webkit-appearance: none;
-    -moz-appearance: none;
-    -ms-appearance: none;
     height: 14px;
     width: 14px;
     outline: none;
@@ -15,10 +11,10 @@ input[type=radio] {
 input[type=checkbox] {
     background-image: url("data:image/gif;base64,R0lGODlhDwA4ALMAAP//////AP8A//8AAAD//wD/AAAA/wAAADtZd8XKzuHh4crKysHBwba2tv///wAAACH5BAEAAA4ALAAAAAAPADgAAASzcMlJqVsg653X5SDgYeE2luaHdup6rmKLvq5c0rMdjlUvXb6eDoRAkFBF4yqZOBKLi2aJSUNomE1VEoCNkRLJYiLB+oLF5LJmjBinnOO0BncDBi2NvH6/dzQUgIGCgA1+g4cKhX+IgoqMjYaPhJGSjpKJlI+WlZmMm5qdiIp8pHl+paShh0WLj0mtiEywg0kMCbOBTAyUCLlolkkKWJiLZ8PEgGxogZtsY5CwcYOfnqeofREAOw==");
     width: 15px;
-}
-
-input[type=radio] {
-    background-image: url("../img/radio.png");
+    background-color: transparent;
+    -webkit-appearance: none;
+    -moz-appearance: none;
+    -ms-appearance: none;
 }
 
 input[type=checkbox]:hover,
@@ -41,6 +37,16 @@ input[type=radio]:checked:hover {
     -webkit-appearance: none;
 }
 
+.noOverflow {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+
+iframe {
+    width: 100%;
+}
+
 a, a:active, a:visited {
     color: #3b3b3b;
     text-decoration: none;
@@ -494,7 +500,7 @@ input, button { -webkit-appearance: button;}
 .tabs {
     margin-top: 11px;
     padding-bottom: 11px;
-    overflow-x: scroll;
+    overflow-x: auto;
     white-space: nowrap;
 }
 
@@ -548,7 +554,7 @@ input, button { -webkit-appearance: button;}
 .picCarousel {
     padding: 8px 0;
     width: 100%;
-    overflow-x: scroll;
+    overflow-x: auto;
     white-space: nowrap;
 }
 
@@ -964,7 +970,7 @@ img.rounded, .post > .author > .ava {
     background: #efefef;
 }
 /*OK*/
-.splist:active {
+.splist:active, .video-list-view:active table, .container_gray a:active table {
     background: #e6e6e6;
 }
 .splistava {
@@ -1003,18 +1009,25 @@ img.rounded, .post > .author > .ava {
 .photolist {
     padding: 10px;
 }
+
 .phlistlink {
     padding-top: 10px;
 }
+
+.phlistlink a {
+    display: block;
+    width: 96%;
+}
+
+.phlistlink a:focus {
+    background: #e7e7ed;
+}
+
 .searchinput {
     padding: 10px;
     padding-top: 1px;
 }
 
-
-
-
-
 .menuovk {
     background: #fff;
     width: 100%;
@@ -1068,6 +1081,8 @@ img.rounded, .post > .author > .ava {
     width: 100%;
     text-align: center;
     margin-top: 3px;
+    cursor: pointer;
+    user-select: none;
 }
 .podrobnee:hover {
     background: #e4eaef;
@@ -1140,6 +1155,7 @@ img.rounded, .post > .author > .ava {
 
 
 .listView_img {
+    width: 55px;
     max-width: 55px;
     max-height: 55px;
     border-radius: 2px;
@@ -1238,7 +1254,6 @@ h4 {
     border-radius: 2px;
     outline-color: #5d80a6;
     -webkit-appearance: button;
-    margin-top: 8px;
     width: 100%;
 }
 .button.cfa.sr {
@@ -1555,7 +1570,7 @@ h4 {
 }
 
 #notfg{
-    background-position: 0px -392px;
+    background-position: 0px -393px;
 }
 
 .element.prmenu.gray a {
@@ -1861,6 +1876,7 @@ input[type~="search"]{
 }
 
 .container_gray .content {
+    display: block;
     background: #fff;
     padding: 4px;
     border: #DEDEDE solid 1px;
@@ -1871,7 +1887,7 @@ input[type~="search"]{
 }
 
 .ovk-video>.preview, .video-preview {
-    width: 126px;
+    width: 170px;
     height: 127px;
     align-content: center;
     display: flex;
@@ -1880,6 +1896,12 @@ input[type~="search"]{
     background-color: #000;
 }
 
+.ovk-video>.preview img , .video-preview img {
+    width: 100%;
+    max-height: 127px; 
+    margin: auto;
+}
+
 .gift_grid {
     width: 100%;
     padding: 5px;
@@ -2043,6 +2065,11 @@ label, .poll > input[type=checkbox]{
     cursor: pointer;
     vertical-align: middle;
     margin-top: 0%;
+    font-size: 17px;
+}
+
+label {
+    color: black;
 }
 
 .poll-option{
@@ -2221,6 +2248,11 @@ select {
     height: 47px;
 }
 
+.litePlayer.withdrawn, .litePlayer.processing {
+    opacity: 0.2;
+    pointer-events: none;
+}
+
 .audioEntry {
     clear: both;
     display: table;
@@ -2231,8 +2263,40 @@ select {
     gap: 18px 0px;
 }
 
-.litePlayer .playButton {
+.audioEntry .audioButtons, .audioEntry:active .length, .audioEntry:hover .length {
+    display: none;
+}
+
+.audioEntry:active .audioButtons, .audioEntry:hover .audioButtons {
+    display: flex;
+}
+
+.audioEntry .audioButtons {
+    justify-content: flex-end;
+    align-items: center;
+}
+
+.audioEntry .audioButtons > div {
+    cursor: pointer;
+}
+
+.audioEntry .audioButtons .del-icon {
+    width: 15px;
+    height: 15px;
+    background-position: -52px -5px;
+}
+
+.audioEntry .audioButtons .add-icon {
+    width: 15px;
+    height: 15px;
+    background-position: -77px -5px;
+}
+
+.litePlayer .mobileAudiosSpritesheet, .litePlayer .playButton {
     background-image: url("/themepack/mobile_ovk/0.0.1.0/resource/mobile_audios.png");
+}
+
+.litePlayer .playButton {
     width: 28px;
     height: 31px;
     background-size: 236px;
@@ -2350,11 +2414,120 @@ select {
     padding: 14px;
 }
 
-.playlistInfo {
+.playlistBlock .playlistInfo {
     margin-top: -9px;
 }
 
+.playlistBlock .playlistCover img {
+    width: 146px;
+    height: 146px;
+}
+
 .lagged *, .lagged {
     pointer-events: none;
     opacity: 50%;
-}
\ No newline at end of file
+}
+
+.feedTransition {
+    background: #ffffff;
+    padding: 9px 8px;
+    border-bottom: 1px solid #dee5eb;
+    cursor: pointer;
+    display: block;
+}
+
+.feedTransition:active {
+    background: #f3f3f3;
+}
+
+.search_options_wrapper {
+    margin-top: 25px;
+}
+
+#search_options_toggler {
+    user-select: none;
+}
+
+#search_options_toggler #search_options_toggler_arrow {
+    display: inline-block;
+    width: 21px;
+    height: 11px;
+    margin: 0px 0px -2px -3px;
+}
+
+#search_options_toggler #search_options_toggler_arrow.shown {
+    background-position: 0px -11px;
+}
+
+.search_options {
+    border-top: 1px solid #dee5eb;
+    margin-top: 3px;
+    padding: 3px 0px 3px 0px;
+    display: flex;
+    flex-direction: column;
+    gap: 10px;
+}
+
+.search_options.hidden {
+    display: none;
+}
+
+.search_options .search_option {
+    display: flex;
+    flex-direction: column;
+    gap: 4px;
+}
+
+.search_options .search_option b {
+    display: block;
+}
+
+.search_options .search_option label {
+    width: 100%;
+}
+
+.search_options .search_option label.wheight {
+    height: 46px;
+}
+
+.playlistListView {
+    display: flex;
+    flex-direction: row;
+    gap: 9px;
+    margin-bottom: 20px;
+}
+
+.playlistListView:active, .playlistListView .playlistCover {
+    background: #ebebeb;
+}
+
+.playlistListView .playlistInfo, .playlistListView .playlistInfo .playlistInfoTopPart {
+    display: flex;
+    flex-direction: column;
+}
+
+.playlistListView .playlistInfo {
+    gap: 2px;
+    overflow: hidden;
+}
+
+.playlistListView .playlistCover img {
+    width: 122px;
+    height: 122px;
+    object-fit: contain;
+}
+
+.playlistListView .playlistInfo .playlistInfoTopPart span {
+    font-weight: 600;
+}
+
+.arrows_spritesheet {
+    background: url('/themepack/mobile_ovk/0.0.1.0/resource/arrows.png');
+}
+
+.highlight {
+    background: #ffea6d;
+    border-bottom: 1px solid #c7c727;
+    font-weight: bolder;
+    padding: 0px 1px;
+}
diff --git a/tpl/@layout.xml b/tpl/@layout.xml
index a6d09e9..aadb77f 100755
--- a/tpl/@layout.xml
+++ b/tpl/@layout.xml
@@ -22,7 +22,7 @@
 
         {ifset headIncludes}{include headIncludes}{/ifset}
         <script defer src="/themepack/mobile_ovk/0.0.1.0/resource/menu.js"></script>
-        <script defer src="/themepack/mobile_ovk/0.0.1.0/resource/podrobnee.js"></script>
+        <script src="/themepack/mobile_ovk/0.0.1.0/resource/mobile.js?v=1"></script>
     </head>
 
 
@@ -34,15 +34,15 @@
                 <div class="head_now">{include title}</div>
 
                 {ifset $thisUser}
-
-                <a href="/im" class="ovk_mobile_mail_icon" onClick="event.stopPropagation();">{if $thisUser->getUnreadMessagesCount() > 0}<b>{$thisUser->getUnreadMessagesCount()}</b>{/if}</a>
-                     <div class="search_menu_box" style="" onClick="event.stopPropagation();"><form action="/search" method="get">
-                                    <input type="search" name="query" placeholder="{_header_search}" style="padding-left: 18px;" accesskey="f">
-                                </form></div>
-
-                                
-                                {else}
-<div class="search_menu_box"></div>
+                    <a href="/im" class="ovk_mobile_mail_icon" onClick="event.stopPropagation();">{if $thisUser->getUnreadMessagesCount() > 0}<b>{$thisUser->getUnreadMessagesCount()}</b>{/if}</a>
+                    
+                    <div class="search_menu_box" style="" onClick="event.stopPropagation();">
+                        <form action="/search" method="get">
+                            <input type="search" name="q" placeholder="{_header_search}" style="padding-left: 18px;" accesskey="f">
+                        </form>
+                    </div>          
+                {else}
+                    <div class="search_menu_box"></div>
                 {/ifset}
 
             </div>
diff --git a/tpl/Audio/List.xml b/tpl/Audio/List.xml
index 82e26a4..d8a31ab 100644
--- a/tpl/Audio/List.xml
+++ b/tpl/Audio/List.xml
@@ -49,17 +49,17 @@
             </a>
         </div>
         <div n:attr="id => $mode === 'new' ? activetabs : ''" class="tab">
-            <a n:attr="id => $mode === 'new' ? 'act_tab_a' : ''" href="/audios/new">
+            <a n:attr="id => $mode === 'new' ? 'act_tab_a' : ''" href="/search?section=audios">
                 {_audio_new}
             </a>
         </div>
         <div n:attr="id => $mode === 'popular' ? activetabs : ''" class="tab">
-            <a n:attr="id => $mode === 'popular' ? 'act_tab_a' : ''" href="/audios/popular">
+            <a n:attr="id => $mode === 'popular' ? 'act_tab_a' : ''" href="/search?section=audios&order=listens">
                 {_audio_popular}
             </a>
         </div>
         <div n:attr="id => $mode === 'playlists' ? activetabs : ''" class="tab">
-            <a n:attr="id => $mode === 'playlists' ? 'act_tab_a' : ''" href="/playlists{$thisUser->getId()}">
+            <a n:attr="id => $mode === 'playlists' ? 'act_tab_a' : ''" href="/playlists{$owner->getRealId()}">
                 {_playlists}
             </a>
         </div>
@@ -70,8 +70,8 @@
         </div>
 
         <form class="searchPanel" action="/search" method="GET" n:if="$mode != 'playlists' && $isMy">
-            <input type="text" name="query" placeholder="{_enter_a_name_or_artist}">
-            <input type="hidden" name="type" value="audios">
+            <input type="text" name="q" placeholder="{_enter_a_name_or_artist}">
+            <input type="hidden" name="section" value="audios">
 
             <input type="submit" class="button cfa sr" value="{_header_search}">
         </form>
@@ -106,26 +106,9 @@
             </a>
 
             {if $playlistsCount > 0}
-                <a href="{$playlist->getURL()}" n:foreach="$playlists as $playlist"><div class="content list_w_link" id="userContent">
-                    <table><tbody>
-                        <tr>
-                            <td valign="top">
-                                <a href="{$playlist->getURL()}">
-                                    <img src="{$playlist->getCoverURL()}" style="width: 107px;height: 107px;">
-                                </a>
-                            </td>
-                            <td valign="top" style="width: 100%">
-                                <a href="{$playlist->getURL()}">
-                                    <b style="font-size: 17px;">
-                                        {$playlist->getName()}
-                                    </b>
-                                </a>
-                                <br/>
-                                {$playlist->getOwner()->getCanonicalName()}
-                            </td>
-                        </tr>
-                    </tbody></table>
-                </div></a>
+                {foreach $playlists as $playlist}
+                    {include "../Audio/playlistListView.xml", playlist => $playlist}
+                {/foreach}
 
                 <div style="padding-bottom: 16px;float: right;">
                     {include "../components/paginator.xml", conf => (object) [
diff --git a/tpl/Audio/Playlist.xml b/tpl/Audio/Playlist.xml
index 05d6dcf..3538197 100644
--- a/tpl/Audio/Playlist.xml
+++ b/tpl/Audio/Playlist.xml
@@ -3,38 +3,45 @@
 {block title}{_playlist}{/block}
 
 {block body}
-    {php $count = $playlist->size()}
-
     <div class="playlistBlock">
-        <div style="display: flex;">
-            <div class="playlistCover" style="float: left;">
-                <img src="{$playlist->getCoverURL('normal')}" alt="{_playlist_cover}">
-            </div>
-
-            <div style="float: left;padding-left: 13px;width:75%">
+        <div style="display: flex;gap: 13px;">
+            {if $cover}
+                <a href="{$cover->getPageURL()}" class="playlistCover" >
+                    <img src="{$cover_url}" alt="{_playlist_cover}">
+                </a>
+            {else}
+                <a class="playlistCover">
+                    <img src="{$cover_url}" alt="{_playlist_cover}">
+                </a>
+            {/if}
+            <div>
                 <div class="playlistInfo">
                     <h4 style="border-bottom:unset;margin-bottom: 0px;">{$playlist->getName()}</h4>
-                    <a style="font-size: 17px;" href="{$playlist->getOwner()->getURL()}">{$playlist->getOwner()->getCanonicalName()}</a>
+                    <a style="font-size: 16px;" href="{$playlist->getOwner()->getURL()}">{$playlist->getOwner()->getCanonicalName()}</a>
                     <div class="moreInfo">
                         {$playlist->getMetaDescription()|noescape}
 
                         <div style="margin-top: 11px;">
                             <span>{nl2br($playlist->getDescriptionHTML())|noescape}</span>
                         </div>
-
-                        <a href="/playlist{$playlist->getPrettyId()}/edit" n:if="$playlist->canBeModifiedBy($thisUser)">
-                            <input type="button" class="button cfa sr" value="{_edit_playlist}">
-                        </a>
-                        <a id="bookmarkPlaylist" data-id="{$playlist->getId()}" n:if="!$isBookmarked">
-                            <input type="button" class="button cfa sr" value="{_bookmark}">
-                        </a>
-                        <a id="unbookmarkPlaylist" data-id="{$playlist->getId()}" n:if="$isBookmarked">
-                            <input type="button" class="button cfa sr" value="{_unbookmark}">
-                        </a>
                     </div>
                 </div>
             </div>
         </div>
+        <div>
+            <a href="/player/upload?playlist={$playlist->getId()}" n:if="$canEdit">
+                <input type="button" class="button cfa sr" value="{_upload_audio}">
+            </a>
+            <a href="/playlist{$playlist->getPrettyId()}/edit" n:if="$playlist->canBeModifiedBy($thisUser)">
+                <input type="button" class="button cfa sr" value="{_edit_playlist}">
+            </a>
+            <a id="bookmarkPlaylist" data-id="{$playlist->getId()}" n:if="!$isBookmarked">
+                <input type="button" class="button cfa sr" value="{_bookmark}">
+            </a>
+            <a id="unbookmarkPlaylist" data-id="{$playlist->getId()}" n:if="$isBookmarked">
+                <input type="button" class="button cfa sr" value="{_unbookmark}">
+            </a>
+        </div>
         <div class="audiosContainer infContainer" style="margin-top: 14px;">
             {if $count < 1}
                 {_empty_playlist}
diff --git a/tpl/Audio/Upload.xml b/tpl/Audio/Upload.xml
index cf07187..d290092 100644
--- a/tpl/Audio/Upload.xml
+++ b/tpl/Audio/Upload.xml
@@ -49,6 +49,7 @@
                         <input type="hidden" name="lyrics" />
                         <input type="hidden" name="genre" />
                         <input type="hidden" name="explicit" />
+                        <input type="hidden" name="unlisted" />
                         
                         <input type="hidden" name="hash" value="{$csrfToken}" />
                         <input id="audio_input" type="file" name="blob" accept="audio/*" style="display:none" />
@@ -60,14 +61,14 @@
             <div id="lastStep" style="display:none;">
                 <table cellspacing="7" cellpadding="10" border="0" align="center">
                     <tbody>
-                        <tr>
-                            <td width="120" valign="top"><span class="nobold">{_audio_name}:</span></td>
-                            <td><input type="text" name="name" autocomplete="off" /></td>
-                        </tr>
                         <tr>
                             <td width="120" valign="top"><span class="nobold">{_performer}:</span></td>
                             <td><input name="performer" type="text" autocomplete="off" /></td>
                         </tr>
+                        <tr>
+                            <td width="120" valign="top"><span class="nobold">{_audio_name}:</span></td>
+                            <td><input type="text" name="name" autocomplete="off" /></td>
+                        </tr>
                         <tr>
                             <td width="120" valign="top"><span class="nobold">{_genre}:</span></td>
                             <td>
@@ -88,6 +89,12 @@
                                 <label><input type="checkbox" name="explicit">{_audios_explicit}</label>
                             </td>
                         </tr>
+                        <tr>
+                            <td width="120" valign="top"></td>
+                            <td>
+                                <label><input type="checkbox" name="unlisted">{_audios_unlisted}</label>
+                            </td>
+                        </tr>
                         <tr>
                             <td width="120" valign="top"></td>
                             <td>
@@ -111,8 +118,22 @@
             
             document.querySelector("#firstStep").style.display = "none"
             document.querySelector("#lastStep").style.display = "block"
+            function fallback() {
+                console.info('Tags not found, setting default values.')
+
+                document.querySelector("#lastStep input[name=name]").value = files[0].name
+                document.querySelector("#lastStep select[name=genre]").value = "Other"
+                document.querySelector("#lastStep input[name=performer]").value = tr("track_unknown");
+            }
+            
+            let tags = null
+
+            try {
+                tags = await id3.fromFile(files[0]);
+            } catch(e) {
+                console.error(e)
+            }
             
-            let tags = await id3.fromFile(files[0]);
             if(tags != null) {
                 console.log("ID" + tags.kind + " detected, setting values...");
                 
@@ -127,17 +148,31 @@
                     document.querySelector("#lastStep input[name=performer]").value = tr("track_unknown");
                 
                 if(tags.genre != null) {
-                    if(document.querySelector("#lastStep select[name=genre] > option[value='" + tags.genre + "']") != null) {
-                        document.querySelector("#lastStep select[name=genre]").value = tags.genre;
+                    // if there are more than one genre
+                    if(tags.genre.split(', ').length > 1) {
+                        const genres = tags.genre.split(', ')
+
+                        genres.forEach(genre => {
+                            if(document.querySelector("#lastStep select[name=genre] > option[value='" + genre + "']") != null) {
+                                document.querySelector("#lastStep select[name=genre]").value = genre;
+                            }
+                        })
                     } else {
-                        console.warn("Unknown genre: " + tags.genre);
-                        document.querySelector("#lastStep select[name=genre]").value = "Other"
+                        if(document.querySelector("#lastStep select[name=genre] > option[value='" + tags.genre + "']") != null) {
+                            document.querySelector("#lastStep select[name=genre]").value = tags.genre;
+                        } else {
+                            console.warn("Unknown genre: " + tags.genre);
+                            document.querySelector("#lastStep select[name=genre]").value = "Other"
+                        }
                     }
+                } else {
+                    document.querySelector("#lastStep select[name=genre]").value = "Other"
                 }
+
+                if(tags.comments != null)
+                    document.querySelector("#lastStep textarea[name=lyrics]").value = tags.comments
             } else {
-                document.querySelector("#lastStep input[name=name]").value = files[0].name
-                document.querySelector("#lastStep select[name=genre]").value = "Other"
-                document.querySelector("#lastStep input[name=performer]").value = tr("track_unknown");
+                fallback()
             }
         });
 
@@ -158,12 +193,14 @@
             var genre_  = document.querySelector("#audio_upload input[name=genre]");
             var lyrics_ = document.querySelector("#audio_upload input[name=lyrics]");
             var explicit_ = document.querySelector("#audio_upload input[name=explicit]");
+            var unlisted_ = document.querySelector("#audio_upload input[name=unlisted]");
 
             name_.value = document.querySelector("#lastStep input[name=name]").value
             perf_.value = document.querySelector("#lastStep input[name=performer]").value
             genre_.value = document.querySelector("#lastStep select[name=genre]").value
             lyrics_.value = document.querySelector("#lastStep textarea[name=lyrics]").value
             explicit_.value = document.querySelector("#lastStep input[name=explicit]").checked ? "on" : "off"
+            unlisted_.value = document.querySelector("#lastStep input[name=unlisted]").checked ? "on" : "off"
 
             $("#audio_upload > form").trigger("submit");
         })
diff --git a/tpl/Audio/player.xml b/tpl/Audio/player.xml
index 83a4908..50a4e91 100644
--- a/tpl/Audio/player.xml
+++ b/tpl/Audio/player.xml
@@ -1,7 +1,9 @@
 {php $id = $audio->getId() . rand(0, 1000)}
 {php $isWithdrawn = $audio->isWithdrawn()}
+{php $isAvailable = $audio->isAvailable()}
+{php $hasAudio = isset($thisUser) && $audio->isInLibraryOf($thisUser)}
 {php $editable = isset($thisUser) && $audio->canBeModifiedBy($thisUser)}
-<div class="litePlayer" data-id="{$id}" data-realid="{$audio->getId()}" data-name="{$audio->getName()}" data-length="{$audio->getLength()}" data-keys="{json_encode($audio->getKeys())}" data-url="{$audio->getURL()}">
+<div n:class="litePlayer, $isWithdrawn ? withdrawn, !$isAvailable ? processing" data-id="{$id}" data-realid="{$audio->getId()}" data-name="{$audio->getName()}" data-length="{$audio->getLength()}" data-keys="{json_encode($audio->getKeys())}" data-url="{$audio->getURL()}">
     <audio class="audio" />
 
     <div class="audioEntry">
@@ -9,12 +11,22 @@
 
         <div class="audioInfo noOverflow">
             <div class="noOverflow" style="height:20px;max-width: 446px;">
-                <a class="performer" href="/search?type=audios&only_performers=on&query={urlencode($audio->getPerformer())}">{$audio->getPerformer()}</a>
+                <a class="performer" href="/search?section=audios&only_performers=on&q={urlencode($audio->getPerformer())}">{$audio->getPerformer()}</a>
                 —
                 <span class="name {if !empty($audio->getLyrics())}hasLyrics{/if}">{$audio->getTitle()}</span>
+                <svg n:if="$audio->isExplicit()" class="explicitMark" xmlns="http://www.w3.org/2000/svg" height="11" viewBox="0 0 11 11" width="11">
+                    <path d="m1 2.506v5.988a1.5 1.5 0 0 0 1.491 1.506h6.019c.827 0 1.49-.674 1.49-1.506v-5.988a1.5 1.5 0 0 0 -1.491-1.506h-6.019c-.827 0-1.49.674-1.49 1.506zm4 2.494v-1h2v-1h-3v5h3v-1h-2v-1h2v-1zm-5-2.494a2.496 2.496 0 0 1 2.491-2.506h6.019a2.5 2.5 0 0 1 2.49 2.506v5.988a2.496 2.496 0 0 1 -2.491 2.506h-6.019a2.5 2.5 0 0 1 -2.49-2.506z" />
+                </svg>
             </div>
         </div>
 
+        <div class='audioButtons'>
+            {if !$hasAudio}
+                <div class="add-icon mobileAudiosSpritesheet" data-id="{$audio->getId()}" n:if="isset($thisUser) && !$isWithdrawn" ></div>
+            {else}
+                <div class="del-icon mobileAudiosSpritesheet" data-id="{$audio->getId()}" n:if="isset($thisUser)" ></div>
+            {/if}
+        </div>
         <div class="length">
             <span class="lengthText">{$audio->getFormattedLength()}</span>
         </div>
diff --git a/tpl/Audio/playlistListView.xml b/tpl/Audio/playlistListView.xml
new file mode 100644
index 0000000..e7daa9f
--- /dev/null
+++ b/tpl/Audio/playlistListView.xml
@@ -0,0 +1,20 @@
+<a href="/playlist{$playlist->getPrettyId()}" class='playlistListView'>
+    <div class="playlistCover">
+        <img src="{$playlist->getCoverURL('normal')}" alt="{_playlist_cover}">
+    </div>
+
+    <div class="playlistInfo">
+        <div class="playlistInfoTopPart">
+            <span class="playlistName noOverflow">
+                {$playlist->getName()}
+            </span>
+            <span n:if='!empty($playlist->getDescription())' class="playlistDesc noOverflow">
+                {$playlist->getDescription()}
+            </span>
+        </div>
+
+        <span class="playlistMeta">
+            {$playlist->getMetaDescription()|noescape}
+        </span>
+    </div>
+</a>
diff --git a/tpl/Notification/Feed.xml b/tpl/Notification/Feed.xml
index f01b273..b04bf6f 100755
--- a/tpl/Notification/Feed.xml
+++ b/tpl/Notification/Feed.xml
@@ -12,7 +12,7 @@
 
 {block tabs}
     <div n:attr="id => ($mode === 'new' ? 'activetabs' : 'ki')" class="tab">
-        <a n:attr="id => ($mode === 'new' ? 'act_tab_a' : 'ki')" href="?">{_unread}</a>
+        <a n:attr="id => ($mode === 'new' ? 'act_tab_a' : 'ki')" href="?act=new">{_unread}</a>
     </div>
     <div n:attr="id => ($mode === 'archived' ? 'activetabs' : 'ki')" class="tab">
         <a n:attr="id => ($mode === 'archived' ? 'act_tab_a' : 'ki')" href="?act=archived">{_archive}</a>
diff --git a/tpl/Search/Index.xml b/tpl/Search/Index.xml
index db8567a..d5d8b89 100755
--- a/tpl/Search/Index.xml
+++ b/tpl/Search/Index.xml
@@ -1,138 +1,223 @@
 {extends "../@layout.xml"}
 
 {block title}
-    {if $type === "users"}
-        {_search_for_users}
-    {else}
-        {_search_for_groups}
+    {tr("search_for_$section")}
+    {if $_REQUEST['q']}
+        - {$_REQUEST['q']}
     {/if}
 {/block}
 
 {block titleHeader}
-    {_header_search}
+    {tr("search_for_$section")}
 {/block}
 
-
-
-{* BEGIN ELEMENTS DESCRIPTION *}
-
-
-
 {block tabs}
     <div style="padding:10px">
-        <div {if $type === "users"}id="activetabs"{/if} class="tab">
-            <a {if $type === "users"}id="act_tab_a"{/if} href="/search?type=users">
+        <div n:attr="id => $section === 'users' ? activetabs" class="tab">
+            <a n:attr="id => $section === 'users' ? act_tab_a" href="/search?section=users">
                 {_users}
             </a>
         </div>
-        <div {if $type === "groups"}id="activetabs"{/if} class="tab">
-            <a {if $type === "groups"}id="act_tab_a"{/if} href="/search?type=groups">
+        <div n:attr="id => $section === 'groups' ? activetabs" class="tab">
+            <a n:attr="id => $section === 'groups' ? act_tab_a" href="/search?section=groups">
                 {_groups}
             </a>
         </div>
-        <div {if $type === "posts"}id="activetabs"{/if} class="tab">
-            <a {if $type === "posts"}id="act_tab_a"{/if} href="/search?type=posts">
+        <div n:attr="id => $section === 'posts' ? activetabs" class="tab">
+            <a n:attr="id => $section === 'posts' ? act_tab_a" href="/search?section=posts">
                 {_s_posts}
             </a>
         </div>
-        <div {if $type === "comments"}id="activetabs"{/if} class="tab">
-            <a {if $type === "comments"}id="act_tab_a"{/if} href="/search?type=comments">
-                {_s_comments}
-            </a>
-        </div>
-        <div {if $type === "videos"}id="activetabs"{/if} class="tab">
-            <a {if $type === "videos"}id="act_tab_a"{/if} href="/search?type=videos">
+        <div n:attr="id => $section === 'videos' ? activetabs" class="tab">
+            <a n:attr="id => $section === 'videos' ? act_tab_a" href="/search?section=videos">
                 {_s_videos}
             </a>
         </div>
-        <div {if $type === "audios"}id="activetabs"{/if} class="tab">
-            <a {if $type === "audios"}id="act_tab_a"{/if} href="/search?type=audios">
+        <div n:attr="id => $section === 'audios' ? activetabs" class="tab">
+            <a n:attr="id => $section === 'audios' ? act_tab_a" href="/search?section=audios">
                 {_s_audios}
             </a>
         </div>
+        <div n:attr="id => $section === 'audios_playlists' ? activetabs" class="tab">
+            <a n:attr="id => $section === 'audios_playlists' ? act_tab_a" href="/search?section=audios_playlists">
+                {_s_audios_playlists}
+            </a>
+        </div>
     </div>
 
     <div class="sr_padding" style="margin-left:10px">
         <form class="header_search_inputbt">
-            <input name="type" type="hidden" value="{$type ?? 'users'}" />
-            <input name="query" class="sr_input" placeholder="{_header_search}" value="{$_GET['query'] ?? ''}" />
+            <input name="section" type="hidden" value="{$section ?? 'users'}" />
+            <input name="q" class="sr_input" placeholder="{_header_search}" value="{$_GET['q'] ?? ''}" />
             <button class="button cfa sr">{_search_button}</button>
 
-            {if $type === "audios"}
-                <label>
-                    <input type="checkbox" name="with_lyrics" n:attr="checked => $_GET['with_lyrics'] == 'on'">{_s_with_lyrics}
-                </label>
-                <br>
-                <label>
-                    <input type="checkbox" name="only_performers" n:attr="checked => $_GET['only_performers'] == 'on'">{_s_only_performers}
-                </label>
-            {/if}
+            <div class='search_options_wrapper'>
+                <div id='search_options_toggler'>
+                    <b>{_s_params}</b>
+                    <div class='arrows_spritesheet' id='search_options_toggler_arrow'></div>
+                </div>
+                <div class='page_search_options search_options hidden'>
+                    <div class='search_option'>
+                        <b>{_s_order_by}</b>
+                        <select name="order" data-default='id'>
+                            {if $section == "users"}
+                                <option value="id" n:attr="selected => $order == 'id'">{_s_order_by_reg_date}</option>
+                                
+                                {if OPENVK_ROOT_CONF["openvk"]["preferences"]["commerce"]}
+                                    <option value="rating" n:attr="selected => $order == 'rating'">{_s_order_by_rating}</option>
+                                {/if}
+                            {elseif $section == "posts"}
+                                <option value="id" n:attr="selected => $order == 'id'">{_s_order_by_publishing_date}</option>
+                            {elseif $section == "audios"}
+                                <option value="id" n:attr="selected => $order == 'id'">{_s_order_by_upload_date}</option>
+                            {else}
+                                <option value="id" n:attr="selected => $order == 'id'">{_s_order_by_creation_date}</option>
+                            {/if}
+
+                            {if $section == "audios" || $section == "audios_playlists"}
+                                <option value="length" n:attr="selected  => $order == 'length'">{_s_order_by_length}</option>
+                                <option value="listens" n:attr="selected => $order == 'listens'">{_s_order_by_listens}</option>
+                            {/if}
+                        </select>
+                        
+                        <label n:if="$order != 'rating'">
+                            <input type="checkbox" name="invert" value="1" n:attr="checked => $_REQUEST['invert'] == '1'">
+                            {_s_order_invert}
+                        </label>
+                    </div>
+                    
+                    <div class='search_option' n:if='$section === "audios"'>
+                        <label>
+                            <input type="checkbox" name="with_lyrics" n:attr="checked => $_GET['with_lyrics'] == 'on'">{_s_with_lyrics}
+                        </label>
+                        <label>
+                            <input type="checkbox" name="only_performers" n:attr="checked => $_GET['only_performers'] == 'on'">{_s_only_performers}
+                        </label>
+                        <label class='wheight'>
+                            {_genre}
+                            <select name='genre' data-default='any'>
+                                <option n:attr="selected: empty($_REQUEST['genre'])" value="any">{_s_any_single}</option>
+                                <option n:foreach='\openvk\Web\Models\Entities\Audio::genres as $genre' n:attr="selected: $_REQUEST['genre'] == $genre" value="{$genre}">
+                                    {$genre}
+                                </option>
+                            </select>
+                        </label>
+                    </div>
+
+                    <div n:if="$section == 'users'" class="search_option">
+                        <input type="text" n:attr="value => $_REQUEST['city']" placeholder="{_city}" name="city">
+                        <input type="text" n:attr="value => $_REQUEST['hometown']" placeholder="{_hometown}" name="hometown">
+                        
+                        <label>
+                            <input name="is_online" type="checkbox" n:attr="checked => $_REQUEST['is_online'] == '1'" value="1">
+                            {_s_now_on_site}
+                        </label>
+                    </div>
+                    <div n:if="$section == 'users'" class="search_option">
+                        <b>{_pronouns}</b>
+                        <label><input type="radio" n:attr="checked => $_REQUEST['gender'] == 0" name="gender" value="0">{_male}</label>
+                        <label><input type="radio" n:attr="checked => $_REQUEST['gender'] == 1" name="gender" value="1">{_female}</label>
+                        <label><input type="radio" n:attr="checked => $_REQUEST['gender'] == 2" name="gender" value="2">{_neutral}</label>
+                        <label><input type="radio" n:attr="checked => is_null($_REQUEST['gender']) || $_REQUEST['gender'] == 3" name="gender" data-default='1' value="3">{_s_any}</label>
+                    </div>
+                    <div n:if="$section == 'users'" class="search_option">
+                        <label class='wheight'>
+                            {_politViews}
+                            <select name="polit_views" data-default='0'>
+                                <option n:foreach="range(0, 9) as $i" value="{$i}" n:attr="selected => $_REQUEST['polit_views'] == $i">
+                                    {tr("politViews_".$i)}
+                                </option>
+                            </select>
+                        </label>
+
+                        <label class='wheight'>
+                            {_relationship}
+                            <select name="marital_status" data-default='0'>
+                                <option n:foreach="range(0, 8) as $i" value="{$i}" n:attr="selected => $_REQUEST['marital_status'] == $i">
+                                    {tr("relationship_".$i)}
+                                </option>
+                            </select>
+                        </label>
+                    </div>
+                    <div n:if="$section == 'videos'" class="search_option"> 
+                        <label>
+                            <input type="checkbox" value='1' name="only_youtube" n:attr="checked => !empty($_REQUEST['only_youtube'])">{_s_only_youtube}
+                        </label>
+                    </div>
+                    <input type='button' id='__mobile_reset_search' class="button cfa sr" value="{_reset}">
+                </div>
+            </div>
         </form>
     </div>
 {/block}
 
 {block body}
     {include tabs}
-    <p style="margin-left: 15px; margin-top: 0;">
+    <p class='sr_padding' style='margin-left: 10px;'>
         <b>{tr("results", $count)}</b>
     </p>
-    <div>
 
-    {var $data = is_array($iterator) ? $iterator : iterator_to_array($iterator)}
-    <div class="container_gray borderup">
-        {if sizeof($data) > 0}
-            {if $type == "users" || $type == "groups" || $type == "apps"}
-                <div class="content" n:foreach="$data as $dat">
+    <div>
+    <div class="container_gray">
+        {if $count > 0}
+            {if $section == "users" || $section == "groups" || $section == "apps"}
+                <a href="{$dat->getURL()}" class="clear_content" n:foreach="$data as $dat">
                     <table>
-                    <tbody>
-                        <tr>
-                            <td valign="top">
-                                <a href="{include link, x => $dat}">
-                                {include preview, x => $dat}
-                                </a>
-                            </td>
-                            <td valign="top" style="width: 100%">
-                                {ifset infotable}
-                                    {include infotable, x => $dat}
-                                {else}
-                                    <a href="{include link, x => $dat}">
+                        <tbody>
+                            <tr>
+                                <td valign="top">
+                                    <img src="{$dat->getAvatarUrl()}" class="listView_img" alt="{_photo}" />
+                                </td>
+                                <td valign="top" style="width: 100%">
                                     <b>
-                                        {include name, x => $dat}
+                                        <text style="overflow: hidden;">&nbsp;{$dat->getCanonicalName()}</text>
+                                        {if $order == 'rating' && $section == 'users'}
+                                            ({$dat->getProfileCompletenessReport()->total}%)
+                                        {/if}
                                     </b>
-                                    </a>
-                                    <br/>
-                                    {include description, x => $dat}
-                                    {/ifset}
-                            </td>
-                            <td n:ifset="actions" valign="top" class="action_links" style="width: 150px;">
-                                {include actions, x => $dat}
-                            </td>
+                                    <br>
+                                    <text style="overflow: hidden;">{$dat->getDescription()}</text>
+                                </td>
                             </tr>
                         </tbody>
                     </table>
-                </div>
-            {elseif $type == "posts"}
-                <div n:foreach="$data as $dat" class="content">
-                    {if $dat->getTargetWall() < 0 && $dat->getWallOwner()->isHideFromGlobalFeedEnabled()}
-                        dffdfd
+                </a>
+
+                <script n:if='$count > 0 && !empty($query)'>
+                    highlightText({$query}, '.container_gray', ['text'])
+                </script>
+            {elseif $section == "posts"}
+                <div n:foreach="$data as $dat">
+                    {if !$dat || $dat->getWallOwner()->isHideFromGlobalFeedEnabled()}
+                        <span>{_closed_group_post}.</span>
                     {else}
                         {include "../components/post.xml", post => $dat, commentSection => true, onWallOf => true}
                     {/if}
                 </div>
-            {elseif $type == "comments"}
-                <div n:foreach="$data as $dat" class="content">
-                    {include "../components/comment.xml", comment => $dat, linkW => true}
+
+                <script n:if='$count > 0 && !empty($query)'>
+                    highlightText({$query}, '.container_gray', [".post .body p"])
+                </script>
+            {elseif $section == "videos"}
+                <div n:foreach='$data as $dat'>
+                    {include "../components/video.xml", video => $dat}
                 </div>
-            {elseif $type == "videos"}
-                {foreach $data as $dat}
-                    <div class="content">
-                        {include "../components/video.xml", video => $dat}
-                    </div>
-                {/foreach}
-            {elseif $type == "audios"}
-                {foreach $data as $dat}
+
+                <script n:if='$count > 0 && !empty($query)'>
+                    highlightText({$query}, '.container_gray', [".video_name", ".video_description"])
+                </script>
+            {elseif $section == "audios"}
+                <div n:foreach='$data as $dat'>
                     {include "../Audio/player.xml", audio => $dat}
+                </div>
+            {elseif $section == "audios_playlists"}
+                {foreach $data as $dat}
+                    {include "../Audio/playlistListView.xml", playlist => $dat}
                 {/foreach}
+
+                <script n:if="$count > 0 && !empty($query) && empty($_REQUEST['only_performers'])">
+                    highlightText({$query}, '.container_gray', [".playlistName", ".playlistDesc"])
+                </script>
             {/if}
             {include "../components/paginator.xml", conf => (object) [
                 "page"     => $page,
@@ -140,6 +225,7 @@
                 "amount"   => sizeof($data),
                 "perPage"  => $perPage ?? OPENVK_DEFAULT_PER_PAGE,
                 "atBottom" => false,
+                "space"    => 5
             ]}
         {else}
             {ifset customErrorMessage}
@@ -150,18 +236,3 @@
         {/if}
     </div>
 {/block}
-
-{block link|strip|stripHtml}
-    {$x->getURL()}
-{/block}
-
-{block preview}
-    <img src="{$x->getAvatarUrl()}" class="listView_img" alt="{_"photo"}" />
-{/block}
-
-{block name}
-    <text style="overflow: hidden;">&nbsp;{$x->getCanonicalName()}</text>
-{/block}
-
-{block description}
-{/block}
diff --git a/tpl/User/Settings.xml b/tpl/User/Settings.xml
index ba80eb2..5deb306 100755
--- a/tpl/User/Settings.xml
+++ b/tpl/User/Settings.xml
@@ -246,7 +246,7 @@
         <form action="/settings?act=privacy" method="POST" enctype="multipart/form-data">
             <table cellspacing="7" cellpadding="0" width="100%" border="0" align="center">
                 <tr>
-                    <td width="120" valign="top">
+                    <td width="300" valign="top">
                         <span class="nobold">{_privacy_setting_access_page}</span>
                     </td>
                     <td>
@@ -259,7 +259,7 @@
                     </td>
                 </tr>
                 <tr>
-                    <td width="120" valign="top">
+                    <td width="300" valign="top">
                         <span class="nobold">{_privacy_setting_read_info}</span>
                     </td>
                     <td>
@@ -272,7 +272,7 @@
                     </td>
                 </tr>
                 <tr>
-                    <td width="120" valign="top">
+                    <td width="300" valign="top">
                         <span class="nobold">{_privacy_setting_see_groups}</span>
                     </td>
                     <td>
@@ -285,7 +285,7 @@
                     </td>
                 </tr>
                 <tr>
-                    <td width="120" valign="top">
+                    <td width="300" valign="top">
                         <span class="nobold">{_privacy_setting_see_photos}</span>
                     </td>
                     <td>
@@ -298,7 +298,7 @@
                     </td>
                 </tr>
                 <tr>
-                    <td width="120" valign="top">
+                    <td width="300" valign="top">
                         <span class="nobold">{_privacy_setting_see_videos}</span>
                     </td>
                     <td>
@@ -311,7 +311,20 @@
                     </td>
                 </tr>
                 <tr>
-                    <td width="120" valign="top">
+                    <td width="300" valign="top">
+                        <span class="nobold">{_privacy_setting_view_audio}</span>
+                    </td>
+                    <td>
+                        <select name="audios.read" style="width: 164px;">
+                            <option value="3" {if $user->getPrivacySetting('audios.read') == 3}selected{/if}>{_privacy_value_anybody_dative}</option>
+                            <option value="2" {if $user->getPrivacySetting('audios.read') == 2}selected{/if}>{_privacy_value_users}</option>
+                            <option value="1" {if $user->getPrivacySetting('audios.read') == 1}selected{/if}>{_privacy_value_friends_dative}</option>
+                            <option value="0" {if $user->getPrivacySetting('audios.read') == 0}selected{/if}>{_privacy_value_only_me_dative}</option>
+                        </select>
+                    </td>
+                </tr>
+                <tr>
+                    <td width="300" valign="top">
                         <span class="nobold">{_privacy_setting_see_notes}</span>
                     </td>
                     <td>
@@ -324,7 +337,7 @@
                     </td>
                 </tr>
                 <tr>
-                    <td width="120" valign="top">
+                    <td width="300" valign="top">
                         <span class="nobold">{_privacy_setting_see_friends}</span>
                     </td>
                     <td>
@@ -337,7 +350,7 @@
                     </td>
                 </tr>
                 <tr>
-                    <td width="120" valign="top">
+                    <td width="300" valign="top">
                         <span class="nobold">{_privacy_setting_add_to_friends}</span>
                     </td>
                     <td>
@@ -348,7 +361,7 @@
                     </td>
                 </tr>
                 <tr>
-                    <td width="120" valign="top">
+                    <td width="300" valign="top">
                         <span class="nobold">{_privacy_setting_write_wall}</span>
                     </td>
                     <td>
@@ -360,7 +373,7 @@
                     </td>
                 </tr>
                 <tr>
-                    <td width="120" valign="top">
+                    <td width="300" valign="top">
                         <span class="nobold">{_privacy_setting_write_messages}</span>
                     </td>
                     <td>
diff --git a/tpl/User/View.xml b/tpl/User/View.xml
index b557dfa..71d5a6b 100755
--- a/tpl/User/View.xml
+++ b/tpl/User/View.xml
@@ -164,11 +164,6 @@
                         Для того, чтобы связаться с <b>{$user->getFirstName()}</b>, <a href="/login"><b>войдите</b></a>.
                     </div>
                 {/ifset}
-
-         
-           
-        
-
             </div>
         </div>
 
@@ -182,7 +177,7 @@
                     <table class="ugc-table">
                         <tbody>
                             <tr>
-                                <td><span class="text-gray">{_gender}: </span></td>
+                                <td><span class="text-gray">{_pronouns}: </span></td>
                                 <td>{$user->isFemale() ? tr("female") : tr("male")}</td>
                             </tr>
                             <tr>
@@ -217,10 +212,10 @@
                     </table>
 
 
-                            <div class="podrobnee">
+                            <div class="show_more_info_profile_link podrobnee">
                                 {_mobile_user_info_show_details}
                             </div>
-                            <div class="podrobnee_content">
+                            <div class="show_more_info_profile_content podrobnee_content">
                     <table class="ugc-table">
                         <tbody>
                             <!--sse-->
diff --git a/tpl/Videos/Edit.xml b/tpl/Videos/Edit.xml
index 4a97b31..b6cd7ea 100755
--- a/tpl/Videos/Edit.xml
+++ b/tpl/Videos/Edit.xml
@@ -11,7 +11,7 @@
     Изменить видеозапись
 {/block}
 
-{block content}
+{block body}
 <div class="container_gray">
     <h4>Изменить видеозапись</h4>
     <form method="post" enctype="multipart/form-data">
diff --git a/tpl/Videos/List.xml b/tpl/Videos/List.xml
index 6252b17..5f88e63 100755
--- a/tpl/Videos/List.xml
+++ b/tpl/Videos/List.xml
@@ -1,68 +1,33 @@
 {extends "../@listView.xml"}
-{var $iterator = $videos}
-{var $count    = $paginatorConf->count}
-{var $page     = $paginatorConf->page}
 
 {block title}{_videos} {$user->getCanonicalName()}{/block}
-
-
     <a href="{$user->getURL()}">{$user->getCanonicalName()}</a>
     » {_videos}
-
 {block body}
 
-            <div class="contentWraplegend">
-                <span><a href="{$user->getURL()}">{$user->getCanonicalName()}</a>
-    » {_videos}</span>
-            </div>
-
-    <div class="container_gray">
-    
-    <div style="padding-bottom: 0px; padding-top: 0;" class="summaryBar">
-        <div class="summary">
-            {tr("videos", $count)}
-            <span n:if="isset($thisUser) && $thisUser->getId() == $user->getId()">
-                &nbsp;|&nbsp;
-                <a href="/videos/upload">{_upload_video}</a>
-            </span>
-        </div>
-    </div>
-
+    <div class="contentWraplegend">
+        <span><a href="{$user->getURL()}">{$user->getCanonicalName()}</a>
+        » {_videos}</span>
     </div>
 
-{block actions}
-    
-{/block}
-
-{/block}
-
-{* BEGIN ELEMENTS DESCRIPTION *}
-
-{block link|strip|stripHtml}
-    /video{$x->getPrettyId()}
-{/block}
-
+    <div class="container_gray">
+        <div style="padding-bottom: 0px; padding-top: 0;" class="summaryBar">
+            <b class="summary">
+                {tr("videos", $count)}
+            </b>
+
+            <a href='/videos/upload' n:if="isset($thisUser) && $thisUser->getId() == $user->getId()">
+                <button class="button cfa sr">{_upload_video}</button>
+            </a>
+
+            <div class='listviewContent'>
+                {foreach $videos as $video}
+                    {include '../components/video.xml', video => $video}
+                {/foreach}
+            </div>
 
+            {include "../components/paginator.xml", conf => $paginatorConf}
+        </div>
 
-{block preview}
-    <div class="video-preview">
-        <img src="{$x->getThumbnailURL()}"
-            alt="{$x->getName()}"
-            style="max-width: 120px; max-height: 127px; margin: auto;" />
     </div>
 {/block}
-
-{block name}
-    {$x->getName()}
-{/block}
-
-{block description}
-    <p>
-        <span class="video_desc">{$x->getDescription() ?? ""}</span>
-    </p>
-    <span style="color: grey;font-size: 10px;">{_video_uploaded} {$x->getPublicationTime()}</span><br/>
-    <p>
-        {if $x->getCommentsCount() > 0} <a href="/video{$x->getPrettyId()}#comments">{_comments} ({$x->getCommentsCount()})</a>{/if}
-    </p>
-{/block}
-
diff --git a/tpl/Videos/View.xml b/tpl/Videos/View.xml
index 2837fc6..87feb75 100755
--- a/tpl/Videos/View.xml
+++ b/tpl/Videos/View.xml
@@ -12,12 +12,12 @@
 
 {block body}
 
-            <div class="contentWraplegend">
-                <span>{$video->getName()}</span>
-            </div>
+<div class="contentWraplegend">
+    <span>{$video->getName()}</span>
+</div>
 
 <div class="photobody">
- <center style="margin-bottom: 8pt;">
+    <div style="margin-bottom: 8pt;">
         {if $video->getType() === 0}
             <video width="100%" src="{$video->getURL()}" controls></video>
         {else}
@@ -28,38 +28,37 @@
                 {$driver->getEmbed()|noescape}
             {/if}
         {/if}
-    </center>
+    </div>
     
     <div class="photolist">
-                        <div class="phlistlink">
-                            <span class="text-gray">{_"info_description"}: </span><a style="width: 580px;" href="#">{$video->getDescription() ?? "(" . tr("none") . ")"}</a>
-                        </div>
-                        <div class="phlistlink">
-                            <span class="text-gray">{_"info_uploaded_by"}: </span><a href="{$user->getURL()}">{$user->getFullName()}</a>
-                        </div>
-                        <div class="phlistlink">
-                            <span class="text-gray">{_"info_upload_date"}: {$video->getPublicationTime()}</span>
-                        </div>
-
-                        <div class="phlistlink" n:if="isset($thisUser) && $thisUser->getId() === $user->getId()">
-                <a href="/video{$video->getPrettyId()}/edit" class="profile_link" style="display:block;width:96%;">
-                    {_edit}
-                </a>
-                <a href="/video{$video->getPrettyId()}/remove" class="profile_link" style="display:block;width:96%;">
-                    {_delete}
-                </a>
-            </div>
+        <div class="phlistlink">
+            <span class="text-gray">{_"info_description"}: </span><a style="width: 580px;" href="#">{$video->getDescription() ?? "(" . tr("none") . ")"}</a>
+        </div>
+        <div class="phlistlink">
+            <span class="text-gray">{_"info_uploaded_by"}: </span><a href="{$user->getURL()}">{$user->getFullName()}</a>
+        </div>
+        <div class="phlistlink">
+            <span class="text-gray">{_"info_upload_date"}: {$video->getPublicationTime()}</span>
+        </div>
 
-                    </div>
+        <div class="phlistlink" n:if="isset($thisUser) && $thisUser->getId() === $user->getId()">
+            <a href="/video{$video->getPrettyId()}/edit" class="profile_link">
+                {_edit}
+            </a>
+            <a href="/video{$video->getPrettyId()}/remove" class="profile_link">
+                {_delete}
+            </a>
+        </div>
+    </div>
 
     <div style="width: 100%; min-height: 100px;">
         <div style=" min-height: 100px; width: 100%;">
            {include "../components/comments.xml",
-                     comments => $comments,
-                     count => $cCount,
-                     page => $cPage,
-                     model => "videos",
-                     parent => $video}
+                comments => $comments,
+                count => $cCount,
+                page => $cPage,
+                model => "videos",
+                parent => $video}
         </div>
     </div>
 </div>
diff --git a/tpl/Wall/Feed.xml b/tpl/Wall/Feed.xml
index 65286ce..fedc5b6 100755
--- a/tpl/Wall/Feed.xml
+++ b/tpl/Wall/Feed.xml
@@ -2,10 +2,23 @@
 {block title}{_feed}{/block}
 
 {block body}
-    <div class="contentWraplegend" onclick="hidePanel(this);">
-        <span>{_feed}</span>
-        <span n:if="!isset($globalFeed)"><a href="/feed/all" class="float-right">{_all_news}</a></span>
-    </div>
+    {if $paginatorConf->page < 2}
+        {if !isset($globalFeed)}
+            <div class="contentWraplegend">
+                <span>{_feed}</span>
+            </div>
+            <a href='/feed/all' class='feedTransition'>
+                {_all_news}
+            </a>
+        {else}
+            <div class="contentWraplegend">
+                <span>{_all_news}</span>
+            </div>
+            <a href='/feed' class='feedTransition'>
+                {_feed}
+            </a>
+        {/if}
+    {/if}
 
     <div class="content_subtitle">
         {include "../components/textArea.xml", route => "/wall" . $thisUser->getId() . "/makePost"}
diff --git a/tpl/components/notifications/4/_18_13_.xml b/tpl/components/notifications/4/_18_13_.xml
index 69c2c42..0ae73bd 100755
--- a/tpl/components/notifications/4/_18_13_.xml
+++ b/tpl/components/notifications/4/_18_13_.xml
@@ -1,4 +1,4 @@
 {var $user = $notification->getModel(0)}
 {var $post = $notification->getModel(1)}
 
-{_nt_you_were_mentioned_u} <a href="{$user->getURL()}"><b>{$user->getCanonicalName()}</b></a> {$notification->getDateTime()} <a href="/photo{$post->getURL()}"><b>{_nt_mention_in_photo}</b></a>: "{$notification->getData()}"
+{_nt_you_were_mentioned_u} <a href="{$user->getURL()}"><b>{$user->getCanonicalName()}</b></a> {$notification->getDateTime()} <a href="/photo{$post->getPageURL()}"><b>{_nt_mention_in_photo}</b></a>: "{$notification->getData()}"
diff --git a/tpl/components/notifications/6/_14_5_.xml b/tpl/components/notifications/6/_14_5_.xml
new file mode 100644
index 0000000..09b03c7
--- /dev/null
+++ b/tpl/components/notifications/6/_14_5_.xml
@@ -0,0 +1,7 @@
+{var $club = $notification->getModel(1)}
+{var $post = $notification->getModel(0)}
+
+{_group}
+<a href="{$club->getURL()}"><b>{$club->getName()}</b></a>
+{_nt_accepted_your_post}
+<a href="/wall{$post->getPrettyId()}"><b>{_nt_post_small}</b></a>.
diff --git a/tpl/components/notifications/7/_18_5_.xml b/tpl/components/notifications/7/_18_5_.xml
new file mode 100644
index 0000000..b9cda47
--- /dev/null
+++ b/tpl/components/notifications/7/_18_5_.xml
@@ -0,0 +1,5 @@
+{var $club = $notification->getModel(1)}
+
+{_nt_in_club}
+<a href="/club{$club->getId()}/suggested"><b>{$club->getName()}</b></a>
+{_nt_new_suggested_posts}
diff --git a/tpl/components/notifications/9601/_20_18_.xml b/tpl/components/notifications/9601/_20_18_.xml
index 08a80a5..87eff8a 100755
--- a/tpl/components/notifications/9601/_20_18_.xml
+++ b/tpl/components/notifications/9601/_20_18_.xml
@@ -1,7 +1,7 @@
 {var $gift   = $notification->getModel(0)}
 {var $sender = $notification->getModel(1)}
 
-<a href="{$sender->getURL()}"><b>{$sender->getCanonicalName()}</b></a> отправил вам подарок.
+<a href="{$sender->getURL()}"><b>{$sender->getCanonicalName()}</b></a> {_nt_sent_gift}.
 <div class="nobold">
     {$notification->getDateTime()}
 </div>
\ No newline at end of file
diff --git a/tpl/components/paginator.xml b/tpl/components/paginator.xml
index 1107618..a7f8135 100755
--- a/tpl/components/paginator.xml
+++ b/tpl/components/paginator.xml
@@ -1,4 +1,4 @@
-{var $space = 2}
+{var $space = $conf->space ?? 2}
 {var $pageCount = ceil($conf->count / $conf->perPage)}
 
 <div n:if="!($conf->page === 1 && $conf->count <= $conf->perPage)" n:class="paginators, $conf->atBottom ? paginator-at-bottom">
diff --git a/tpl/components/post.xml b/tpl/components/post.xml
index 6e20bd6..8a078cd 100755
--- a/tpl/components/post.xml
+++ b/tpl/components/post.xml
@@ -37,7 +37,7 @@
             {/if}
 
             {if true}
-                <a class="button bold sharebtn" href="javascript:mobileRepost('{$post->getPrettyId()}')">
+                <a class="button bold sharebtn">
                     {$post->getRepostCount()}
                 </a>
 
@@ -54,7 +54,7 @@
                     {if !($forceNoLike ?? false)}
                         {var liked = $post->hasLikeFrom($thisUser)}
                         <a href="/wall{$post->getPrettyId()}/like?hash={rawurlencode($csrfToken)}"
-                            class="post-like-button"
+                            class="post-like-button post-like-button-natural"
                             data-liked="{(int) $liked}"
                             data-likes="{$post->getLikesCount()}">
                             <div class="button bold like post-like-button" id="{if $liked}liked{/if}">
diff --git a/tpl/components/textArea.xml b/tpl/components/textArea.xml
index a555199..ef80355 100755
--- a/tpl/components/textArea.xml
+++ b/tpl/components/textArea.xml
@@ -14,12 +14,12 @@
             <input type="hidden" name="hash" value="{$csrfToken}" />
             <br/>
             <input type="submit" value="{_'write'}" class="button new_post" />
-            <a href="javascript:void(document.querySelector('#post-buttons{$textAreaId} input[name=_pic_attachment]').click());">
+            <!--<a href="javascript:void(document.querySelector('#post-buttons{$textAreaId} input[name=_pic_attachment]').click());">
                 <div class="attach_menu_ph"></div>
             </a>
             <a n:if="!OPENVK_ROOT_CONF['openvk']['preferences']['videos']['disableUploading']" href="javascript:void(document.querySelector('#post-buttons{$textAreaId} input[name=_vid_attachment]').click());">
                 <div class="attach_menu_video"></div>
-            </a>
+            </a>-->
         </div>
 
 
diff --git a/tpl/components/video.xml b/tpl/components/video.xml
index 752191a..136dde5 100644
--- a/tpl/components/video.xml
+++ b/tpl/components/video.xml
@@ -1,35 +1,24 @@
-<table>
-<tbody>
-    <tr>
-        <td valign="top">
-            <div class="video-preview">
-                <a href="/video{$video->getPrettyId()}">
-                    <img src="{$video->getThumbnailURL()}"
-                    style="max-width: 170px; max-height: 127px; margin: auto;" >
-                </a>
-            </div>
-        </td>
-        <td valign="top" style="width: 100%">
-            {ifset infotable}
-                {include infotable, x => $dat}
-            {else}
-        <a href="/video{$video->getPrettyId()}">
-            <b>
-            {$video->getName()}
-            </b>
-        </a>
-        <br/>
-            <p>
-                <span>{$video->getDescription() ?? ""}</span>
-            </p>
-            <span style="color: grey;">{_video_uploaded} {$video->getPublicationTime()}</span><br/>
-            
-            <p>
-                <a href="/video{$video->getPrettyId()}">{_view_video}</a>
-                {if $video->getCommentsCount() > 0}| <a href="/video{$video->getPrettyId()}#comments">{_comments} ({$video->getCommentsCount()})</a>{/if}
-            </p>
-            {/ifset}
-        </td>
-    </tr>
-</tbody>
-</table>
\ No newline at end of file
+<a class='video-list-view' href="/video{$video->getPrettyId()}">
+    <table>
+        <tbody>
+            <tr>
+                <td valign="top">
+                    <div class="video-preview">
+                        <img src="{$video->getThumbnailURL()}">
+                    </div>
+                </td>
+                <td valign="top" style="width: 100%">
+                    <b class='video_name'>
+                    {$video->getName()}
+                    </b>
+                    <br/>
+                    <p class='video_description'>
+                        <span>{$video->getDescription() ?? ""}</span>
+                    </p>
+
+                    <span style="color: grey;">{_video_uploaded} {$video->getPublicationTime()}</span><br/>
+                </td>
+            </tr>
+        </tbody>
+    </table>
+</a>