diff --git a/Telegram/SourceFiles/api/api_bot.cpp b/Telegram/SourceFiles/api/api_bot.cpp
index 2a28bb74c..65826aa2f 100644
--- a/Telegram/SourceFiles/api/api_bot.cpp
+++ b/Telegram/SourceFiles/api/api_bot.cpp
@@ -366,7 +366,6 @@ void ActivateBotCommand(ClickHandlerContext context, int row, int column) {
 		const auto itemId = item->id;
 		const auto topicRootId = item->topicRootId();
 		const auto history = item->history();
-
 		controller->show(Ui::MakeConfirmBox({
 			.text = tr::lng_bot_share_phone(),
 			.confirmed = [=] {
diff --git a/Telegram/SourceFiles/api/api_send_progress.cpp b/Telegram/SourceFiles/api/api_send_progress.cpp
index 556c43c50..cb8232561 100644
--- a/Telegram/SourceFiles/api/api_send_progress.cpp
+++ b/Telegram/SourceFiles/api/api_send_progress.cpp
@@ -15,8 +15,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_peer_values.h"
 #include "apiwrap.h"
 
+// AyuGram includes
 #include "ayu/ayu_settings.h"
 
+
 namespace Api {
 namespace {
 
diff --git a/Telegram/SourceFiles/api/api_updates.cpp b/Telegram/SourceFiles/api/api_updates.cpp
index 58f5e08f4..5bd77251d 100644
--- a/Telegram/SourceFiles/api/api_updates.cpp
+++ b/Telegram/SourceFiles/api/api_updates.cpp
@@ -58,8 +58,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "apiwrap.h"
 #include "ui/text/format_values.h" // Ui::FormatPhone
 
+// AyuGram includes
 #include "ayu/ayu_settings.h"
 
+
 namespace Api {
 namespace {
 
diff --git a/Telegram/SourceFiles/ayu/ayu_infra.cpp b/Telegram/SourceFiles/ayu/ayu_infra.cpp
index 951425141..6fc7009b9 100644
--- a/Telegram/SourceFiles/ayu/ayu_infra.cpp
+++ b/Telegram/SourceFiles/ayu/ayu_infra.cpp
@@ -9,6 +9,7 @@
 #include "ayu_lang.h"
 #include "ayu/ayu_lottie.h"
 #include "ayu/ui/ayu_lottie.h"
+#include "ayu/database/ayu_database.h"
 #include "lang/lang_instance.h"
 
 namespace AyuInfra
@@ -30,10 +31,15 @@ void initLottie() {
 	AyuUi::setLottieImpl(std::make_shared<AyuUi::AyuLottieImpl>());
 }
 
+void initDatabase() {
+	AyuDatabase::initialize();
+}
+
 void init()
 {
 	initLang();
 	initLottie();
+	initDatabase();
 }
 
 }
\ No newline at end of file
diff --git a/Telegram/SourceFiles/ayu/ui/boxes/edit_deleted_mark.cpp b/Telegram/SourceFiles/ayu/ui/boxes/edit_deleted_mark.cpp
index 2f7305adc..05bd600dc 100644
--- a/Telegram/SourceFiles/ayu/ui/boxes/edit_deleted_mark.cpp
+++ b/Telegram/SourceFiles/ayu/ui/boxes/edit_deleted_mark.cpp
@@ -21,6 +21,7 @@
 #include "ui/controls/userpic_button.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/popup_menu.h"
+#include "ui/widgets/fields/input_field.h"
 #include "ui/widgets/fields/special_fields.h"
 
 #include <QtGui/QGuiApplication>
@@ -56,8 +57,10 @@ void EditDeletedMarkBox::prepare()
 	addButton(tr::lng_cancel(), [=]
 	{ closeBox(); });
 
-	connect(_text, &Ui::InputField::submitted, [=]
-	{ submit(); });
+	const auto submitted = [=]
+	{ submit(); };
+	_text->submits(
+	) | rpl::start_with_next(submitted, _text->lifetime());
 }
 
 void EditDeletedMarkBox::setInnerFocus()
diff --git a/Telegram/SourceFiles/ayu/ui/boxes/edit_edited_mark.cpp b/Telegram/SourceFiles/ayu/ui/boxes/edit_edited_mark.cpp
index 3dc640351..9fe89b708 100644
--- a/Telegram/SourceFiles/ayu/ui/boxes/edit_edited_mark.cpp
+++ b/Telegram/SourceFiles/ayu/ui/boxes/edit_edited_mark.cpp
@@ -21,6 +21,7 @@
 #include "ui/controls/userpic_button.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/popup_menu.h"
+#include "ui/widgets/fields/input_field.h"
 #include "ui/widgets/fields/special_fields.h"
 
 #include <QtGui/QGuiApplication>
@@ -55,8 +56,10 @@ void EditEditedMarkBox::prepare()
 	addButton(tr::lng_cancel(), [=]
 	{ closeBox(); });
 
-	connect(_text, &Ui::InputField::submitted, [=]
-	{ submit(); });
+	const auto submitted = [=]
+	{ submit(); };
+	_text->submits(
+	) | rpl::start_with_next(submitted, _text->lifetime());
 }
 
 void EditEditedMarkBox::setInnerFocus()
diff --git a/Telegram/SourceFiles/ayu/ui/sections/edited/edited_log_section.cpp b/Telegram/SourceFiles/ayu/ui/sections/edited/edited_log_section.cpp
index fcdcb2586..e7e448e02 100644
--- a/Telegram/SourceFiles/ayu/ui/sections/edited/edited_log_section.cpp
+++ b/Telegram/SourceFiles/ayu/ui/sections/edited/edited_log_section.cpp
@@ -14,7 +14,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/scroll_area.h"
 #include "ui/widgets/shadow.h"
 #include "ui/widgets/buttons.h"
-#include "ui/widgets/input_fields.h"
 #include "ui/ui_utility.h"
 #include "mainwidget.h"
 #include "mainwindow.h"
diff --git a/Telegram/SourceFiles/boxes/send_files_box.cpp b/Telegram/SourceFiles/boxes/send_files_box.cpp
index 025b4082c..18e5f1d37 100644
--- a/Telegram/SourceFiles/boxes/send_files_box.cpp
+++ b/Telegram/SourceFiles/boxes/send_files_box.cpp
@@ -61,9 +61,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include <QtCore/QMimeData>
 
+// AyuGram includes
 #include "ayu/ayu_settings.h"
 #include "base/unixtime.h"
 
+
 namespace {
 
 constexpr auto kMaxMessageLength = 4096;
diff --git a/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp
index a334d8d81..a40e7f190 100644
--- a/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp
@@ -43,9 +43,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "styles/style_menu_icons.h"
 
 #include <QtWidgets/QApplication>
+
+// AyuGram includes
 #include <ayu/ayu_settings.h>
 #include <ui/boxes/confirm_box.h>
 
+
 namespace ChatHelpers {
 namespace {
 
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
index 5c5d6c58e..c72c53131 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
@@ -55,8 +55,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include <QtWidgets/QApplication>
 
+// AyuGram includes
 #include "ayu/ayu_settings.h"
 
+
 namespace ChatHelpers {
 namespace {
 
diff --git a/Telegram/SourceFiles/config.h b/Telegram/SourceFiles/config.h
index 15e01131a..373135fbe 100644
--- a/Telegram/SourceFiles/config.h
+++ b/Telegram/SourceFiles/config.h
@@ -21,7 +21,7 @@ enum {
 
 	AutoSearchTimeout = 900, // 0.9 secs
 
-	PreloadHeightsCount = 4, // when 4 screens to scroll left make a preload request
+	PreloadHeightsCount = 3, // when 3 screens to scroll left make a preload request
 
 	SearchPeopleLimit = 20,
 
diff --git a/Telegram/SourceFiles/core/core_settings.cpp b/Telegram/SourceFiles/core/core_settings.cpp
index abefbd3b4..156cc4ed0 100644
--- a/Telegram/SourceFiles/core/core_settings.cpp
+++ b/Telegram/SourceFiles/core/core_settings.cpp
@@ -20,8 +20,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "calls/group/calls_group_common.h"
 #include "spellcheck/spellcheck_types.h"
 
+// AyuGram includes
 #include "ayu/ayu_settings.h"
 
+
 namespace Core {
 namespace {
 
@@ -743,7 +745,7 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 	case ScreenCorner::TopRight:
 	case ScreenCorner::BottomRight:
 	case ScreenCorner::BottomLeft:
-	case ScreenCorner::TopCenter:_notificationsCorner = uncheckedNotificationsCorner; break;
+	case ScreenCorner::TopCenter: _notificationsCorner = uncheckedNotificationsCorner; break;
 	}
 	_includeMutedCounter = (includeMutedCounter == 1);
 	_countUnreadMessages = (countUnreadMessages == 1);
diff --git a/Telegram/SourceFiles/core/sandbox.cpp b/Telegram/SourceFiles/core/sandbox.cpp
index 2c42064ca..45d2bef81 100644
--- a/Telegram/SourceFiles/core/sandbox.cpp
+++ b/Telegram/SourceFiles/core/sandbox.cpp
@@ -35,8 +35,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <QtGui/QScreen>
 #include <QtGui/qpa/qplatformscreen.h>
 
-#include "ayu/database/ayu_database.h"
-
 namespace Core {
 namespace {
 
@@ -123,8 +121,6 @@ int Sandbox::start() {
 		}
 	}
 
-	AyuDatabase::initialize();
-
 #if defined Q_OS_LINUX && QT_VERSION >= QT_VERSION_CHECK(6, 2, 0)
 	_localServer.setSocketOptions(QLocalServer::AbstractNamespaceOption);
 	_localSocket.setSocketOptions(QLocalSocket::AbstractNamespaceOption);
diff --git a/Telegram/SourceFiles/data/data_histories.cpp b/Telegram/SourceFiles/data/data_histories.cpp
index 5b594afb0..7738468ed 100644
--- a/Telegram/SourceFiles/data/data_histories.cpp
+++ b/Telegram/SourceFiles/data/data_histories.cpp
@@ -30,6 +30,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ayu/ayu_state.h"
 #include "ayu/sync/ayu_sync_controller.h"
 
+
 namespace Data {
 namespace {
 
diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index a941f2b73..091818594 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -87,6 +87,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ayu/database/ayu_database.h"
 #include "ayu/messages/ayu_messages_controller.h"
 
+
 namespace Data {
 namespace {
 
diff --git a/Telegram/SourceFiles/data/data_sponsored_messages.cpp b/Telegram/SourceFiles/data/data_sponsored_messages.cpp
index d22cf976a..6b9b0e616 100644
--- a/Telegram/SourceFiles/data/data_sponsored_messages.cpp
+++ b/Telegram/SourceFiles/data/data_sponsored_messages.cpp
@@ -22,8 +22,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/image/image_location_factory.h"
 #include "ui/text/text_utilities.h" // Ui::Text::RichLangValue.
 
+// AyuGram includes
 #include "ayu/ayu_settings.h"
 
+
 namespace Data {
 namespace {
 
diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index 0f0ff8b92..e27b0843a 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -233,6 +233,7 @@ void Stories::apply(not_null<PeerData*> peer, const MTPPeerStories *data) {
 	{
 		return;
 	}
+
 	if (!data) {
 		applyDeletedFromSources(peer->id, StorySourcesList::NotHidden);
 		applyDeletedFromSources(peer->id, StorySourcesList::Hidden);
diff --git a/Telegram/SourceFiles/history/history.cpp b/Telegram/SourceFiles/history/history.cpp
index 3f580d231..0b8f30ff1 100644
--- a/Telegram/SourceFiles/history/history.cpp
+++ b/Telegram/SourceFiles/history/history.cpp
@@ -63,8 +63,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/qt/qt_common_adapters.h"
 #include "styles/style_dialogs.h"
 
+// AyuGram includes
 #include "ayu/ayu_settings.h"
 
+
 namespace {
 
 constexpr auto kNewBlockEachMessage = 50;
diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index 318d47115..3248be1ff 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -98,9 +98,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <QtWidgets/QApplication>
 #include <QtCore/QMimeData>
 
+// AyuGram includes
 #include "ayu/ui/context_menu/context_menu.h"
 #include "styles/style_ayu_icons.h"
 
+
 namespace {
 
 constexpr auto kScrollDateHideTimeout = 1000;
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index edde327a1..4c9ac2fa4 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -69,8 +69,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "payments/payments_checkout_process.h" // CheckoutProcess::Start.
 #include "styles/style_dialogs.h"
 
+// AyuGram includes
 #include "ayu/ayu_settings.h"
 
+
 namespace {
 
 constexpr auto kNotificationTextLimit = 255;
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index ef957fc21..eb6235c48 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -163,9 +163,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <QtGui/QWindow>
 #include <QtCore/QMimeData>
 
+// AyuGram includes
 #include "ayu/ayu_settings.h"
 #include "ayu/ayu_state.h"
 
+
 namespace {
 
 constexpr auto kMessagesPerPageFirst = 30;
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index 242e094cd..1dee0b8c3 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -42,6 +42,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ayu/ui/boxes/voice_confirmation_box.h"
 #include "boxes/abstract_box.h"
 
+
 namespace HistoryView::Controls {
 namespace {
 
diff --git a/Telegram/SourceFiles/history/view/history_view_bottom_info.cpp b/Telegram/SourceFiles/history/view/history_view_bottom_info.cpp
index a7cbbc1ec..d42be4dc4 100644
--- a/Telegram/SourceFiles/history/view/history_view_bottom_info.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_bottom_info.cpp
@@ -28,8 +28,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "styles/style_chat.h"
 #include "styles/style_dialogs.h"
 
+// AyuGram includes
 #include "ayu/ayu_settings.h"
 
+
 namespace HistoryView {
 
 struct BottomInfo::Reaction {
diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
index 9189bbc2e..a7a8ea3ca 100644
--- a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
@@ -75,7 +75,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <QtGui/QGuiApplication>
 #include <QtGui/QClipboard>
 
-
 // AyuGram includes
 #include "ayu/ayu_settings.h"
 #include "ayu/database/ayu_database.h"
diff --git a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
index df2f3a631..2822879fd 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
@@ -7,7 +7,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "info/profile/info_profile_actions.h"
 
-#include "ayu/ayu_settings.h"
 #include "data/data_peer_values.h"
 #include "data/data_session.h"
 #include "data/data_folder.h"
@@ -16,7 +15,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_changes.h"
 #include "data/data_user.h"
 #include "data/notify/data_notify_settings.h"
-#include "ui/text/text_entity.h"
 #include "ui/wrap/vertical_layout.h"
 #include "ui/wrap/padding_wrap.h"
 #include "ui/wrap/slide_wrap.h"
@@ -69,7 +67,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <QtGui/QGuiApplication>
 #include <QtGui/QClipboard>
 
+// AyuGram includes
+#include "ayu/ayu_settings.h"
 #include "ayu/ui/utils/ayu_profile_values.h"
+#include "ui/text/text_entity.h"
+
 
 namespace Info {
 namespace Profile {
diff --git a/Telegram/SourceFiles/settings/settings_main.cpp b/Telegram/SourceFiles/settings/settings_main.cpp
index 5f828b51d..03118bdfc 100644
--- a/Telegram/SourceFiles/settings/settings_main.cpp
+++ b/Telegram/SourceFiles/settings/settings_main.cpp
@@ -69,8 +69,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <QtGui/QClipboard>
 #include <QtGui/QWindow>
 
+// AyuGram includes
 #include "ayu/ui/settings/settings_ayu.h"
 
+
 namespace Settings {
 namespace {
 
diff --git a/Telegram/SourceFiles/storage/localstorage.cpp b/Telegram/SourceFiles/storage/localstorage.cpp
index 75dcc5acb..393d303aa 100644
--- a/Telegram/SourceFiles/storage/localstorage.cpp
+++ b/Telegram/SourceFiles/storage/localstorage.cpp
@@ -32,13 +32,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include <QtCore/QDirIterator>
 
+#ifndef Q_OS_WIN
+#include <unistd.h>
+#endif // Q_OS_WIN
+
 // AyuGram includes
 #include "ayu/ayu_infra.h"
 #include "ayu/ayu_settings.h"
 
-#ifndef Q_OS_WIN
-#include <unistd.h>
-#endif // Q_OS_WIN
 
 //extern "C" {
 //#include <openssl/evp.h>
diff --git a/Telegram/SourceFiles/tray.cpp b/Telegram/SourceFiles/tray.cpp
index 5f82f4b46..7e3bcf22e 100644
--- a/Telegram/SourceFiles/tray.cpp
+++ b/Telegram/SourceFiles/tray.cpp
@@ -9,7 +9,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "core/application.h"
 #include "core/core_settings.h"
-#include "lang_auto.h"
 #include "platform/platform_specific.h"
 
 #include <QtWidgets/QApplication>
@@ -18,6 +17,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ayu/ayu_settings.h"
 #include "ayu/ui/settings/settings_ayu.h"
 #include "ayu/features/streamer_mode/streamer_mode.h"
+#include "lang_auto.h"
 
 
 namespace Core {
diff --git a/Telegram/SourceFiles/window/window_main_menu.cpp b/Telegram/SourceFiles/window/window_main_menu.cpp
index 08737581f..3eca7916b 100644
--- a/Telegram/SourceFiles/window/window_main_menu.cpp
+++ b/Telegram/SourceFiles/window/window_main_menu.cpp
@@ -7,7 +7,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "window/window_main_menu.h"
 
-#include "lang_auto.h"
 #include "window/themes/window_theme.h"
 #include "window/window_peer_menu.h"
 #include "window/window_session_controller.h"
@@ -75,7 +74,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "styles/style_info.h" // infoTopBarMenu
 #include "styles/style_layers.h"
 #include "styles/style_menu_icons.h"
-#include "tray.h"
 
 #include <QtGui/QWindow>
 #include <QtGui/QScreen>
@@ -90,6 +88,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ayu/ui/boxes/confirmation_box.h"
 #include "ayu/features/streamer_mode/streamer_mode.h"
 #include "styles/style_ayu_icons.h"
+#include "tray.h"
+#include "lang_auto.h"
 
 
 namespace Window {
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index ca3c91fb0..ab84152a6 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit ca3c91fb0be7db2d61defe5c6b0670e0faa93d03
+Subproject commit ab84152a69c7fe03b3d3353d5a887ee23a354445